svn commit: r500848 - in head/graphics/qgis-ltr: . files
Kurt Jaeger
pi at FreeBSD.org
Sun May 5 05:57:20 UTC 2019
Author: pi
Date: Sun May 5 05:57:18 2019
New Revision: 500848
URL: https://svnweb.freebsd.org/changeset/ports/500848
Log:
graphics/qgis-ltr: upgrade 3.4.5 -> 3.4.7
- Update several Python dependencies
- Add USE_PYQT=webkitwidgets for plugins like 'OpenLayers Plugin'
- Add USES=gnome, USE_GNOME=libxml2, USE_QT=gamepad, and
LIB_DEPENDS=libsz.so:science/szip to pet 'make DEVELOPER=yes'
- Add OPTIONS_DEFAULT=SERVER
- Change
files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py
to work with REQUIRED_VERSION
- Remove files/patch-python_plugins_processing_algs_saga_SagaUtils.py
and files/patch-src_app_main.cpp, after they are upstream now
- Remove 'world writeable rights' in pkg-plist (not necessary)
- Update pkg-plist
PR: 237685
Submitted by: Rainer Hurling <rhurlin at gwdg.de> (maintainer)
Deleted:
head/graphics/qgis-ltr/files/patch-python_plugins_processing_algs_saga_SagaUtils.py
head/graphics/qgis-ltr/files/patch-src_app_main.cpp
Modified:
head/graphics/qgis-ltr/Makefile
head/graphics/qgis-ltr/distinfo
head/graphics/qgis-ltr/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py
head/graphics/qgis-ltr/pkg-plist
Modified: head/graphics/qgis-ltr/Makefile
==============================================================================
--- head/graphics/qgis-ltr/Makefile Sun May 5 02:39:43 2019 (r500847)
+++ head/graphics/qgis-ltr/Makefile Sun May 5 05:57:18 2019 (r500848)
@@ -3,8 +3,7 @@
PORTNAME= qgis
DISTVERSIONPREFIX= final-
-DISTVERSION= 3_4_5
-PORTREVISION= 4
+DISTVERSION= 3_4_7
CATEGORIES= graphics geography
PKGNAMESUFFIX= -ltr
@@ -18,46 +17,46 @@ BUILD_DEPENDS= gpsbabel>=1.5.4:astro/gpsbabel \
${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}httplib2>=0.11.3:www/py-httplib2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.12.1:www/py-httplib2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.2:math/py-matplotlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.1.1:textproc/py-MarkupSafe@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.0:graphics/py-OWSLib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.1:graphics/py-OWSLib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytz>=2018.7:devel/py-pytz@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.15:databases/py-sqlite3@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}pygments>=2.3.0:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.6:graphics/py-pyproj@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=2019.1:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=3.6.8:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR}
RUN_DEPENDS= astyle:devel/astyle \
${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}gdal>=2.2.4:graphics/py-gdal@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}httplib2>=0.11.3:www/py-httplib2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.12.1:www/py-httplib2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.2:math/py-matplotlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.1.1:textproc/py-MarkupSafe@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2:math/py-numpy@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.0:graphics/py-OWSLib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.1:graphics/py-OWSLib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7.6.1:databases/py-psycopg2@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytz>=2018.7:devel/py-pytz@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.15:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=2.3.0:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.6:graphics/py-pyproj@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=2019.1:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=3.6.8:databases/py-sqlite3@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR}
LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
libexpat.so:textproc/expat2 \
libgdal.so:graphics/gdal \
@@ -73,19 +72,22 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
libqwt6.so:x11-toolkits/qwt6 \
libspatialindex.so:devel/spatialindex \
libspatialite.so:databases/spatialite \
+ libsz.so:science/szip \
libxerces-c.so:textproc/xerces-c3 \
libzip.so:archivers/libzip
### Fortran is needed by numpy, GRASS, etc.
USES= bison cmake compiler:features cpe desktop-file-utils \
- fortran gmake pgsql pyqt:5 python:3.6+ qt:5 shebangfix \
- sqlite:3
+ fortran gmake gnome pgsql pyqt:5 python:3.6+ qt:5 \
+ shebangfix sqlite:3
+USE_GNOME= libxml2
USE_QT= 3d buildtools_build core concurrent dbus declarative \
- designer doc gui linguist_build location network \
- printsupport qmake_build script serialport \
+ designer doc gamepad gui linguist_build location \
+ network 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
@@ -111,7 +113,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-ltr/distinfo
==============================================================================
--- head/graphics/qgis-ltr/distinfo Sun May 5 02:39:43 2019 (r500847)
+++ head/graphics/qgis-ltr/distinfo Sun May 5 05:57:18 2019 (r500848)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1552305246
-SHA256 (qgis-QGIS-final-3_4_5_GH0.tar.gz) = 3183ebd2465ec44555e20dbb790ccff639a9da6eb4bce1e123ae030b1b42c57c
-SIZE (qgis-QGIS-final-3_4_5_GH0.tar.gz) = 89924291
+TIMESTAMP = 1556614839
+SHA256 (qgis-QGIS-final-3_4_7_GH0.tar.gz) = d070da42e842e59ce9a338b40784b9bc4582f3d48a19255fa8aef967cca653ba
+SIZE (qgis-QGIS-final-3_4_7_GH0.tar.gz) = 91022939
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 May 5 02:39:43 2019 (r500847)
+++ head/graphics/qgis-ltr/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py Sun May 5 05:57:18 2019 (r500848)
@@ -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)
Modified: head/graphics/qgis-ltr/pkg-plist
==============================================================================
--- head/graphics/qgis-ltr/pkg-plist Sun May 5 02:39:43 2019 (r500847)
+++ head/graphics/qgis-ltr/pkg-plist Sun May 5 05:57:18 2019 (r500848)
@@ -3749,7 +3749,7 @@ share/metainfo/org.qgis.qgis.appdata.xml
%%DATADIR%%/python/qsci_apis/PyQGIS-2.2.api
%%DATADIR%%/python/qsci_apis/PyQGIS.api
%%DATADIR%%/python/qsci_apis/PyQt5.api
-%%DATADIR%%/python/qsci_apis/Python-%%PYTHON_VER%%.api
+%%DATADIR%%/python/qsci_apis/Python-3.6.api
%%DATADIR%%/python/qsci_apis/QScintilla2-2.4.5.api
%%DATADIR%%/python/qsci_apis/QScintilla2-2.7.2.api
%%DATADIR%%/python/qsci_apis/pyqgis.pap
@@ -4945,7 +4945,6 @@ share/metainfo/org.qgis.qgis.appdata.xml
%%DATADIR%%/resources/cpt-city-qgis-min/wkp/tubs/DESC.xml
%%DATADIR%%/resources/cpt-city-qgis-min/wkp/tubs/nrwc.svg
%%DATADIR%%/resources/customization.xml
- at mode 0666
%%DATADIR%%/resources/data/contributors.json
%%DATADIR%%/resources/data/contributors.qml
%%DATADIR%%/resources/data/qgis-hackfests.json
@@ -4956,7 +4955,6 @@ share/metainfo/org.qgis.qgis.appdata.xml
%%DATADIR%%/resources/data/world_map.qml
%%DATADIR%%/resources/data/world_map.shp
%%DATADIR%%/resources/data/world_map.shx
- at mode
%%DATADIR%%/resources/metadata-ISO/LinkPropertyLookupTable.csv
%%DATADIR%%/resources/metadata-ISO/country_code_ISO_3166.csv
%%DATADIR%%/resources/metadata-ISO/language_codes_ISO_639.csv
More information about the svn-ports-all
mailing list