← Back to branch summary

~ubuntu-branches/ubuntu/utopic/qgis/utopic

« back to all changes in this revision

Viewing changes to debian/patches/10_fix_gcc4.7_build.patch

  • Committer: Package Import Robot
  • Author(s): Cyril Brulebois
  • Date: 2012-05-22 02:34:43 UTC
  • mfrom: (3.1.10 sid)
  • Revision ID: package-import@ubuntu.com-20120522023443-14ehab11ah61s5il
http://bugs.debian.org/673567
* 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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/10_fix_gcc4.7_build.patch
 
1
Description: fix to build with GCC 4.7
 
2
 Must include <unistd.h> where needed, because GCC 4.7 has stopped including
 
3
 it throughout much of the standard library.
 
4
 .
 
5
 See http://gcc.gnu.org/gcc-4.7/porting_to.html
 
6
Author: Steven Chamberlain <steven@pyro.eu.org>
 
7
Bug-Debian: http://bugs.debian.org/673567
 
8
 
 
9
--- qgis-1.7.4+1.7.5~20120320.orig/src/core/spatialindex/tools/TemporaryFile.cc 2012-05-19 21:42:30.010157000 +0100
 
10
+++ qgis-1.7.4+1.7.5~20120320/src/core/spatialindex/tools/TemporaryFile.cc      2012-05-19 21:42:34.797198134 +0100
 
11
@@ -20,6 +20,7 @@
 
12
 //    mhadji@gmail.com
 
13
 
 
14
 #include <stdio.h>
 
15
+#include <unistd.h>
 
16
 
 
17
 #include <Tools.h>
 
18
 
 
19
--- qgis-1.7.4+1.7.5~20120320.orig/src/core/spatialindex/storagemanager/DiskStorageManager.cc   2012-03-17 13:48:08.000000000 +0000
 
20
+++ qgis-1.7.4+1.7.5~20120320/src/core/spatialindex/storagemanager/DiskStorageManager.cc        2012-05-19 21:43:14.837512956 +0100
 
21
@@ -25,6 +25,7 @@
 
22
 #include <sys/types.h>
 
23
 #include <sys/stat.h>
 
24
 #include <stdio.h>
 
25
+#include <unistd.h>
 
26
 #include <cstring>
 
27
 
 
28
 #ifdef WIN32