tag 673567 pending
thanks

Steven Chamberlain <ste...@pyro.eu.org> (19/05/2012):
> Attached is a patch which will hopefully fix this on all the affected
> architectures.  Only tested this myself on kfreebsd-i386 though.

Builds fine on amd64, so I've just uploaded a fixed package with the
(really, this time) attached source debdiff. A bit in a hurry, but the
gdal transition wants buildable reverse dependencies… Thanks for your
understanding.

Mraw,
KiBi.
diff -Nru qgis-1.7.4+1.7.5~20120320/debian/changelog qgis-1.7.4+1.7.5~20120320/debian/changelog
--- qgis-1.7.4+1.7.5~20120320/debian/changelog	2012-04-24 15:34:35.000000000 +0200
+++ qgis-1.7.4+1.7.5~20120320/debian/changelog	2012-05-22 02:37:09.000000000 +0200
@@ -1,3 +1,14 @@
+qgis (1.7.4+1.7.5~20120320-1.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Fix FTBFS with gcc 4.7 due to uncoordinated gcc-defaults switch, patch
+    by Steven Chamberlain, thanks! (Closes: #673567)
+    - 10_fix_gcc4.7_build.patch
+  * Set urgency to “high” for the RC bug fix, needed for the gdal
+    transition.
+
+ -- Cyril Brulebois <k...@debian.org>  Tue, 22 May 2012 02:34:43 +0200
+
 qgis (1.7.4+1.7.5~20120320-1) unstable; urgency=low
 
   The "Sometimes they come back" release.
diff -Nru qgis-1.7.4+1.7.5~20120320/debian/patches/10_fix_gcc4.7_build.patch qgis-1.7.4+1.7.5~20120320/debian/patches/10_fix_gcc4.7_build.patch
--- qgis-1.7.4+1.7.5~20120320/debian/patches/10_fix_gcc4.7_build.patch	1970-01-01 01:00:00.000000000 +0100
+++ qgis-1.7.4+1.7.5~20120320/debian/patches/10_fix_gcc4.7_build.patch	2012-05-22 02:34:35.000000000 +0200
@@ -0,0 +1,28 @@
+Description: fix to build with GCC 4.7
+ Must include <unistd.h> where needed, because GCC 4.7 has stopped including
+ it throughout much of the standard library.
+ .
+ See http://gcc.gnu.org/gcc-4.7/porting_to.html
+Author: Steven Chamberlain <ste...@pyro.eu.org>
+Bug-Debian: http://bugs.debian.org/673567
+
+--- qgis-1.7.4+1.7.5~20120320.orig/src/core/spatialindex/tools/TemporaryFile.cc	2012-05-19 21:42:30.010157000 +0100
++++ qgis-1.7.4+1.7.5~20120320/src/core/spatialindex/tools/TemporaryFile.cc	2012-05-19 21:42:34.797198134 +0100
+@@ -20,6 +20,7 @@
+ //    mha...@gmail.com
+ 
+ #include <stdio.h>
++#include <unistd.h>
+ 
+ #include <Tools.h>
+ 
+--- qgis-1.7.4+1.7.5~20120320.orig/src/core/spatialindex/storagemanager/DiskStorageManager.cc	2012-03-17 13:48:08.000000000 +0000
++++ qgis-1.7.4+1.7.5~20120320/src/core/spatialindex/storagemanager/DiskStorageManager.cc	2012-05-19 21:43:14.837512956 +0100
+@@ -25,6 +25,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <stdio.h>
++#include <unistd.h>
+ #include <cstring>
+ 
+ #ifdef WIN32
diff -Nru qgis-1.7.4+1.7.5~20120320/debian/patches/series qgis-1.7.4+1.7.5~20120320/debian/patches/series
--- qgis-1.7.4+1.7.5~20120320/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ qgis-1.7.4+1.7.5~20120320/debian/patches/series	2012-05-22 02:34:39.000000000 +0200
@@ -0,0 +1 @@
+10_fix_gcc4.7_build.patch

Attachment: signature.asc
Description: Digital signature

_______________________________________________
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