From bd55f6de66a3304317d10b2deaffea5aecb05d6c Mon Sep 17 00:00:00 2001 From: Benjamin Trigona-Harany Date: Sun, 10 Jul 2016 11:36:14 -0700 Subject: gis/qgis: Updated for version 2.16.0. Signed-off-by: Benjamin Trigona-Harany --- gis/qgis/qgis.SlackBuild | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'gis/qgis/qgis.SlackBuild') diff --git a/gis/qgis/qgis.SlackBuild b/gis/qgis/qgis.SlackBuild index cc23c8d433..14135faf63 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.14.3} +VERSION=${VERSION:-2.16.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -81,20 +81,26 @@ if [ "${SERVER:-no}" = "yes" ]; then WITHSERVER="-DWITH_SERVER=TRUE -DQGIS_CGIBIN_SUBDIR=$CGIBINDIR" 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="on" \ + -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="off" \ + -DWITH_INTERNAL_QWTPOLAR=FALSE \ -DQWTPOLAR_INCLUDE_DIR=/usr/include/qwt \ + -DENABLE_TESTS=FALSE \ $WITHSERVER \ $WITHGRASS -make +# QGIS 2.16.0 build order requires a parallel build +make -j2 make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ -- cgit v1.2.3