The following commit has been merged in the master branch:
commit 12cd58ca5a16332f40f923609b3ab38b63f3d2d8
Author: Aron Xu <a...@debian.org>
Date:   Mon Jun 27 20:02:18 2011 +0800

    Fix FTBFS against GCC 4.6

diff --git a/debian/changelog b/debian/changelog
index f58b311..49d44f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,9 +14,11 @@ earth3d (1.0.5-2) unstable; urgency=low
     - Don't ignore clean errors.
     - Use dh_prep instead of dh_clean -k.
   * debian/control: Add ${misc:Depends}.
+  * debian/patches/10_fix_ftbfs.patch:
+    - Fix gcc 4.6 FTBFS (LP: #770814), collect old patches.
   * debian/patches/20_png_library.patch:
-    Fix FTBFS with binutils-gold by linking to libpng,
-    Thanks Ilya Barygin (Closes: #554314).
+    - Fix FTBFS with binutils-gold by linking to libpng,
+      Thanks Ilya Barygin (Closes: #554314).
   * Acknowledge NMU (Closes: #417173).
 
  -- Aron Xu <a...@debian.org>  Mon, 27 Jun 2011 18:05:36 +0800
diff --git a/debian/patches/10_fix_ftbfs.patch 
b/debian/patches/10_fix_ftbfs.patch
index d726c14..602a219 100644
--- a/debian/patches/10_fix_ftbfs.patch
+++ b/debian/patches/10_fix_ftbfs.patch
@@ -2,9 +2,11 @@ From: Aron Xu <a...@debian.org>
 Subject: Use correct includes to avoid FTBFS
  The patch was originally applied directly to source by previous maintainer. 
  During the covertion to quilt from dpatch, I make this patch.
+ .
+ Now it also intergrates a new gcc 4.6 fix.
 Last-Update: 2011-06-27
---- earth3d-1.0.5.orig/formview.ui.h
-+++ earth3d-1.0.5/formview.ui.h
+--- a/formview.ui.h
++++ b/formview.ui.h
 @@ -9,8 +9,7 @@
  ** place of a destructor.
  *****************************************************************************/
@@ -15,24 +17,24 @@ Last-Update: 2011-06-27
  #include "connectNetworkService.h"
  #include "serviceFoundLister.h"
  #include <vector>
---- earth3d-1.0.5.orig/listViewServiceItem.cpp
-+++ earth3d-1.0.5/listViewServiceItem.cpp
+--- a/listViewServiceItem.cpp
++++ b/listViewServiceItem.cpp
 @@ -1,4 +1,5 @@
  #include "listViewServiceItem.h"
 +#include <cstdlib>
  #include <qdom.h>
  #include <qpixmap.h>
  
---- earth3d-1.0.5.orig/network/urlTools.cpp
-+++ earth3d-1.0.5/network/urlTools.cpp
+--- a/network/urlTools.cpp
++++ b/network/urlTools.cpp
 @@ -1,4 +1,5 @@
  #include "urlTools.h"
 +#include <cstdlib>
  #include <qdom.h>
  #include <qtextstream.h>
  #include <iostream>
---- earth3d-1.0.5.orig/network/urlDownload.cpp
-+++ earth3d-1.0.5/network/urlDownload.cpp
+--- a/network/urlDownload.cpp
++++ b/network/urlDownload.cpp
 @@ -1,5 +1,6 @@
  #include "urlDownload.h"
  #include "urlTools.h"
@@ -52,24 +54,24 @@ Last-Update: 2011-06-27
  #endif
  
  using namespace std;
---- earth3d-1.0.5.orig/network/serviceFoundLister.cpp
-+++ earth3d-1.0.5/network/serviceFoundLister.cpp
+--- a/network/serviceFoundLister.cpp
++++ b/network/serviceFoundLister.cpp
 @@ -1,4 +1,5 @@
  #include "serviceFoundLister.h"
 +#include <cstdlib>
  #include <iostream>
  #include "listViewServiceItem.h"
  #include <qdom.h>
---- earth3d-1.0.5.orig/geometry/geometry2d3dFactory.cpp
-+++ earth3d-1.0.5/geometry/geometry2d3dFactory.cpp
+--- a/geometry/geometry2d3dFactory.cpp
++++ b/geometry/geometry2d3dFactory.cpp
 @@ -1,4 +1,5 @@
  #include "geometry2d3dFactory.h"
 +#include <cstdlib>
  
  Geometry2D3DFactory::Geometry2D3DFactory() {
  }
---- earth3d-1.0.5.orig/draw/treeDrawPOI.cpp
-+++ earth3d-1.0.5/draw/treeDrawPOI.cpp
+--- a/draw/treeDrawPOI.cpp
++++ b/draw/treeDrawPOI.cpp
 @@ -1,5 +1,6 @@
  #define GL_GLEXT_PROTOTYPES
  #include "treeDrawPOI.h"
@@ -77,51 +79,71 @@ Last-Update: 2011-06-27
  #include <stdio.h>
  #include <GL/glext.h>
  #include "treeDrawPOISign.h"
---- earth3d-1.0.5.orig/draw/drawSceneObjectScale.cpp
-+++ earth3d-1.0.5/draw/drawSceneObjectScale.cpp
+--- a/draw/drawSceneObjectScale.cpp
++++ b/draw/drawSceneObjectScale.cpp
 @@ -1,4 +1,5 @@
  #include "drawSceneObjectScale.h"
 +#include <cstdlib>
  
  DrawSceneObjectScale::DrawSceneObjectScale(DrawScene *scene)
    : DrawSceneObjectTransform(scene) {
---- earth3d-1.0.5.orig/draw/drawSceneObjectTranslate.cpp
-+++ earth3d-1.0.5/draw/drawSceneObjectTranslate.cpp
+--- a/draw/drawSceneObjectTranslate.cpp
++++ b/draw/drawSceneObjectTranslate.cpp
 @@ -1,4 +1,5 @@
  #include "drawSceneObjectTranslate.h"
 +#include <cstdlib>
  
  DrawSceneObjectTranslate::DrawSceneObjectTranslate(DrawScene *scene)
    : DrawSceneObjectTransform(scene) {
---- earth3d-1.0.5.orig/draw/drawSceneObjectTriangle.cpp
-+++ earth3d-1.0.5/draw/drawSceneObjectTriangle.cpp
+--- a/draw/drawSceneObjectTriangle.cpp
++++ b/draw/drawSceneObjectTriangle.cpp
 @@ -1,4 +1,5 @@
  #include "drawSceneObjectTriangle.h"
 +#include <cstdlib>
  
  DrawSceneObjectTriangle::DrawSceneObjectTriangle(DrawScene *scene) 
    : DrawSceneObject(scene) {
---- earth3d-1.0.5.orig/draw/drawSceneObjectQuad.cpp
-+++ earth3d-1.0.5/draw/drawSceneObjectQuad.cpp
+--- a/draw/drawSceneObjectQuad.cpp
++++ b/draw/drawSceneObjectQuad.cpp
 @@ -1,4 +1,5 @@
  #include "drawSceneObjectQuad.h"
 +#include <cstdlib>
  
  DrawSceneObjectQuad::DrawSceneObjectQuad(DrawScene *scene) 
    : DrawSceneObject(scene) {
---- earth3d-1.0.5.orig/draw/drawSceneObjectRotatequaternion.cpp
-+++ earth3d-1.0.5/draw/drawSceneObjectRotatequaternion.cpp
+--- a/draw/drawSceneObjectRotatequaternion.cpp
++++ b/draw/drawSceneObjectRotatequaternion.cpp
 @@ -1,4 +1,5 @@
  #include "drawSceneObjectRotatequaternion.h"
 +#include <cstdlib>
  
  DrawSceneObjectRotatequaternion::DrawSceneObjectRotatequaternion(DrawScene 
*scene)
    : DrawSceneObjectTransform(scene) {
---- earth3d-1.0.5.orig/draw/treeDrawFactory.cpp
-+++ earth3d-1.0.5/draw/treeDrawFactory.cpp
+--- a/draw/treeDrawFactory.cpp
++++ b/draw/treeDrawFactory.cpp
 @@ -1,4 +1,5 @@
  #include "treeDrawFactory.h"
 +#include <cstdlib>
  #include <qtextstream.h>
  #include <qdom.h>
  #include "treeDraw.h"
+--- a/draw/treeDrawSphere.cpp
++++ b/draw/treeDrawSphere.cpp
+@@ -4,6 +4,7 @@
+ #define GL_GLEXT_PROTOTYPES
+ #endif
+ 
++#include <cstddef>
+ #include "winconf.h"
+ #include "treeDrawSphere.h"
+ #include "heightfieldTreeNodeCore.h"
+@@ -852,7 +853,8 @@
+ 
+ #ifdef FORWARD_VIEW
+   if (*virtualviewer==Point3D(0,0,0)) { // square root cannot be solved, 
earth not visible in center
+-    distance = 
getDistance(&(viewer->normalize()*(1+distsurface/CENTERWEIGHT)), 
((HeightfieldTreeNodeCore *)(currentNode->getCore(1)))->getRect());
++        Point3D vnormalize = 
(viewer->normalize()*(1+distsurface/CENTERWEIGHT));
++        distance = getDistance(&vnormalize,((HeightfieldTreeNodeCore 
*)(currentNode->getCore(1)))->getRect());
+   }
+   else {
+     distance = getDistance(virtualviewer, ((HeightfieldTreeNodeCore 
*)(currentNode->getCore(1)))->getRect());

-- 
earth3d for Debian

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to