diff options
| author | David Spencer <baildon.research@googlemail.com> | 2010-12-22 12:47:31 -0200 |
|---|---|---|
| committer | Niels Horn <niels.horn@slackbuilds.org> | 2010-12-22 12:47:31 -0200 |
| commit | ff761401ec1837481bf8c246a8b54893eb257410 (patch) | |
| tree | 10f708386c873c17afbc93bb21e990145ca3bb24 | |
| parent | 42e0bbbeda1f83edc685ddb692b7dac39bcf2968 (diff) | |
| download | slackbuilds-ff761401ec1837481bf8c246a8b54893eb257410.tar.gz | |
academic/qgis: Updated for version 1.6.0.
Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
| -rw-r--r-- | academic/qgis/README | 2 | ||||
| -rw-r--r-- | academic/qgis/qgis.SlackBuild | 12 | ||||
| -rw-r--r-- | academic/qgis/qgis.info | 8 | ||||
| -rw-r--r-- | academic/qgis/slack-desc | 4 |
4 files changed, 16 insertions, 10 deletions
diff --git a/academic/qgis/README b/academic/qgis/README index ee428bf51c..fa77379c46 100644 --- a/academic/qgis/README +++ b/academic/qgis/README @@ -5,4 +5,4 @@ map data on your computer. It supports many common spatial data formats This requires proj, geos, gdal, R, gsl, numpy and qwt. -Optional dependencies include postgresql, postgis, and gpsbabel. +Optional dependencies include grass, postgresql, postgis, and gpsbabel. diff --git a/academic/qgis/qgis.SlackBuild b/academic/qgis/qgis.SlackBuild index 5224ce91f7..d9e6ebaecc 100644 --- a/academic/qgis/qgis.SlackBuild +++ b/academic/qgis/qgis.SlackBuild @@ -5,7 +5,7 @@ # This script is dedicated to the public domain PRGNAM=qgis -VERSION=${VERSION:-1.5.0} +VERSION=${VERSION:-1.6.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -42,7 +42,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/${PRGNAM}_$VERSION.tar.gz +tar xvf $CWD/${PRGNAM}-$VERSION.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -51,6 +51,11 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +WITHGRASS="" +if pkg-config --exists grass; then + WITHGRASS="-DGRASS_PREFIX=$(pkg-config --variable=prefix grass)" +fi + cmake . \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ @@ -58,7 +63,8 @@ cmake . \ -DQGIS_LIB_SUBDIR=lib${LIBDIRSUFFIX} \ -DQGIS_LIBEXEC_SUBDIR=lib${LIBDIRSUFFIX}/qgis \ -DQGIS_PLUGIN_SUBDIR=lib${LIBDIRSUFFIX}/qgis \ - -DGRASS_PREFIX=/usr/lib${LIBDIRSUFFIX}/grass + -DWITH_MAPSERVER=FALSE \ + $WITHGRASS make make install DESTDIR=$PKG diff --git a/academic/qgis/qgis.info b/academic/qgis/qgis.info index 1cc56d7f41..871f94643c 100644 --- a/academic/qgis/qgis.info +++ b/academic/qgis/qgis.info @@ -1,10 +1,10 @@ PRGNAM="qgis" -VERSION="1.5.0" +VERSION="1.6.0" HOMEPAGE="http://qgis.org/" -DOWNLOAD="http://download.osgeo.org/qgis/src/qgis_1.5.0.tar.gz" -MD5SUM="a198fbcd8d96f5ed5e85a814cbc8f033" +DOWNLOAD="http://qgis.org/downloads/qgis-1.6.0.tar.bz2" +MD5SUM="9ea8a784d970f5009b0e6271820248f6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="David Spencer" EMAIL="baildon.research@googlemail.com" -APPROVED="Erik Hanson" +APPROVED="Niels Horn" diff --git a/academic/qgis/slack-desc b/academic/qgis/slack-desc index ebc3bbedd2..6c74d0b9d5 100644 --- a/academic/qgis/slack-desc +++ b/academic/qgis/slack-desc @@ -1,4 +1,4 @@ - |-----handy-ruler---------------------------------------------------------| + |-----handy-ruler------------------------------------------------------| qgis: qgis (Quantum GIS) qgis: qgis: Quantum GIS is a user friendly Geographic Information System. It lets @@ -9,4 +9,4 @@ qgis: Homepage: http://qgis.org/ qgis: qgis: qgis: -qgis:
\ No newline at end of file +qgis: |