8 files changed, 39 insertions, 56 deletions
diff --git a/academic/qgis/README b/academic/qgis/README
index c61cc76292c2a..38e0543964cc2 100644
--- a/academic/qgis/README
+++ b/academic/qgis/README
@@ -1,9 +1,11 @@
 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).
+that lets you view and manipulate spatial data on your computer.  It 
+supports many common spatial data formats (e.g. PostGIS, ShapeFile and
+geotiff).
 
-Optional dependencies include grass, postgresql, postgis, and gpsbabel.
-
-If you want to build the optional QGIS Server, you also need fcgi;
-see README.server for more details.
+Optional dependencies: 
+ - postgresql and postgis: for PostGIS support
+ - gpsbabel: for the GPS plugin
+ - grass: for the Grass plugin
+ - gsl: for georeferencing support
+ - fcgi: for the QGIS server (see README.server)
diff --git a/academic/qgis/doinst.sh b/academic/qgis/doinst.sh
index 5fb28930db0b9..69d003d68bdce 100644
--- a/academic/qgis/doinst.sh
+++ b/academic/qgis/doinst.sh
@@ -1,3 +1,13 @@
 if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+  /usr/bin/update-desktop-database -q usr/share/applications
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
 fi
diff --git a/academic/qgis/qgis-1.7.4-headers.patch b/academic/qgis/qgis-1.7.4-headers.patch
deleted file mode 100644
index 2bf3ce6812169..0000000000000
--- a/academic/qgis/qgis-1.7.4-headers.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 28b9de69ad283..e76f4fac09364 100644
--- a/academic/qgis/qgis.SlackBuild
+++ b/academic/qgis/qgis.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for Quantum GIS
 
 # Copyright 2011 David Spencer, Baildon, West Yorkshire, U.K.
+# Copyright 2013 Benjamin Trigona-Harany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qgis
-VERSION=${VERSION:-1.7.4}
+VERSION=${VERSION:-1.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -80,8 +81,6 @@ 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" \
@@ -101,18 +100,23 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 
 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
+install -D -m 0644 debian/qgis.desktop \
+  $PKG/usr/share/applications/qgis.desktop
+install -D -m 0644 debian/qgis.xml \
+  $PKG/usr/share/mime/packages/qgis.xml
+
+mkdir -p $PKG/usr/share/pixmaps
+ln -s /usr/share/qgis/images/icons/qgis-icon.png $PKG/usr/share/pixmaps
+ln -s /usr/share/qgis/images/icons/qgis-mime-icon.png $PKG/usr/share/pixmaps
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  doc/AUTHORS BUGS CODING doc/CONTRIBUTORS COPYING CHANGELOG \
+  doc/AUTHORS BUGS CODING doc/CONTRIBUTORS COPYING ChangeLog \
   doc/DONORS Exception_to_GPL_for_Qt.txt INSTALL \
   PROVENANCE README doc/SPONSORS TODO doc/TRANSLATORS \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/README.server > $PKG/usr/doc/$PRGNAM-$VERSION/README.server
 
 # Move a couple of optional server files to a more appropriate place -- they
 # need to be properly customised (and the server works without them).
diff --git a/academic/qgis/qgis.desktop b/academic/qgis/qgis.desktop
deleted file mode 100644
index 60664c5c64a10..0000000000000
--- a/academic/qgis/qgis.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Quantum GIS
-Comment=Geographic Information System
-Icon=qgis
-Exec=qgis %F
-TryExec=/usr/bin/qgis
-Terminal=false
-StartupNotify=false
-Type=Application
-Categories=Education;Geography;Qt;
diff --git a/academic/qgis/qgis.info b/academic/qgis/qgis.info
index 6db73083a6135..b4995d1a69600 100644
--- a/academic/qgis/qgis.info
+++ b/academic/qgis/qgis.info
@@ -1,10 +1,10 @@
 PRGNAM="qgis"
-VERSION="1.7.4"
+VERSION="1.8.0"
 HOMEPAGE="http://qgis.org/"
-DOWNLOAD="http://qgis.org/downloads/qgis-1.7.4.tar.bz2"
-MD5SUM="ad6e2bd8c5eb0c486939c420af5d8c44"
+DOWNLOAD="http://qgis.org/downloads/qgis-1.8.0.tar.bz2"
+MD5SUM="1d60520f81d7763c026d0af887ac9a05"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="gdal gsl numpy qwt"
-MAINTAINER="David Spencer"
-EMAIL="baildon.research@googlemail.com"
+REQUIRES="gdal libspatialindex libspatialite numpy qwt"
+MAINTAINER="Benjamin Trigona-Harany"
+EMAIL="slackbuilds@jaxartes.net"
diff --git a/academic/qgis/qgis.png b/academic/qgis/qgis.png
deleted file mode 100644
index a55bd79a49acf..0000000000000
--- a/academic/qgis/qgis.png
+++ /dev/null
diff --git a/academic/qgis/slack-desc b/academic/qgis/slack-desc
index a5742cd5343b5..2e1aef44a862c 100644
--- a/academic/qgis/slack-desc
+++ b/academic/qgis/slack-desc
@@ -11,7 +11,7 @@ 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: ESRI ShapeFile and geotiff).
+qgis: PostGIS, ESRI ShapeFile and geotiff).
 qgis:
 qgis: Homepage: http://qgis.org/
 qgis: