diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-31 13:59:08 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-31 13:59:08 -0300 |
| commit | ca4b95e91b33e5b8f02a063862359ab00c5260d5 (patch) | |
| tree | 872d6a54fa0e59e017aa3101880d82f0e54fb70a /gis/qgis/qgis_1.7.4_gcc4.7.patch | |
| parent | 041ebdb9062909e39f81cca8c491c7f8adeed2a3 (diff) | |
| parent | 2ed96c6eb798c762b61a93a8b4cf80220c00ac1f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/libvirt/PKGBUILD
community/opendkim/opendkim.rc
core/nfs-utils/blkmapd.service
multilib/lib32-glib2/PKGBUILD
multilib/lib32-libssh2/PKGBUILD
multilib/lib32-libx11/PKGBUILD
multilib/lib32-qt/PKGBUILD
testing/php/PKGBUILD
testing/xorg-server/PKGBUILD
~fauno/notmuch/PKGBUILD
Diffstat (limited to 'gis/qgis/qgis_1.7.4_gcc4.7.patch')
| -rw-r--r-- | gis/qgis/qgis_1.7.4_gcc4.7.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/gis/qgis/qgis_1.7.4_gcc4.7.patch b/gis/qgis/qgis_1.7.4_gcc4.7.patch new file mode 100644 index 000000000..858a42c94 --- /dev/null +++ b/gis/qgis/qgis_1.7.4_gcc4.7.patch @@ -0,0 +1,20 @@ ++++ qgis-1.7.4/src/core/spatialindex/storagemanager/DiskStorageManager.cc 2012-04-21 13:58:04.107239275 +0300 +@@ -26,6 +26,7 @@ + #include <sys/stat.h> + #include <stdio.h> + #include <cstring> ++#include <unistd.h> + + #ifdef WIN32 + #include <io.h> + ++++ qgis-1.7.4/src/core/spatialindex/tools/TemporaryFile.cc 2012-04-21 13:16:42.213690282 +0300 +@@ -20,7 +20,7 @@ + // mhadji@gmail.com + + #include <stdio.h> +- ++#include <unistd.h> + #include <Tools.h> + + #ifdef WIN32 |