From: | "Tomas Chvatal (scarabeus)" <scarabeus@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in sci-geosciences/qgis/files: qgis-1.7.4-gcc4.7.patch qgis-1.4.0-gcc45.patch |
Date: | Thu, 24 May 2012 12:44:09 |
Message-Id: | 20120524124345.A38182004B@flycatcher.gentoo.org |
1 | scarabeus 12/05/24 12:43:45 |
2 | |
3 | Added: qgis-1.7.4-gcc4.7.patch |
4 | Removed: qgis-1.4.0-gcc45.patch |
5 | Log: |
6 | Version bump to latest version. Try to restrain python sip versions to actually work. Add patch to build with gcc-4.7. Fixes bug#405997. Remove older. |
7 | |
8 | (Portage version: 2.2.0_alpha107/cvs/Linux x86_64) |
9 | |
10 | Revision Changes Path |
11 | 1.1 sci-geosciences/qgis/files/qgis-1.7.4-gcc4.7.patch |
12 | |
13 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/qgis/files/qgis-1.7.4-gcc4.7.patch?rev=1.1&view=markup |
14 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/qgis/files/qgis-1.7.4-gcc4.7.patch?rev=1.1&content-type=text/plain |
15 | |
16 | Index: qgis-1.7.4-gcc4.7.patch |
17 | =================================================================== |
18 | +++ qgis-1.7.4/src/core/spatialindex/storagemanager/DiskStorageManager.cc 2012-04-21 13:58:04.107239275 +0300 |
19 | @@ -26,6 +26,7 @@ |
20 | #include <sys/stat.h> |
21 | #include <stdio.h> |
22 | #include <cstring> |
23 | +#include <unistd.h> |
24 | |
25 | #ifdef WIN32 |
26 | #include <io.h> |
27 | |
28 | +++ qgis-1.7.4/src/core/spatialindex/tools/TemporaryFile.cc 2012-04-21 13:16:42.213690282 +0300 |
29 | @@ -20,7 +20,7 @@ |
30 | // mhadji@×××××.com |
31 | |
32 | #include <stdio.h> |
33 | - |
34 | +#include <unistd.h> |
35 | #include <Tools.h> |
36 | |
37 | #ifdef WIN32 |