diff options
Diffstat (limited to 'gis')
| -rw-r--r-- | gis/qgis/qgis.SlackBuild | 14 | ||||
| -rw-r--r-- | gis/qgis/qgis.info | 6 |
2 files changed, 13 insertions, 7 deletions
diff --git a/gis/qgis/qgis.SlackBuild b/gis/qgis/qgis.SlackBuild index cc23c8d433d82..14135faf63a4e 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 \ diff --git a/gis/qgis/qgis.info b/gis/qgis/qgis.info index 476cf4cdd5c87..166424f358528 100644 --- a/gis/qgis/qgis.info +++ b/gis/qgis/qgis.info @@ -1,8 +1,8 @@ PRGNAM="qgis" -VERSION="2.14.3" +VERSION="2.16.0" HOMEPAGE="http://qgis.org/" -DOWNLOAD="http://qgis.org/downloads/qgis-2.14.3.tar.bz2" -MD5SUM="8598c7bbe47d3b88c0df5524589d2cb0" +DOWNLOAD="http://qgis.org/downloads/qgis-2.16.0.tar.bz2" +MD5SUM="33547fe3a0a0a87de209702a9bb60fcc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gdal libspatialindex pyspatialite numpy psycopg2 qwtpolar" |