5 files changed, 35 insertions, 27 deletions
diff --git a/academic/qgis/README b/academic/qgis/README
index fa8a666194..95df659d0c 100644
--- a/academic/qgis/README
+++ b/academic/qgis/README
@@ -1,10 +1,8 @@
-Quantum GIS (QGIS) is a user friendly Geographic Information System
-that runs on Linux, Unix, Mac OSX, and Windows.  QGIS lets you 
-browse and create map data on your computer.  It supports many 
-common spatial data formats (e.g. ESRI ShapeFile, geotiff).
+Quantum GIS (QGIS) is a user friendly Geographic Information System that 
+runs on Linux, Unix, Mac OSX, and Windows.  QGIS lets you browse and create 
+map data on your computer.  It supports many common spatial data formats 
+(e.g. ESRI ShapeFile, geotiff).
 
-The following packages are required by qgis: proj, geos, gdal, R,
-gsl and numpy. Optional dependencies include postgresql, postgis
-and gpsbabel. All these packages are available at SlackBuilds.org.
+This requires proj, geos, gdal, R, gsl, and numpy. 
 
-The Quantum GIS homepage is at http://qgis.org/
+Optional dependencies include postgresql, postgis, and gpsbabel.
diff --git a/academic/qgis/qgis-1.4.0-sip-4.10.patch b/academic/qgis/qgis-1.4.0-sip-4.10.patch
new file mode 100644
index 0000000000..c78da4b42e
--- /dev/null
+++ b/academic/qgis/qgis-1.4.0-sip-4.10.patch
@@ -0,0 +1,12 @@
+--- qgis-1.4.0-original/cmake/Python.cmake	2009-08-19 20:09:10.000000000 +0100
++++ qgis-1.4.0-patched/cmake/Python.cmake	2010-06-29 09:54:01.043992226 +0100
+@@ -150,9 +150,7 @@
+       # minimal version is 4.7 (to support universal builds)
+       SET (SIP_MIN_VERSION 040700)
+       TRY_RUN_PYTHON (RES "import sip\nprint '%x' % sip.SIP_VERSION" SIP_VERSION)
+-      IF (SIP_VERSION EQUAL "${SIP_MIN_VERSION}" OR SIP_VERSION GREATER "${SIP_MIN_VERSION}")
+         SET (SIP_IS_GOOD TRUE)
+-      ENDIF (SIP_VERSION EQUAL "${SIP_MIN_VERSION}" OR SIP_VERSION GREATER "${SIP_MIN_VERSION}")
+     
+       IF (NOT SIP_IS_GOOD)
+         MESSAGE (STATUS "SIP is required in version 4.7 or later!")
diff --git a/academic/qgis/qgis.SlackBuild b/academic/qgis/qgis.SlackBuild
index 40bb9d3abf..bc929d9d4a 100644
--- a/academic/qgis/qgis.SlackBuild
+++ b/academic/qgis/qgis.SlackBuild
@@ -1,20 +1,18 @@
 #!/bin/sh
 
 # Slackware build script for Quantum GIS
-# Written by David Spencer <nobbutl@yahoo.co.uk>
+# Written by David Spencer <baildon.research@googlemail.com>
 # This script is dedicated to the public domain
 
 PRGNAM=qgis
 VERSION=${VERSION:-1.4.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -53,14 +51,17 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-cmake \
+#  Disable broken SIP version check
+#  See https://trac.osgeo.org/qgis/ticket/2446
+patch -p1 < $CWD/qgis-1.4.0-sip-4.10.patch
+
+cmake . \
   -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_INSTALL_PREFIX=/usr \
   -DQGIS_LIB_SUBDIR=lib${LIBDIRSUFFIX} \
   -DQGIS_PLUGIN_SUBDIR=lib${LIBDIRSUFFIX}/qgis \
-  -DGRASS_PREFIX=/usr/lib${LIBDIRSUFFIX}/grass \
-  .
+  -DGRASS_PREFIX=/usr/lib${LIBDIRSUFFIX}/grass
 
 make
 make install DESTDIR=$PKG
@@ -68,10 +69,12 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
+install -D -m 0644 $CWD/$PRGNAM.desktop \
+  $PKG/usr/share/applications/$PRGNAM.desktop
+install -D -m 0644 $CWD/$PRGNAM.png \
+  $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
@@ -81,11 +84,6 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-install -D -m 0644 $CWD/$PRGNAM.desktop \
-  $PKG/usr/share/applications/$PRGNAM.desktop
-install -D -m 0644 $CWD/$PRGNAM.png \
-  $PKG/usr/share/pixmaps/$PRGNAM.png
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh  > $PKG/install/doinst.sh
diff --git a/academic/qgis/qgis.desktop b/academic/qgis/qgis.desktop
index 439e6c3a93..60664c5c64 100644
--- a/academic/qgis/qgis.desktop
+++ b/academic/qgis/qgis.desktop
@@ -8,4 +8,4 @@ TryExec=/usr/bin/qgis
 Terminal=false
 StartupNotify=false
 Type=Application
-Categories=Application;Education;Geography;Other;Qt;
+Categories=Education;Geography;Qt;
diff --git a/academic/qgis/qgis.info b/academic/qgis/qgis.info
index 8603c0dd89..4436aa9bc8 100644
--- a/academic/qgis/qgis.info
+++ b/academic/qgis/qgis.info
@@ -6,5 +6,5 @@ MD5SUM="47710e7aa14c2a672c7f28457b0c956f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="David Spencer"
-EMAIL="nobbutl@yahoo.co.uk"
-APPROVED="michiel"
+EMAIL="baildon.research@googlemail.com"
+APPROVED="rworkman"