svn commit: r498380 - in head/graphics/qgis: . files
Steve Wills
swills at FreeBSD.org
Mon Apr 8 16:02:42 UTC 2019
Author: swills
Date: Mon Apr 8 16:02:40 2019
New Revision: 498380
URL: https://svnweb.freebsd.org/changeset/ports/498380
Log:
graphics/qgis: Update to 3.6.1
PR: 237025
Submitted by: Rainer Hurling <rhurlin at gwdg.de> (maintainer)
Deleted:
head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaUtils.py
head/graphics/qgis/files/patch-src_app_main.cpp
Modified:
head/graphics/qgis/Makefile (contents, props changed)
head/graphics/qgis/distinfo (contents, props changed)
head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py (contents, props changed)
Modified: head/graphics/qgis/Makefile
==============================================================================
--- head/graphics/qgis/Makefile Mon Apr 8 15:30:20 2019 (r498379)
+++ head/graphics/qgis/Makefile Mon Apr 8 16:02:40 2019 (r498380)
@@ -3,8 +3,7 @@
PORTNAME= qgis
DISTVERSIONPREFIX= final-
-DISTVERSION= 3_6_0
-PORTREVISION= 5
+DISTVERSION= 3_6_1
CATEGORIES= graphics geography
MAINTAINER= rhurlin at gwdg.de
@@ -84,7 +83,8 @@ USE_QT= 3d buildtools_build core concurrent dbus decl
printsupport qmake_build script serialport \
sql sql-pgsql sql-sqlite3 svg testlib uitools \
webengine widgets webkit xml
-USE_PYQT= core gui network qml qscintilla2 sip sql svg xml webkit_run
+USE_PYQT= core gui network qml qscintilla2 sip sql svg xml \
+ webkit_run webkitwidgets_run
USE_LDCONFIG= yes
CONFLICTS_INSTALL= qgis-ltr
@@ -110,7 +110,7 @@ CMAKE_OFF+= SUPPRESS_QT_WARNINGS
SHEBANG_FILES= src/plugins/grass/scripts/*.py
OPTIONS_DEFINE= GRASS SERVER
-OPTIONS_DEFAULT= GRASS
+OPTIONS_DEFAULT= GRASS SERVER
NO_OPTIONS_SORT= yes
OPTIONS_SUB= yes
Modified: head/graphics/qgis/distinfo
==============================================================================
--- head/graphics/qgis/distinfo Mon Apr 8 15:30:20 2019 (r498379)
+++ head/graphics/qgis/distinfo Mon Apr 8 16:02:40 2019 (r498380)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550852779
-SHA256 (qgis-QGIS-final-3_6_0_GH0.tar.gz) = 4e50a3ea3bd4b38b6255c0ca6533528c5507863e9bcb50491e5f6038ebe15d9b
-SIZE (qgis-QGIS-final-3_6_0_GH0.tar.gz) = 92695815
+TIMESTAMP = 1554299268
+SHA256 (qgis-QGIS-final-3_6_1_GH0.tar.gz) = e5d891c5d00f3fbfa2a251d4916ce8e2be51534fde23cec5e68f4a351d27b0d3
+SIZE (qgis-QGIS-final-3_6_1_GH0.tar.gz) = 93023810
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 Mon Apr 8 15:30:20 2019 (r498379)
+++ head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py Mon Apr 8 16:02:40 2019 (r498380)
@@ -1,11 +1,20 @@
---- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig 2018-11-23 12:08:36 UTC
+--- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig 2019-03-02 02:07:46 UTC
+++ python/plugins/processing/algs/saga/SagaAlgorithmProvider.py
+@@ -82,7 +82,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider):
+
+ def canBeActivated(self):
+ version = SagaUtils.getInstalledVersion(True)
+- if version is not None and version.startswith(REQUIRED_VERSION):
++ if version is not None and version >= REQUIRED_VERSION:
+ return True
+ return False
+
@@ -93,7 +93,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider):
self.tr('Processing'), Qgis.Critical)
return
- if not version.startswith(REQUIRED_VERSION):
-+ if version < '2.3':
++ if version < REQUIRED_VERSION:
QgsMessageLog.logMessage(self.tr('Problem with SAGA installation: unsupported SAGA version (found: {}, required: {}).').format(version, REQUIRED_VERSION),
self.tr('Processing'),
Qgis.Critical)
More information about the svn-ports-all
mailing list