summaryrefslogtreecommitdiff
path: root/academic
diff options
context:
space:
mode:
authorDavid Spencer <baildon.research@googlemail.com>2012-05-20 16:50:10 -0400
committerErik Hanson <erik@slackbuilds.org>2012-05-21 17:58:10 -0500
commit7df8716586e483682233d5229b2773aa00605314 (patch)
tree6342c9deb12a3949cf673f6c01427d168c828825 /academic
parent058c543a234edd5b896379b35a0bc04c897d5deb (diff)
downloadslackbuilds-7df8716586e483682233d5229b2773aa00605314.tar.gz
academic/qgis: Updated for version 1.7.4.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'academic')
-rw-r--r--academic/qgis/qgis-1.7.4-headers.patch22
-rw-r--r--academic/qgis/qgis.SlackBuild4
-rw-r--r--academic/qgis/qgis.info8
-rw-r--r--academic/qgis/slack-desc4
4 files changed, 31 insertions, 7 deletions
diff --git a/academic/qgis/qgis-1.7.4-headers.patch b/academic/qgis/qgis-1.7.4-headers.patch
new file mode 100644
index 0000000000..2bf3ce6812
--- /dev/null
+++ b/academic/qgis/qgis-1.7.4-headers.patch
@@ -0,0 +1,22 @@
+diff -u -r qgis-1.7.4/src/core/spatialindex/storagemanager/DiskStorageManager.cc qgis-1.7.4_patched/src/core/spatialindex/storagemanager/DiskStorageManager.cc
+--- qgis-1.7.4/src/core/spatialindex/storagemanager/DiskStorageManager.cc 2012-02-19 20:41:41.000000000 +0000
++++ qgis-1.7.4_patched/src/core/spatialindex/storagemanager/DiskStorageManager.cc 2012-04-10 11:59:14.835027450 +0100
+@@ -19,6 +19,7 @@
+ // Email:
+ // mhadji@gmail.com
+
++#include <unistd.h>
+ #include "../spatialindex/SpatialIndexImpl.h"
+
+ #include <fcntl.h>
+diff -u -r qgis-1.7.4/src/core/spatialindex/tools/TemporaryFile.cc qgis-1.7.4_patched/src/core/spatialindex/tools/TemporaryFile.cc
+--- qgis-1.7.4/src/core/spatialindex/tools/TemporaryFile.cc 2012-02-19 20:41:41.000000000 +0000
++++ qgis-1.7.4_patched/src/core/spatialindex/tools/TemporaryFile.cc 2012-04-10 11:26:05.611021572 +0100
+@@ -20,6 +20,7 @@
+ // mhadji@gmail.com
+
+ #include <stdio.h>
++#include <unistd.h>
+
+ #include <Tools.h>
+
diff --git a/academic/qgis/qgis.SlackBuild b/academic/qgis/qgis.SlackBuild
index 4766f141d8..28b9de69ad 100644
--- a/academic/qgis/qgis.SlackBuild
+++ b/academic/qgis/qgis.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=qgis
-VERSION=${VERSION:-1.7.3}
+VERSION=${VERSION:-1.7.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -80,6 +80,8 @@ if [ "${SERVER:-no}" = "yes" ]; then
WITHSERVER="-DWITH_MAPSERVER=TRUE -DQGIS_CGIBIN_SUBDIR=$CGIBINDIR"
fi
+patch -p1 < $CWD/qgis-1.7.4-headers.patch
+
cmake . \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
diff --git a/academic/qgis/qgis.info b/academic/qgis/qgis.info
index 11c94764a5..d1c00388f4 100644
--- a/academic/qgis/qgis.info
+++ b/academic/qgis/qgis.info
@@ -1,10 +1,10 @@
PRGNAM="qgis"
-VERSION="1.7.3"
+VERSION="1.7.4"
HOMEPAGE="http://qgis.org/"
-DOWNLOAD="http://qgis.org/downloads/qgis-1.7.3.tar.bz2"
-MD5SUM="e1b3b1f33ea8d648bde0eddf54f7eb90"
+DOWNLOAD="http://qgis.org/downloads/qgis-1.7.4.tar.bz2"
+MD5SUM="ad6e2bd8c5eb0c486939c420af5d8c44"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="David Spencer"
EMAIL="baildon.research@googlemail.com"
-APPROVED="rworkman"
+APPROVED="dsomero"
diff --git a/academic/qgis/slack-desc b/academic/qgis/slack-desc
index 894e3bb3c6..a5742cd534 100644
--- a/academic/qgis/slack-desc
+++ b/academic/qgis/slack-desc
@@ -9,8 +9,8 @@
qgis: qgis (Quantum GIS)
qgis:
qgis: Quantum GIS is a user friendly Geographic Information System.
-qgis: It lets you browse and create map data on your computer.
-qgis: Many common spatial data formats are supported (including
+qgis: It lets you browse and create map data on your computer.
+qgis: Many common spatial data formats are supported (including
qgis: ESRI ShapeFile and geotiff).
qgis:
qgis: Homepage: http://qgis.org/