From 608f45bfe3059c6b4a27bd7d1c92088f2090aeb6 Mon Sep 17 00:00:00 2001
From: Benjamin Trigona-Harany <bosth@alumni.sfu.ca>
Date: Fri, 24 Mar 2017 12:55:22 -0700
Subject: gis/qgis: Updated for version 2.18.5.

Signed-off-by: Benjamin Trigona-Harany <bosth@alumni.sfu.ca>
---
 gis/qgis/README          |  3 +++
 gis/qgis/qgis.SlackBuild | 18 ++++++++++++++----
 gis/qgis/qgis.info       |  6 +++---
 3 files changed, 20 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 gis/qgis/qgis.SlackBuild

(limited to 'gis/qgis')

diff --git a/gis/qgis/README b/gis/qgis/README
index 191357970eb90..5fb9af943759c 100644
--- a/gis/qgis/README
+++ b/gis/qgis/README
@@ -15,3 +15,6 @@ Optional run-time dependencies:
  - R
  - saga-gis
  - TauDEM
+
+If ninja is installed, set NINJA=yes to use it for parallel builds that should
+be faster on most systems.
diff --git a/gis/qgis/qgis.SlackBuild b/gis/qgis/qgis.SlackBuild
old mode 100644
new mode 100755
index 1b6bd785c6ade..0de4b5e79dfd5
--- 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.4}
+VERSION=${VERSION:-2.18.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -81,6 +81,11 @@ if [ "${SERVER:-no}" = "yes" ]; then
   WITHSERVER="-DWITH_SERVER=TRUE -DQGIS_CGIBIN_SUBDIR=$CGIBINDIR"
 fi
 
+WITHNINJA=""
+if [ "${NINJA:-no}" = "yes" ]; then
+  WITHNINJA="-GNinja"
+fi
+
 # fix double qjson target
 patch -p1 < $CWD/qjson.cmake.diff
 
@@ -91,7 +96,6 @@ cd build
     -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 \
@@ -99,8 +103,14 @@ cd build
     -DQWTPOLAR_INCLUDE_DIR=/usr/include/qwt \
     -DENABLE_TESTS=FALSE \
     $WITHSERVER \
-    $WITHGRASS
-  make install DESTDIR=$PKG
+    $WITHGRASS \
+    $WITHNINJA
+
+  if [ -z "$WITHNINJA" ]; then
+    make install DESTDIR=$PKG
+  else
+    DESTDIR=$PKG ninja install
+  fi
 cd -
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/gis/qgis/qgis.info b/gis/qgis/qgis.info
index fc678dba95a44..0189b0d045fd2 100644
--- a/gis/qgis/qgis.info
+++ b/gis/qgis/qgis.info
@@ -1,8 +1,8 @@
 PRGNAM="qgis"
-VERSION="2.18.4"
+VERSION="2.18.5"
 HOMEPAGE="http://qgis.org/"
-DOWNLOAD="http://qgis.org/downloads/qgis-2.18.4.tar.bz2"
-MD5SUM="4b7607d66f1d91a827495facca487544"
+DOWNLOAD="http://qgis.org/downloads/qgis-2.18.5.tar.bz2"
+MD5SUM="dd2fdd649613a9ff14f2e2da86a59aa5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gdal libspatialindex numpy psycopg2 pyspatialite qwtpolar"
-- 
cgit v1.2.3