diff -urN qgis-ltr.orig/Makefile qgis-ltr/Makefile --- qgis-ltr.orig/Makefile 2020-06-04 07:31:54.906026000 +0200 +++ qgis-ltr/Makefile 2020-08-24 22:30:35.958953000 +0200 @@ -3,33 +3,30 @@ PORTNAME= qgis DISTVERSIONPREFIX= final- -DISTVERSION= 3_10_4 -PORTREVISION= 3 +DISTVERSION= 3_10_9 CATEGORIES= graphics geography PKGNAMESUFFIX= -ltr + MAINTAINER= rhurlin@gwdg.de COMMENT= Free and Open Source Geographic Information System -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES= 4bb4bc8fb1b6.patch:-p1 - LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/doc/LICENSE BUILD_DEPENDS= gpsbabel>=1.5.4:astro/gpsbabel \ - txt2tags:textproc/txt2tags \ ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.0:devel/py-dateutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}httplib2>=0.12.1:www/py-httplib2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>=0.17.3:www/py-httplib2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${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.18.0:graphics/py-OWSLib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.20.0: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}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.4.1:textproc/py-pygments@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3: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} \ @@ -37,35 +34,44 @@ ${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}black>=19.10:devel/py-black@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.0:devel/py-dateutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}gdal>=2.4.1:graphics/py-gdal@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gdal>=3.1.0:graphics/py-gdal@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}httplib2>=0.12.1:www/py-httplib2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}geopandas>=0.7.0:graphics/py-geopandas@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>=0.17.3:www/py-httplib2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jedi>=0.12.1:devel/py-jedi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}laspy>=1.5.1:devel/py-laspy@${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}nbformat>=4.4.0:devel/py-nbformat@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nbformat>=5.0.7:devel/py-nbformat@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>=2.1:math/py-networkx@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy>=1.16.1:math/py-numpy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.1:graphics/py-OWSLib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nltk>=3.4.1:textproc/py-nltk@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16.6:math/py-numpy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.18.0:graphics/py-OWSLib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pandas>=0.24.2:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \ ${PY_PILLOW} \ - ${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.3:databases/py-psycopg2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.4.1:textproc/py-pygments@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.5:databases/py-psycopg2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3: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}scikit-image>=0.14.2_2:graphics/py-scikit-image@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.2.6:graphics/py-pyrsgis@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}qt5-quick>=5.13.1:x11-toolkits/py-qt5-quick@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.3:graphics/py-scikit-image@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${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}six>=1.14.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR} LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ libexpat.so:textproc/expat2 \ libgdal.so:graphics/gdal \ @@ -138,6 +144,8 @@ SERVER_CMAKE_BOOL= WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE PLIST_SUB= DISTVERSION=${PORTVERSION} + +INSTALLS_ICONS= yes .include diff -urN qgis-ltr.orig/distinfo qgis-ltr/distinfo --- qgis-ltr.orig/distinfo 2020-06-04 07:31:55.082655000 +0200 +++ qgis-ltr/distinfo 2020-08-24 20:34:27.595360000 +0200 @@ -1,5 +1,5 @@ -TIMESTAMP = 1591017346 -SHA256 (qgis-QGIS-final-3_10_4_GH0.tar.gz) = ef900da2108d9b10069587e7eeed8f42c07f2af50e7552d938ffa9418cb55961 -SIZE (qgis-QGIS-final-3_10_4_GH0.tar.gz) = 120683329 +TIMESTAMP = 1598294067 +SHA256 (qgis-QGIS-final-3_10_9_GH0.tar.gz) = bb7cf7e83dbfac13ebe33336ac825e6b07282a9def4b9159ebce77500a4e28b3 +SIZE (qgis-QGIS-final-3_10_9_GH0.tar.gz) = 121338519 SHA256 (4bb4bc8fb1b6.patch) = 87fa55e54bb72d570747aa10f082a8c2dd3528b11d564f54461372e77e5bde71 SIZE (4bb4bc8fb1b6.patch) = 1918 diff -urN qgis-ltr.orig/files/patch-src_analysis_interpolation_qgsinterpolator.h qgis-ltr/files/patch-src_analysis_interpolation_qgsinterpolator.h --- qgis-ltr.orig/files/patch-src_analysis_interpolation_qgsinterpolator.h 2020-01-05 16:31:04.202234000 +0100 +++ qgis-ltr/files/patch-src_analysis_interpolation_qgsinterpolator.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ ---- src/analysis/interpolation/qgsinterpolator.h.orig 2019-07-10 19:11:16 UTC -+++ src/analysis/interpolation/qgsinterpolator.h -@@ -18,6 +18,7 @@ - #ifndef QGSINTERPOLATOR_H - #define QGSINTERPOLATOR_H - -+#include - #include - #include "qgis_sip.h" - #include "qgis_analysis.h" diff -urN qgis-ltr.orig/files/patch-src_core_CMakeLists.txt qgis-ltr/files/patch-src_core_CMakeLists.txt --- qgis-ltr.orig/files/patch-src_core_CMakeLists.txt 2020-08-16 12:48:26.337737000 +0200 +++ qgis-ltr/files/patch-src_core_CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ ---- src/core/CMakeLists.txt.orig 2019-10-28 04:34:30 UTC ---- src/core/CMakeLists.txt.orig 2020-06-19 12:15:52 UTC -+++ src/core/CMakeLists.txt -@@ -693,9 +693,9 @@ SET(QGIS_CORE_SRCS - ) - - FILE(GLOB JSON_HELP_FILES "${CMAKE_SOURCE_DIR}/resources/function_help/json/*") --IF(NOT USING_NINJA) -+IF(CMAKE_VERSION VERSION_LESS "3.18" AND NOT USING_NINJA) - STRING(REPLACE "$" "$$" JSON_HELP_FILES "${JSON_HELP_FILES}") --ENDIF(NOT USING_NINJA) -+ENDIF(CMAKE_VERSION VERSION_LESS "3.18" AND NOT USING_NINJA) - STRING(REPLACE "\(" "\\(" JSON_HELP_FILES "${JSON_HELP_FILES}") - STRING(REPLACE "\)" "\\)" JSON_HELP_FILES "${JSON_HELP_FILES}") - ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgsexpression_texts.cpp -@@ -889,6 +889,7 @@ ELSE(MSVC) - SET_SOURCE_FILES_PROPERTIES(${QGIS_CORE_MOC_SRCS} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations" ) - IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND (CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)) - SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/qgsexpression_texts.cpp PROPERTIES COMPILE_FLAGS "-O1") -+ SET_SOURCE_FILES_PROPERTIES(qgscoordinatereferencesystem.cpp PROPERTIES COMPILE_FLAGS "-mllvm -inline-threshold=128") - ENDIF () - ENDIF(MSVC) - diff -urN qgis-ltr.orig/pkg-plist qgis-ltr/pkg-plist --- qgis-ltr.orig/pkg-plist 2020-04-02 19:02:41.925906000 +0200 +++ qgis-ltr/pkg-plist 2020-08-24 22:04:47.918327000 +0200 @@ -362,6 +362,7 @@ include/qgis/qgsfilterlineeditplugin.h include/qgis/qgsfindfilesbypatternwidget.h include/qgis/qgsfloatingwidget.h +include/qgis/qgsfocuskeeper.h include/qgis/qgsfocuswatcher.h include/qgis/qgsfontbutton.h include/qgis/qgsfontbuttonplugin.h @@ -1352,7 +1353,6 @@ %%DATADIR%%/doc/CONTRIBUTORS %%DATADIR%%/doc/DONORS %%DATADIR%%/doc/INSTALL -%%DATADIR%%/doc/INSTALL.html %%DATADIR%%/doc/LICENSE %%DATADIR%%/doc/SPONSORS %%DATADIR%%/doc/TRANSLATORS @@ -1395,7 +1395,6 @@ %%DATADIR%%/doc/images/projects/thumbnails/f6379f3083e612fd47917e1f948d795b6951dde9.png.200x100_q85.png %%DATADIR%%/doc/images/qgis-icon-60x60.png %%DATADIR%%/doc/index.html -%%DATADIR%%/doc/news %%DATADIR%%/doc/news.html %%DATADIR%%/doc/nohelp.html %%DATADIR%%/doc/style.css @@ -5134,6 +5133,7 @@ %%DATADIR%%/resources/themes/Blend of Gray/icons/handle-vertical.svg %%DATADIR%%/resources/themes/Blend of Gray/icons/qcheckbox-checked-disabled.svg %%DATADIR%%/resources/themes/Blend of Gray/icons/qcheckbox-checked.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/qcheckbox-intermediary.svg %%DATADIR%%/resources/themes/Blend of Gray/icons/qcheckbox-unchecked-disabled.svg %%DATADIR%%/resources/themes/Blend of Gray/icons/qcheckbox-unchecked.svg %%DATADIR%%/resources/themes/Blend of Gray/icons/qradiobox-checked-disabled.svg @@ -5157,6 +5157,7 @@ %%DATADIR%%/resources/themes/Night Mapping/icons/handle-vertical.svg %%DATADIR%%/resources/themes/Night Mapping/icons/qcheckbox-checked-disabled.svg %%DATADIR%%/resources/themes/Night Mapping/icons/qcheckbox-checked.svg +%%DATADIR%%/resources/themes/Night Mapping/icons/qcheckbox-intermediary.svg %%DATADIR%%/resources/themes/Night Mapping/icons/qcheckbox-unchecked-disabled.svg %%DATADIR%%/resources/themes/Night Mapping/icons/qcheckbox-unchecked.svg %%DATADIR%%/resources/themes/Night Mapping/icons/qradiobox-checked-disabled.svg