diff -urN qgis.orig/Makefile qgis/Makefile --- qgis.orig/Makefile 2019-04-08 19:03:31.585621000 +0200 +++ qgis/Makefile 2019-05-05 11:07:45.533356000 +0200 @@ -3,7 +3,7 @@ PORTNAME= qgis DISTVERSIONPREFIX= final- -DISTVERSION= 3_6_1 +DISTVERSION= 3_6_2 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de @@ -16,46 +16,46 @@ ${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}psycopg2>=2.7.7:databases/py-psycopg2@${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 \ @@ -71,16 +71,18 @@ 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 \ diff -urN qgis.orig/distinfo qgis/distinfo --- qgis.orig/distinfo 2019-04-08 19:03:31.611586000 +0200 +++ qgis/distinfo 2019-05-05 10:54:00.216680000 +0200 @@ -1,3 +1,3 @@ -TIMESTAMP = 1554299268 -SHA256 (qgis-QGIS-final-3_6_1_GH0.tar.gz) = e5d891c5d00f3fbfa2a251d4916ce8e2be51534fde23cec5e68f4a351d27b0d3 -SIZE (qgis-QGIS-final-3_6_1_GH0.tar.gz) = 93023810 +TIMESTAMP = 1557046440 +SHA256 (qgis-QGIS-final-3_6_2_GH0.tar.gz) = 10920eaac37ea5986a9f833a2db79ec5d5c359edfc6821643a24cfc68df48638 +SIZE (qgis-QGIS-final-3_6_2_GH0.tar.gz) = 94662525 diff -urN qgis.orig/pkg-plist qgis/pkg-plist --- qgis.orig/pkg-plist 2019-02-27 18:19:20.215896000 +0100 +++ qgis/pkg-plist 2019-05-05 12:11:09.108313000 +0200 @@ -3778,7 +3778,7 @@ %%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 @@ -4974,7 +4974,6 @@ %%DATADIR%%/resources/cpt-city-qgis-min/wkp/tubs/DESC.xml %%DATADIR%%/resources/cpt-city-qgis-min/wkp/tubs/nrwc.svg %%DATADIR%%/resources/customization.xml -@mode 0666 %%DATADIR%%/resources/data/contributors.json %%DATADIR%%/resources/data/contributors.qml %%DATADIR%%/resources/data/qgis-hackfests.json @@ -4985,7 +4984,6 @@ %%DATADIR%%/resources/data/world_map.qml %%DATADIR%%/resources/data/world_map.shp %%DATADIR%%/resources/data/world_map.shx -@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