Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 28 Nov 2020 15:06:31 +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: r556508 - in head/graphics/qgis: . files
Message-ID:  <202011281506.0ASF6VZG013938@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rhurlin
Date: Sat Nov 28 15:06:31 2020
New Revision: 556508
URL: https://svnweb.freebsd.org/changeset/ports/556508

Log:
  graphics/qgis: Update to 3.16.1
  
  Bugfix release [1][2].
  
  [1] https://qgis.org/en/site/forusers/visualchangelog316/index.html
  [2] https://github.com/qgis/QGIS/compare/final-3_16_0...final-3_16_1
  
  If you miss features in QGIS that are actually built
  into QGIS, you may need to enable additional options
  in graphics/gdal, see pkg-message.
  
  Approved by:	arrowd (mentor)
  Differential Revision:	https://reviews.freebsd.org/D27374

Added:
  head/graphics/qgis/files/pkg-message.in   (contents, props changed)
Modified:
  head/graphics/qgis/Makefile
  head/graphics/qgis/distinfo
  head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py
  head/graphics/qgis/pkg-plist

Modified: head/graphics/qgis/Makefile
==============================================================================
--- head/graphics/qgis/Makefile	Sat Nov 28 15:05:39 2020	(r556507)
+++ head/graphics/qgis/Makefile	Sat Nov 28 15:06:31 2020	(r556508)
@@ -3,8 +3,7 @@
 
 PORTNAME=	qgis
 DISTVERSIONPREFIX=	final-
-DISTVERSION=	3_16_0
-PORTREVISION=	2
+DISTVERSION=	3_16_1
 CATEGORIES=	graphics geography
 
 MAINTAINER=	rhurlin@FreeBSD.org
@@ -52,7 +51,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} \
@@ -145,6 +145,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/distinfo
==============================================================================
--- head/graphics/qgis/distinfo	Sat Nov 28 15:05:39 2020	(r556507)
+++ head/graphics/qgis/distinfo	Sat Nov 28 15:06:31 2020	(r556508)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1603630554
-SHA256 (qgis-QGIS-final-3_16_0_GH0.tar.gz) = 7f52b02d2eeab467e1c672c7b86a5d03baca2982e7b8811f908690b1266a1493
-SIZE (qgis-QGIS-final-3_16_0_GH0.tar.gz) = 133786548
+TIMESTAMP = 1606230996
+SHA256 (qgis-QGIS-final-3_16_1_GH0.tar.gz) = bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
+SIZE (qgis-QGIS-final-3_16_1_GH0.tar.gz) = 134902729

Modified: head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py
==============================================================================
--- head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py	Sat Nov 28 15:05:39 2020	(r556507)
+++ head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py	Sat Nov 28 15:06:31 2020	(r556508)
@@ -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/files/pkg-message.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/qgis/files/pkg-message.in	Sat Nov 28 15:06:31 2020	(r556508)
@@ -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
+}
+]
+

Modified: head/graphics/qgis/pkg-plist
==============================================================================
--- head/graphics/qgis/pkg-plist	Sat Nov 28 15:05:39 2020	(r556507)
+++ head/graphics/qgis/pkg-plist	Sat Nov 28 15:06:31 2020	(r556508)
@@ -2796,6 +2796,7 @@ share/metainfo/org.qgis.qgis.appdata.xml
 %%DATADIR%%/i18n/qgis_pt_PT.qm
 %%DATADIR%%/i18n/qgis_ro.qm
 %%DATADIR%%/i18n/qgis_ru.qm
+%%DATADIR%%/i18n/qgis_sc.qm
 %%DATADIR%%/i18n/qgis_sv.qm
 %%DATADIR%%/i18n/qgis_uk.qm
 %%DATADIR%%/i18n/qgis_vi.qm
@@ -5354,11 +5355,19 @@ share/metainfo/org.qgis.qgis.appdata.xml
 %%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/landingpage/README
 %%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/landingpage/css/app.ca3f5643.css
 %%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/landingpage/css/chunk-123bc409.8679d8ba.css
+%%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/landingpage/css/chunk-5cedae10.45a18619.css
+%%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/landingpage/css/chunk-db289a14.336091d0.css
 %%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/landingpage/css/chunk-vendors.a728f495.css
 %%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/landingpage/favicon.ico
 %%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/landingpage/index.html
+%%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/landingpage/js/app.fa6cb20b.js
+%%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/landingpage/js/app.fa6cb20b.js.map
 %%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/landingpage/js/chunk-123bc409.ef3c4d35.js
 %%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/landingpage/js/chunk-123bc409.ef3c4d35.js.map
+%%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/landingpage/js/chunk-5cedae10.b1aed77d.js
+%%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/landingpage/js/chunk-5cedae10.b1aed77d.js.map
+%%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/landingpage/js/chunk-db289a14.4c4313be.js
+%%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/landingpage/js/chunk-db289a14.4c4313be.js.map
 %%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/landingpage/js/chunk-vendors.ebebb286.js
 %%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/landingpage/js/chunk-vendors.ebebb286.js.map
 %%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/style.css



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011281506.0ASF6VZG013938>