From 35e3d0b1cde2d1ec0b8e7393227115301914f11a Mon Sep 17 00:00:00 2001 From: Benjamin Trigona-Harany Date: Sun, 10 Nov 2019 19:34:17 -0800 Subject: gis/qgis: Updated for version 3.10.0. --- gis/qgis/README | 3 -- gis/qgis/README.server | 23 --------------- gis/qgis/qgis.SlackBuild | 71 +++++++++++++---------------------------------- gis/qgis/qgis.info | 10 +++---- gis/qgis/qjson.cmake.diff | 10 ------- 5 files changed, 25 insertions(+), 92 deletions(-) delete mode 100644 gis/qgis/README.server delete mode 100644 gis/qgis/qjson.cmake.diff diff --git a/gis/qgis/README b/gis/qgis/README index 5fb9af9437..191357970e 100644 --- a/gis/qgis/README +++ b/gis/qgis/README @@ -15,6 +15,3 @@ 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/README.server b/gis/qgis/README.server deleted file mode 100644 index 40fb86b098..0000000000 --- a/gis/qgis/README.server +++ /dev/null @@ -1,23 +0,0 @@ -QGIS Server is a WMS server for your QGIS project. It requires fcgi. It is -optionally built at the same time as QGIS; you need to specify SERVER=yes -to the SlackBuild, for example - - SERVER=yes sh qgis.SlackBuild - -By default, the server is installed into /var/www/cgi-bin/qgis, and so the -WMS URL is 'http:///cgi-bin/qgis/qgis_mapserv.fcgi'. However, a -different directory can be specified by passing CGIBINDIR= to the -SlackBuild script. - -After installing QGIS (and the server), you will need to set up the server. -To serve a single QGIS project, this can be done as follows: - -* In the qgis 'Project Properties' window, on the 'General' tab, ensure -that 'Save paths' is set to 'absolute', and on the 'WMS Server' tab, fill -in all relevant details (particularly including 'Coordinate Systems -Restrictions'). - -* Create a symlink to your QGIS project file from /var/www/cgi-bin/qgis/: - - ln -s /home/user/maps/mymap.qgs /var/www/cgi-bin/qgis/ - diff --git a/gis/qgis/qgis.SlackBuild b/gis/qgis/qgis.SlackBuild index 3d24b91656..ad24ea53e7 100644 --- a/gis/qgis/qgis.SlackBuild +++ b/gis/qgis/qgis.SlackBuild @@ -1,9 +1,9 @@ #!/bin/sh -# Slackware build script for Quantum GIS +# Slackware build script for QGIS # Copyright 2011 David Spencer, Baildon, West Yorkshire, U.K. -# Copyright 2013 Benjamin Trigona-Harany +# Copyright 2013-2019 Benjamin Trigona-Harany # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=qgis -VERSION=${VERSION:-2.18.18} +VERSION=${VERSION:-3.10.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -70,26 +70,15 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -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)" +else + WITHGRASS="" fi -WITHSERVER="-DWITH_SERVER=FALSE" -CGIBINDIR="${CGIBINDIR:-/var/www/cgi-bin/qgis}" -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 +sed -i 's|${SIP_BINARY_PATH}|/usr/bin/python3-sip|' cmake/SIPMacros.cmake -mkdir build +mkdir -p build cd build cmake .. \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ @@ -99,51 +88,31 @@ cd build -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 \ + -DWITH_QWTPOLAR=TRUE \ + -DWITH_CUSTOM_WIDGETS=TRUE \ + -DBINDINGS_GLOBAL_INSTALL=TRUE \ + -DQWT_INCLUDE_DIR=/usr/include/qt5/qwt \ + -DQSCINTILLA_INCLUDE_DIR=/usr/include/qt5 \ -DENABLE_TESTS=FALSE \ - $WITHSERVER \ - $WITHGRASS \ - $WITHNINJA + -DWITH_3D=TRUE \ + $WITHGRASS - if [ -z "$WITHNINJA" ]; then - make install -j2 DESTDIR=$PKG - else - DESTDIR=$PKG ninja install - fi -cd - +make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -install -D -m 0644 debian/qgis.desktop \ - $PKG/usr/share/applications/qgis.desktop -install -D -m 0644 debian/qgis.xml \ - $PKG/usr/share/mime/packages/qgis.xml -sed -i "s_image/jpeg;__" $PKG/usr/share/applications/qgis.desktop - -mkdir -p $PKG/usr/share/pixmaps -ln -s /usr/share/qgis/images/icons/qgis-icon.png $PKG/usr/share/pixmaps/qgis.png -ln -s /usr/share/qgis/images/icons/qgis-mime-icon.png $PKG/usr/share/pixmaps/qgis-mime.png +mv $PKG/usr/share/metainfo $PKG/usr/share/appdata -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc +mv $PKG/usr/share/$PRGNAM/doc $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - doc/AUTHORS BUGS doc/CONTRIBUTORS COPYING ChangeLog \ - doc/DONORS Exception_to_GPL_for_Qt.txt INSTALL NEWS \ - PROVENANCE README.md doc/SPONSORS doc/TRANSLATORS \ + ChangeLog Exception_to_GPL_for_Qt.txt NEWS \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -cat $CWD/README.server > $PKG/usr/doc/$PRGNAM-$VERSION/README.server - -# Move a couple of optional server files to a more appropriate place -- they -# need to be properly customised (and the server works without them). -if [ -d $PKG/$CGIBINDIR ]; then - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples - mv $PKG/$CGIBINDIR/wms_metadata.xml $PKG/$CGIBINDIR/admin.sld \ - $PKG/usr/doc/$PRGNAM-$VERSION/examples -fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/gis/qgis/qgis.info b/gis/qgis/qgis.info index 91e35ce6c1..3e55b6b70c 100644 --- a/gis/qgis/qgis.info +++ b/gis/qgis/qgis.info @@ -1,10 +1,10 @@ PRGNAM="qgis" -VERSION="2.18.18" -HOMEPAGE="http://qgis.org/" -DOWNLOAD="http://qgis.org/downloads/qgis-2.18.18.tar.bz2" -MD5SUM="297a0bf4e04e00f7f8d091691499f69d" +VERSION="3.10.0" +HOMEPAGE="https://qgis.org/" +DOWNLOAD="https://qgis.org/downloads/qgis-3.10.0.tar.bz2" +MD5SUM="3e239191121daca5b953f40e68ee15d6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="gdal Jinja2 libspatialindex numpy OWSLib Pygments psycopg2 pyspatialite qwtpolar" +#REQUIRES="postgis libspatialite libspatialindex numpy3 qwt-qt5 QScintilla-qt5 qtkeychain python3-six qca-qt5 python3-PyYAML python-requests Pygments pytz OWSLib psycopg2 Jinja2" MAINTAINER="Benjamin Trigona-Harany" EMAIL="slackbuilds@jaxartes.net" diff --git a/gis/qgis/qjson.cmake.diff b/gis/qgis/qjson.cmake.diff deleted file mode 100644 index a6bd906aef..0000000000 --- a/gis/qgis/qjson.cmake.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- qgis-2.16.0.orig/src/providers/arcgisrest/CMakeLists.txt 2016-07-09 06:48:26.627018690 -0700 -+++ qgis-2.16.0/providers/arcgisrest/CMakeLists.txt 2016-07-09 06:48:03.037018088 -0700 -@@ -1,4 +1,6 @@ --FIND_PACKAGE(QJSON) -+if(NOT TARGET qjson) -+ FIND_PACKAGE(QJSON) -+endif() - - INCLUDE_DIRECTORIES( - ../../core -- cgit v1.2.3