Date: Sun, 29 Nov 2020 18:58:09 +0000 (UTC) From: Rainer Hurling <rhurlin@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r556597 - in head/graphics/qgis-ltr: . files Message-ID: <202011291858.0ATIw9H2055878@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rhurlin Date: Sun Nov 29 18:58:09 2020 New Revision: 556597 URL: https://svnweb.freebsd.org/changeset/ports/556597 Log: graphics/qgis-ltr: Update to 3.10.12 Bugfix release [1][2]. [1] https://qgis.org/en/site/forusers/visualchangelog310/index.html [2] https://github.com/qgis/QGIS/compare/final-3_10_11...final-3_10_12 If you miss features in QGIS-LTR that are actually built into QGIS-LTR, you may need to enable additional options in graphics/gdal, see pkg-message. Approved by: arrowd, tcberner (mentors, implicit) Added: head/graphics/qgis-ltr/files/pkg-message.in (contents, props changed) Modified: head/graphics/qgis-ltr/Makefile head/graphics/qgis-ltr/distinfo head/graphics/qgis-ltr/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py Modified: head/graphics/qgis-ltr/Makefile ============================================================================== --- head/graphics/qgis-ltr/Makefile Sun Nov 29 18:53:59 2020 (r556596) +++ head/graphics/qgis-ltr/Makefile Sun Nov 29 18:58:09 2020 (r556597) @@ -3,8 +3,7 @@ PORTNAME= qgis DISTVERSIONPREFIX= final- -DISTVERSION= 3_10_11 -PORTREVISION= 2 +DISTVERSION= 3_10_12 CATEGORIES= graphics geography PKGNAMESUFFIX= -ltr @@ -53,7 +52,8 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ libspatialite.so:databases/spatialite \ libsz.so:science/szip \ libxerces-c.so:textproc/xerces-c3 \ - libzip.so:archivers/libzip + libzip.so:archivers/libzip \ + libzstd.so:archivers/zstd RUN_DEPENDS= astyle:devel/astyle \ opencl>=0:devel/opencl \ ${PYTHON_PKGNAMEPREFIX}black>=19.10:devel/py-black@${PY_FLAVOR} \ @@ -146,6 +146,8 @@ GRASS_RUN_DEPENDS= ${GRASS_BUILD_DEPENDS} GRASS_CMAKE_BOOL= WITH_GRASS7 SERVER_LIB_DEPENDS= libfcgi.so:www/fcgi SERVER_CMAKE_BOOL= WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE + +SUB_FILES= pkg-message PLIST_SUB= DISTVERSION=${PORTVERSION} Modified: head/graphics/qgis-ltr/distinfo ============================================================================== --- head/graphics/qgis-ltr/distinfo Sun Nov 29 18:53:59 2020 (r556596) +++ head/graphics/qgis-ltr/distinfo Sun Nov 29 18:58:09 2020 (r556597) @@ -1,3 +1,3 @@ -TIMESTAMP = 1604338743 -SHA256 (qgis-QGIS-final-3_10_11_GH0.tar.gz) = 955cb28e98b3eb35dd57b4335b069cb295a7c70d8546b3a1f18750a293abf704 -SIZE (qgis-QGIS-final-3_10_11_GH0.tar.gz) = 121987800 +TIMESTAMP = 1606668510 +SHA256 (qgis-QGIS-final-3_10_12_GH0.tar.gz) = 2ccd292588246c2ce00739d378028f7d859b9b8bd44ef0216d9846c9854ef130 +SIZE (qgis-QGIS-final-3_10_12_GH0.tar.gz) = 122038716 Modified: head/graphics/qgis-ltr/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py ============================================================================== --- head/graphics/qgis-ltr/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py Sun Nov 29 18:53:59 2020 (r556596) +++ head/graphics/qgis-ltr/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py Sun Nov 29 18:58:09 2020 (r556597) @@ -1,20 +1,27 @@ ---- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig 2020-03-27 05:50:09 UTC +--- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig 2019-12-07 13:18:21 UTC +++ python/plugins/processing/algs/saga/SagaAlgorithmProvider.py -@@ -79,7 +79,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider): +@@ -79,13 +79,13 @@ class SagaAlgorithmProvider(QgsProcessingProvider): def canBeActivated(self): version = SagaUtils.getInstalledVersion(True) - if version is not None and (version.startswith(REQUIRED_VERSION) or version.startswith(BETA_SUPPORT_VERSION)): -+ if version is not None and version >= REQUIRED_VERSION: ++ if version is not None and (version.startswith(REQUIRED_VERSION) or version >= BETA_SUPPORT_VERSION): return True return False + def warningMessage(self): + version = SagaUtils.getInstalledVersion(True) +- if version is not None and version.startswith(BETA_SUPPORT_VERSION): ++ if version is not None and version >= BETA_SUPPORT_VERSION: + return self.tr('SAGA version {} is not officially supported - algorithms may encounter issues').format(version) + return '' + @@ -96,7 +96,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider): self.tr('Processing'), Qgis.Critical) return - if not version.startswith(REQUIRED_VERSION) and not version.startswith(BETA_SUPPORT_VERSION): -+ if version < REQUIRED_VERSION: ++ if not version.startswith(REQUIRED_VERSION) and not version >= BETA_SUPPORT_VERSION: QgsMessageLog.logMessage(self.tr('Problem with SAGA installation: unsupported SAGA version (found: {}, required: {}).').format(version, REQUIRED_VERSION), self.tr('Processing'), Qgis.Critical) Added: head/graphics/qgis-ltr/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/qgis-ltr/files/pkg-message.in Sun Nov 29 18:58:09 2020 (r556597) @@ -0,0 +1,18 @@ +[ +{ type: install + message: <<EOM +The QGIS port contains many dependencies on other ports. +In GDAL, one of the most important dependencies, very important +additional dependencies are not enabled by default. + +To get the most complete functionality in QGIS, it is strongly +recommended that you build and install the graphics/gdal port +with at least the following options enabled before compiling QGIS: + +CURL EXPAT FREEXL GEOS HDF5 JASPER KML LIBXML2 NETCDF OPENJPEG +PCRE PGSQL SFCGAL SPATIALITE SQLITE WEBP XERCES ZSTD POPPLER + +EOM +} +] +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011291858.0ATIw9H2055878>