diff options
Diffstat (limited to 'academic')
| -rw-r--r-- | academic/qgis/README | 2 | ||||
| -rw-r--r-- | academic/qgis/qgis-1.4.0-sip-4.10.patch | 12 | ||||
| -rw-r--r-- | academic/qgis/qgis.SlackBuild | 9 | ||||
| -rw-r--r-- | academic/qgis/qgis.info | 8 |
4 files changed, 8 insertions, 23 deletions
diff --git a/academic/qgis/README b/academic/qgis/README index 95df659d0c13..ee428bf51c28 100644 --- a/academic/qgis/README +++ b/academic/qgis/README @@ -3,6 +3,6 @@ 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). -This requires proj, geos, gdal, R, gsl, and numpy. +This requires proj, geos, gdal, R, gsl, numpy and qwt. 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 deleted file mode 100644 index c78da4b42e21..000000000000 --- a/academic/qgis/qgis-1.4.0-sip-4.10.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 bc929d9d4a4d..5224ce91f7ef 100644 --- a/academic/qgis/qgis.SlackBuild +++ b/academic/qgis/qgis.SlackBuild @@ -5,8 +5,8 @@ # This script is dedicated to the public domain PRGNAM=qgis -VERSION=${VERSION:-1.4.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.5.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -51,15 +51,12 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# 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_LIBEXEC_SUBDIR=lib${LIBDIRSUFFIX}/qgis \ -DQGIS_PLUGIN_SUBDIR=lib${LIBDIRSUFFIX}/qgis \ -DGRASS_PREFIX=/usr/lib${LIBDIRSUFFIX}/grass diff --git a/academic/qgis/qgis.info b/academic/qgis/qgis.info index 4436aa9bc8b4..1cc56d7f4177 100644 --- a/academic/qgis/qgis.info +++ b/academic/qgis/qgis.info @@ -1,10 +1,10 @@ PRGNAM="qgis" -VERSION="1.4.0" +VERSION="1.5.0" HOMEPAGE="http://qgis.org/" -DOWNLOAD="http://download.osgeo.org/qgis/src/qgis_1.4.0.tar.gz" -MD5SUM="47710e7aa14c2a672c7f28457b0c956f" +DOWNLOAD="http://download.osgeo.org/qgis/src/qgis_1.5.0.tar.gz" +MD5SUM="a198fbcd8d96f5ed5e85a814cbc8f033" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="David Spencer" EMAIL="baildon.research@googlemail.com" -APPROVED="rworkman" +APPROVED="Erik Hanson" |