From b6f9404c9a8abc79a4e4704e92c70f735a9d0118 Mon Sep 17 00:00:00 2001
From: Benjamin Trigona-Harany <bosth@alumni.sfu.ca>
Date: Sun, 27 Nov 2016 23:06:51 -0800
Subject: gis/qgis: Updated for version 2.18.1.

Signed-off-by: Benjamin Trigona-Harany <bosth@alumni.sfu.ca>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 gis/qgis/qgis.SlackBuild | 36 +++++++++++++++++++-----------------
 gis/qgis/qgis.info       |  6 +++---
 2 files changed, 22 insertions(+), 20 deletions(-)

(limited to 'gis/qgis')

diff --git a/gis/qgis/qgis.SlackBuild b/gis/qgis/qgis.SlackBuild
index c39960c8d9..fdd352f1c8 100644
--- a/gis/qgis/qgis.SlackBuild
+++ b/gis/qgis/qgis.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qgis
-VERSION=${VERSION:-2.18.0}
+VERSION=${VERSION:-2.18.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -84,22 +84,24 @@ fi
 # fix double qjson target
 patch -p1 < $CWD/qjson.cmake.diff
 
-cmake . \
-  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_BUILD_TYPE="Release" \
-  -DCMAKE_INSTALL_PREFIX=/usr \
-  -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \
-  -DQGIS_LIB_SUBDIR=lib${LIBDIRSUFFIX} \
-  -DQGIS_LIBEXEC_SUBDIR=lib${LIBDIRSUFFIX}/qgis \
-  -DQGIS_PLUGIN_SUBDIR=lib${LIBDIRSUFFIX}/qgis \
-  -DWITH_INTERNAL_QWTPOLAR=FALSE \
-  -DQWTPOLAR_INCLUDE_DIR=/usr/include/qwt \
-  -DENABLE_TESTS=FALSE \
-  $WITHSERVER \
-  $WITHGRASS
-
-make install DESTDIR=$PKG
+mkdir build
+cd build
+  cmake .. \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE="Release" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \
+    -DQGIS_LIB_SUBDIR=lib${LIBDIRSUFFIX} \
+    -DQGIS_LIBEXEC_SUBDIR=lib${LIBDIRSUFFIX}/qgis \
+    -DQGIS_PLUGIN_SUBDIR=lib${LIBDIRSUFFIX}/qgis \
+    -DWITH_INTERNAL_QWTPOLAR=FALSE \
+    -DQWTPOLAR_INCLUDE_DIR=/usr/include/qwt \
+    -DENABLE_TESTS=FALSE \
+    $WITHSERVER \
+    $WITHGRASS
+  make install DESTDIR=$PKG
+cd -
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/gis/qgis/qgis.info b/gis/qgis/qgis.info
index 41189a83b5..4dcae291c6 100644
--- a/gis/qgis/qgis.info
+++ b/gis/qgis/qgis.info
@@ -1,8 +1,8 @@
 PRGNAM="qgis"
-VERSION="2.18.0"
+VERSION="2.18.1"
 HOMEPAGE="http://qgis.org/"
-DOWNLOAD="http://qgis.org/downloads/qgis-2.18.0.tar.bz2"
-MD5SUM="861c4af53113158581b42df2acbc3773"
+DOWNLOAD="http://qgis.org/downloads/qgis-2.18.1.tar.bz2"
+MD5SUM="97a1bd221adc665b054436142cb7f067"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gdal libspatialindex pyspatialite numpy psycopg2 qwtpolar"
-- 
cgit v1.2.3