Attachment #217580 for bug #248888





PORTNAME=	qgis
DISTVERSIONPREFIX=	final-
DISTVERSION=	3_10_9
PORTREVISION=	3
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=	33192f38bc7d.patch:-p1 \
		12203f0ce527.patch:-p1 \
		6e9d42d70099.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.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>=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>=19.1.1:devel/py-pip@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${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}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.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}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}httplib2>=0.12.1: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}nbformat>=4.4.0: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}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
		${PY_PILLOW} \
		${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.8.3:databases/py-psycopg2@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}pygments>=2.4.1: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}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}termcolor>=1.1.0:devel/py-termcolor@${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 \

		libsz.so:science/szip \
		libxerces-c.so:textproc/xerces-c3 \
		libzip.so:archivers/libzip
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.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}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}MarkupSafe>=1.1.1:textproc/py-MarkupSafe@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${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}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>=19.1.1:devel/py-pip@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${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}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.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.3.1:devel/py-yaml@${PY_FLAVOR}

### Fortran is needed by numpy, GRASS, etc.
USES=		bison cmake compiler:features cpe desktop-file-utils \
		fortran gmake gl gnome pgsql pyqt:5 python:3.6+ qca qt:5 \
		shebangfix sqlite:3
USE_GITHUB=	yes
GH_PROJECT=	${PORTNAME:tu}
USE_GL=		gl
USE_GNOME=	libxml2
INSTALLS_ICONS=	yes
USE_LDCONFIG=	yes
USE_PYQT=	core gui network qml quickwidgets qscintilla2 \
		sip sql svg webkit_run webkitwidgets_run xml
USE_QT=		3d buildtools_build core concurrent dbus declarative \
		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 quickwidgets qscintilla2 \
		sip sql svg webkit_run webkitwidgets_run xml
USE_LDCONFIG=	yes

SHEBANG_FILES=	src/plugins/grass/scripts/*.py

USE_GITHUB=	yes
GH_PROJECT=	${PORTNAME:tu}

CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
		-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
		-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \

		WITH_POSTGRESQL
CMAKE_OFF=	WITH_GLOBE WITH_QWTPOLAR

CONFLICTS_INSTALL=	qgis

PLIST_SUB=	DISTVERSION=${PORTVERSION}

.if !defined(MAINTAINER_MODE)
CMAKE_ARGS+=	-Wno-dev
CMAKE_OFF+=	SUPPRESS_QT_WARNINGS
.endif

SHEBANG_FILES=	src/plugins/grass/scripts/*.py

OPTIONS_DEFINE=		GRASS SERVER
OPTIONS_DEFAULT=	GRASS SERVER
NO_OPTIONS_SORT=	yes

SERVER_LIB_DEPENDS=	libfcgi.so:www/fcgi
SERVER_CMAKE_BOOL=	WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE

PLIST_SUB=	DISTVERSION=${PORTVERSION}

.include <bsd.port.pre.mk>

post-patch:

		${WRKSRC}/src/core/CMakeLists.txt
.endif

	@${REINPLACE_CMD} -e 's|%%PYQT_SIPDIR%%|${PYQT_SIPDIR}|' \
		${WRKSRC}/cmake/FindPyQt5.py \
		${WRKSRC}/cmake/FindSIP.py

pre-configure:
	${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3


Lines 1-5 Link Here

(-)graphics/qgis-ltr/distinfo (-5 / +9 lines)
1	TIMESTAMP = 1591017346	1	TIMESTAMP = 1598608287
2	SHA256 (qgis-QGIS-final-3_10_4_GH0.tar.gz) = ef900da2108d9b10069587e7eeed8f42c07f2af50e7552d938ffa9418cb55961	2	SHA256 (qgis-QGIS-final-3_10_9_GH0.tar.gz) = bb7cf7e83dbfac13ebe33336ac825e6b07282a9def4b9159ebce77500a4e28b3
3	SIZE (qgis-QGIS-final-3_10_4_GH0.tar.gz) = 120683329	3	SIZE (qgis-QGIS-final-3_10_9_GH0.tar.gz) = 121338519
4	SHA256 (4bb4bc8fb1b6.patch) = 87fa55e54bb72d570747aa10f082a8c2dd3528b11d564f54461372e77e5bde71	4	SHA256 (33192f38bc7d.patch) = 97d3f882bea11c5342ddf53f6c055f9f38c5af18edb2d52c116f1dab4a49189b
5	SIZE (4bb4bc8fb1b6.patch) = 1918	5	SIZE (33192f38bc7d.patch) = 12604
		6	SHA256 (12203f0ce527.patch) = bb30342fbf19f1a9150abd97fb1b5d6bbe3f3062bb217a7179332d0b02168235
		7	SIZE (12203f0ce527.patch) = 2452
		8	SHA256 (6e9d42d70099.patch) = 44c3ecc27c839492d9eae2d352e0ea9f37c11a419fb3f8862350b1e52cb359a6
		9	SIZE (6e9d42d70099.patch) = 1513




--- CMakeLists.txt.orig	2020-08-27 11:28:26 UTC
+++ CMakeLists.txt
@@ -154,6 +154,7 @@ IF(WITH_CORE)
     # as otherwise user has to use PYTHONPATH environment variable to add
     # QGIS bindings to package search path
     SET (BINDINGS_GLOBAL_INSTALL FALSE CACHE BOOL "Install bindings to global python directory? (might need root)")
+    SET (SIP_GLOBAL_INSTALL FALSE CACHE BOOL "Install sip source files to system sip directory? (might need root)")
     SET (WITH_STAGED_PLUGINS TRUE CACHE BOOL "Stage-install core Python plugins to run from build directory? (utilities and console are always staged)")
     SET (WITH_PY_COMPILE FALSE CACHE BOOL "Determines whether Python modules in staged or installed locations are byte-compiled")
     # concatenate QScintilla2 API files
@@ -851,7 +852,7 @@ IF (WITH_CORE AND WITH_BINDINGS)
   INCLUDE(SIPMacros)
 
   SET(SIP_INCLUDES ${PYQT_SIP_DIR} ${CMAKE_SOURCE_DIR}/python)
-  SET(SIP_CONCAT_PARTS 4)
+  SET(SIP_CONCAT_PARTS 6)
 
   IF (NOT BINDINGS_GLOBAL_INSTALL)
     SET(PYTHON_SITE_PACKAGES_DIR ${QGIS_DATA_DIR}/python)




--- cmake/FindPyQt5.py.orig	2020-08-28 05:25:49 UTC
+++ cmake/FindPyQt5.py
@@ -30,14 +30,15 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
+import os.path
+import PyQt5.QtCore
+
 try:
-    import PyQt5.pyqtconfig
-    pyqtcfg = PyQt5.pyqtconfig.Configuration()
+    __import__('sipbuild')
 except ImportError:
-    import PyQt5.QtCore
-    import sipconfig # won't work for SIP v5
-    import os.path
+    import sipconfig  # won't work for SIP v5
     import sys
+
     cfg = sipconfig.Configuration()
     sip_dir = cfg.default_sip_dir
     if sys.platform.startswith('freebsd'):
@@ -51,38 +52,44 @@ except ImportError:
             sip_dir = p
             break
     cfg = {
-        'pyqt_version': PyQt5.QtCore.PYQT_VERSION,
-        'pyqt_version_str': PyQt5.QtCore.PYQT_VERSION_STR,
-        'pyqt_sip_flags': PyQt5.QtCore.PYQT_CONFIGURATION['sip_flags'],
         'pyqt_mod_dir': os.path.join(cfg.default_mod_dir, "PyQt5"),
         'pyqt_sip_dir': sip_dir,
         'pyqt_bin_dir': cfg.default_bin_dir,
     }
-    pyqtcfg = sipconfig.Configuration([cfg])
+else:  # Code for SIP v5
+    from distutils.sysconfig import get_python_lib
+    import shutil
+    cfg = {
+        'pyqt_mod_dir': os.path.dirname(PyQt5.__file__),
+        'pyqt_sip_dir': "%%PYQT_SIPDIR%%",
+        'pyqt_bin_dir': os.path.dirname(shutil.which("pyuic5")),
+    }
 
-print("pyqt_version:%06.0x" % pyqtcfg.pyqt_version)
-print("pyqt_version_num:%d" % pyqtcfg.pyqt_version)
-print("pyqt_version_str:%s" % pyqtcfg.pyqt_version_str)
+print("pyqt_version:%06.0x" % PyQt5.QtCore.PYQT_VERSION)
+print("pyqt_version_num:%d" % PyQt5.QtCore.PYQT_VERSION)
+print("pyqt_version_str:%s" % PyQt5.QtCore.PYQT_VERSION_STR)
 
 pyqt_version_tag = ""
 in_t = False
-for item in pyqtcfg.pyqt_sip_flags.split(' '):
+pyqt_config_list = PyQt5.QtCore.PYQT_CONFIGURATION["sip_flags"].split(' ')
+for item in pyqt_config_list:
     if item == "-t":
         in_t = True
     elif in_t:
-        if item.startswith("Qt_4"):
+        if item.startswith("Qt_5"):
             pyqt_version_tag = item
     else:
         in_t = False
 print("pyqt_version_tag:%s" % pyqt_version_tag)
 
-print("pyqt_mod_dir:%s" % pyqtcfg.pyqt_mod_dir)
-print("pyqt_sip_dir:%s" % pyqtcfg.pyqt_sip_dir)
-print("pyqt_sip_flags:%s" % pyqtcfg.pyqt_sip_flags)
-print("pyqt_bin_dir:%s" % pyqtcfg.pyqt_bin_dir)
+print("pyqt_mod_dir:%s" % cfg['pyqt_mod_dir'])
+print("pyqt_sip_dir:%s" % cfg['pyqt_sip_dir'])
+print("pyqt_sip_flags:%s" % PyQt5.QtCore.PYQT_CONFIGURATION['sip_flags'])
+print("pyqt_bin_dir:%s" % cfg['pyqt_bin_dir'])
 
 try:
     import PyQt5.sip
+
     print("pyqt_sip_module:PyQt5.sip")
 except:
     print("pyqt_sip_module:sip")

Line 0 Link Here

(-)graphics/qgis-ltr/files/patch-cmake_FindPythonLibrary.cmake (+11 lines)
	1	--- cmake/FindPythonLibrary.cmake.orig 2020-08-28 05:25:49 UTC
	2	+++ cmake/FindPythonLibrary.cmake
	3	@@ -103,7 +103,7 @@ else(EXISTS "${PYTHON_INCLUDE_PATH}" AND EXISTS "${PYT
	4	if(APPLE)
	5	# keep reference to system or custom python site-packages
	6	# useful during app-bundling operations
	7	- set(PYTHON_SITE_PACKAGES_SYS ${PYTHON_SITE_PACKAGES_DIR})
	8	+ set(PYTHON_SITE_PACKAGES_SYS ${PYTHON_SITE_PACKAGES_DIR} CACHE FILEPATH "Directory holding Python site packages")
	9	endif(APPLE)
	10	set(PYTHON_LIBRARIES ${PYTHON_LIBRARY})
	11	if(NOT PYTHONLIBRARY_FIND_QUIETLY)




--- cmake/FindQGIS.cmake.orig	2020-08-28 05:25:49 UTC
+++ cmake/FindQGIS.cmake
@@ -122,7 +122,7 @@ ELSE(WIN32)
       PATHS
         ${QGIS_BUILD_PATH}/output/lib/qgis_core.framework/Headers
         ${QGIS_MAC_PATH}/Frameworks/qgis_core.framework/Headers
-        {QGIS_PREFIX_PATH}/include/qgis
+        ${QGIS_PREFIX_PATH}/include/qgis
         /usr/include/qgis
         /usr/local/include/qgis
         /Library/Frameworks/qgis_core.framework/Headers
@@ -133,7 +133,7 @@ ELSE(WIN32)
       PATHS
         ${QGIS_BUILD_PATH}/src/ui
         ${QGIS_MAC_PATH}/Frameworks/qgis_gui.framework/Headers
-        {QGIS_PREFIX_PATH}/include/qgis
+        ${QGIS_PREFIX_PATH}/include/qgis
         /usr/include/qgis
         /usr/local/include/qgis
         /Library/Frameworks/qgis_gui.framework/Headers




--- cmake/FindQtQmlTools.cmake.orig	2020-08-28 05:25:49 UTC
+++ cmake/FindQtQmlTools.cmake
@@ -22,12 +22,11 @@
 
 MACRO(FIND_QMLPLUGINDUMP)
   get_filename_component(QT_BIN_DIR "${QT_QMAKE_EXECUTABLE}" DIRECTORY)
-
   IF(NOT QMLPLUGINDUMP_EXECUTABLE)
     IF (MSVC)
       FIND_PROGRAM(QMLPLUGINDUMP_EXECUTABLE qmlplugindump.exe PATHS ${QT_BIN_DIR} NO_DEFAULT_PATH)
     ELSE (MSVC)
-      FIND_PROGRAM(QMLPLUGINDUMP_EXECUTABLE qmlplugindump PATHS ${QT_BIN_DIR} NO_DEFAULT_PATH)
+      FIND_PROGRAM(QMLPLUGINDUMP_EXECUTABLE qmlplugindump PATHS ${QT_BIN_DIR})
     ENDIF (MSVC)
   ENDIF(NOT QMLPLUGINDUMP_EXECUTABLE)
 

Line 0 Link Here

(-)graphics/qgis-ltr/files/patch-cmake_FindQwt.cmake (+10 lines)
	1	--- cmake/FindQwt.cmake.orig 2020-08-28 05:25:49 UTC
	2	+++ cmake/FindQwt.cmake
	3	@@ -32,6 +32,7 @@ endif()
	4	FIND_PATH(QWT_INCLUDE_DIR NAMES qwt.h PATHS
	5	"${_qwt_fw}/Headers"
	6	/usr/include
	7	+ /usr/include/qt5
	8	/usr/local/include
	9	/usr/local/include/qt5
	10	"$ENV{LIB_DIR}/include"




--- cmake/FindSIP.cmake.orig	2020-08-28 05:25:49 UTC
+++ cmake/FindSIP.cmake
@@ -40,8 +40,12 @@ ELSE(SIP_VERSION)
     STRING(REGEX REPLACE ".*\nsip_version_str:([^\n]+).*$" "\\1" SIP_VERSION_STR ${sip_config})
     STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_BINARY_PATH ${sip_config})
     STRING(REGEX REPLACE ".*\ndefault_sip_dir:([^\n]+).*$" "\\1" SIP_DEFAULT_SIP_DIR ${sip_config})
-    STRING(REGEX REPLACE ".*\nsip_inc_dir:([^\n]+).*$" "\\1" SIP_INCLUDE_DIR ${sip_config})
-    STRING(REGEX REPLACE ".*\nsip_module_dir:([^\n]+).*$" "\\1" SIP_MODULE_DIR ${sip_config})
+    IF(${SIP_VERSION_STR} VERSION_LESS 5)
+      STRING(REGEX REPLACE ".*\nsip_inc_dir:([^\n]+).*$" "\\1" SIP_INCLUDE_DIR ${sip_config})
+      STRING(REGEX REPLACE ".*\nsip_module_dir:([^\n]+).*$" "\\1" SIP_MODULE_DIR ${sip_config})
+    ELSE(${SIP_VERSION_STR} VERSION_LESS 5)
+      FIND_PROGRAM(SIP_MODULE_EXECUTABLE sip-module)
+    ENDIF(${SIP_VERSION_STR} VERSION_LESS 5)
     SET(SIP_FOUND TRUE)
   ENDIF(sip_config)
 




--- cmake/FindSIP.py.orig	2020-08-28 05:25:49 UTC
+++ cmake/FindSIP.py
@@ -30,17 +30,31 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-import sipconfig
+try:
+    import sipbuild
+except ImportError:  # Code for SIP v4
+    import sipconfig
 
-sipcfg = sipconfig.Configuration()
-print("sip_version:%06.0x" % sipcfg.sip_version)
-print("sip_version_num:%d" % sipcfg.sip_version)
-print("sip_version_str:%s" % sipcfg.sip_version_str)
-print("sip_bin:%s" % sipcfg.sip_bin)
-print("default_sip_dir:%s" % sipcfg.default_sip_dir)
-print("sip_inc_dir:%s" % sipcfg.sip_inc_dir)
-# SIP 4.19.10+ has new sipcfg.sip_module_dir
-if hasattr(sipcfg, "sip_module_dir"):
-    print("sip_module_dir:%s" % sipcfg.sip_module_dir)
-else:
-    print("sip_module_dir:%s" % sipcfg.sip_mod_dir)
+    sipcfg = sipconfig.Configuration()
+    print("sip_version:%06.0x" % sipcfg.sip_version)
+    print("sip_version_num:%d" % sipcfg.sip_version)
+    print("sip_version_str:%s" % sipcfg.sip_version_str)
+    print("sip_bin:%s" % sipcfg.sip_bin)
+    print("default_sip_dir:%s" % sipcfg.default_sip_dir)
+    print("sip_inc_dir:%s" % sipcfg.sip_inc_dir)
+    # SIP 4.19.10+ has new sipcfg.sip_module_dir
+    if hasattr(sipcfg, "sip_module_dir"):
+        print("sip_module_dir:%s" % sipcfg.sip_module_dir)
+    else:
+        print("sip_module_dir:%s" % sipcfg.sip_mod_dir)
+else:  # Code for SIP v5
+    print("sip_version:%06.0x" % sipbuild.version.SIP_VERSION)
+    print("sip_version_num:%d" % sipbuild.version.SIP_VERSION)
+    print("sip_version_str:%s" % sipbuild.version.SIP_VERSION_STR)
+
+    import shutil
+    print("sip_bin:%s" % shutil.which("sip5"))
+
+    from distutils.sysconfig import get_python_lib
+    python_modules_dir = "%%PYQT_SIPDIR%%"
+    print("default_sip_dir:%s" % python_modules_dir)




--- cmake/SIPMacros.cmake.orig	2020-08-28 05:25:49 UTC
+++ cmake/SIPMacros.cmake
@@ -121,6 +121,12 @@ MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MODULE_NAME MODU
     DEPENDS ${SIP_EXTRA_FILES_DEPEND}
     VERBATIM
   )
+  IF (SIP_MODULE_EXECUTABLE)
+    ADD_CUSTOM_COMMAND(
+      OUTPUT ${_sip_output_files} APPEND
+      COMMAND ${SIP_MODULE_EXECUTABLE} --target-dir ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} --sip-h ${PYQT5_SIP_IMPORT}
+    )
+  ENDIF (SIP_MODULE_EXECUTABLE)
 
   ADD_CUSTOM_TARGET(generate_sip_${MODULE_NAME}_cpp_files DEPENDS ${_sip_output_files})
 

Lines 1-10 Link Here

(-)graphics/qgis-ltr/files/patch-src_analysis_interpolation_qgsinterpolator.h (-10 lines)
1	--- src/analysis/interpolation/qgsinterpolator.h.orig 2019-07-10 19:11:16 UTC
2	+++ src/analysis/interpolation/qgsinterpolator.h
3	@@ -18,6 +18,7 @@
4	#ifndef QGSINTERPOLATOR_H
5	#define QGSINTERPOLATOR_H
6
7	+#include <QList>
8	#include <QVector>
9	#include "qgis_sip.h"
10	#include "qgis_analysis.h"




--- src/core/CMakeLists.txt.orig	2020-08-14 12:07:53 UTC
--- src/core/CMakeLists.txt.orig	2020-06-19 12:15:52 UTC
+++ src/core/CMakeLists.txt
@@ -894,6 +894,7 @@ ELSE(MSVC)
 )
 
 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")




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

%%DATADIR%%/doc/CONTRIBUTORS
%%DATADIR%%/doc/DONORS
%%DATADIR%%/doc/INSTALL
%%DATADIR%%/doc/INSTALL.html
%%DATADIR%%/doc/LICENSE
%%DATADIR%%/doc/SPONSORS
%%DATADIR%%/doc/TRANSLATORS

%%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

%%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

%%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

Return to bug 248888

Lines 362-367 Link Here

(-)graphics/qgis-ltr/pkg-plist (-2 / +3 lines)
362	include/qgis/qgsfilterlineeditplugin.h	362	include/qgis/qgsfilterlineeditplugin.h
363	include/qgis/qgsfindfilesbypatternwidget.h	363	include/qgis/qgsfindfilesbypatternwidget.h
364	include/qgis/qgsfloatingwidget.h	364	include/qgis/qgsfloatingwidget.h
		365	include/qgis/qgsfocuskeeper.h
365	include/qgis/qgsfocuswatcher.h	366	include/qgis/qgsfocuswatcher.h
366	include/qgis/qgsfontbutton.h	367	include/qgis/qgsfontbutton.h
367	include/qgis/qgsfontbuttonplugin.h	368	include/qgis/qgsfontbuttonplugin.h
Lines 1352-1358 Link Here
1352	%%DATADIR%%/doc/CONTRIBUTORS	1353	%%DATADIR%%/doc/CONTRIBUTORS
1353	%%DATADIR%%/doc/DONORS	1354	%%DATADIR%%/doc/DONORS
1354	%%DATADIR%%/doc/INSTALL	1355	%%DATADIR%%/doc/INSTALL
1355	%%DATADIR%%/doc/INSTALL.html
1356	%%DATADIR%%/doc/LICENSE	1356	%%DATADIR%%/doc/LICENSE
1357	%%DATADIR%%/doc/SPONSORS	1357	%%DATADIR%%/doc/SPONSORS
1358	%%DATADIR%%/doc/TRANSLATORS	1358	%%DATADIR%%/doc/TRANSLATORS
Lines 1395-1401 Link Here
1395	%%DATADIR%%/doc/images/projects/thumbnails/f6379f3083e612fd47917e1f948d795b6951dde9.png.200x100_q85.png	1395	%%DATADIR%%/doc/images/projects/thumbnails/f6379f3083e612fd47917e1f948d795b6951dde9.png.200x100_q85.png
1396	%%DATADIR%%/doc/images/qgis-icon-60x60.png	1396	%%DATADIR%%/doc/images/qgis-icon-60x60.png
1397	%%DATADIR%%/doc/index.html	1397	%%DATADIR%%/doc/index.html
1398	%%DATADIR%%/doc/news
1399	%%DATADIR%%/doc/news.html	1398	%%DATADIR%%/doc/news.html
1400	%%DATADIR%%/doc/nohelp.html	1399	%%DATADIR%%/doc/nohelp.html
1401	%%DATADIR%%/doc/style.css	1400	%%DATADIR%%/doc/style.css
Lines 5134-5139 Link Here
5134	%%DATADIR%%/resources/themes/Blend of Gray/icons/handle-vertical.svg	5133	%%DATADIR%%/resources/themes/Blend of Gray/icons/handle-vertical.svg
5135	%%DATADIR%%/resources/themes/Blend of Gray/icons/qcheckbox-checked-disabled.svg	5134	%%DATADIR%%/resources/themes/Blend of Gray/icons/qcheckbox-checked-disabled.svg
5136	%%DATADIR%%/resources/themes/Blend of Gray/icons/qcheckbox-checked.svg	5135	%%DATADIR%%/resources/themes/Blend of Gray/icons/qcheckbox-checked.svg
		5136	%%DATADIR%%/resources/themes/Blend of Gray/icons/qcheckbox-intermediary.svg
5137	%%DATADIR%%/resources/themes/Blend of Gray/icons/qcheckbox-unchecked-disabled.svg	5137	%%DATADIR%%/resources/themes/Blend of Gray/icons/qcheckbox-unchecked-disabled.svg
5138	%%DATADIR%%/resources/themes/Blend of Gray/icons/qcheckbox-unchecked.svg	5138	%%DATADIR%%/resources/themes/Blend of Gray/icons/qcheckbox-unchecked.svg
5139	%%DATADIR%%/resources/themes/Blend of Gray/icons/qradiobox-checked-disabled.svg	5139	%%DATADIR%%/resources/themes/Blend of Gray/icons/qradiobox-checked-disabled.svg
Lines 5157-5162 Link Here
5157	%%DATADIR%%/resources/themes/Night Mapping/icons/handle-vertical.svg	5157	%%DATADIR%%/resources/themes/Night Mapping/icons/handle-vertical.svg
5158	%%DATADIR%%/resources/themes/Night Mapping/icons/qcheckbox-checked-disabled.svg	5158	%%DATADIR%%/resources/themes/Night Mapping/icons/qcheckbox-checked-disabled.svg
5159	%%DATADIR%%/resources/themes/Night Mapping/icons/qcheckbox-checked.svg	5159	%%DATADIR%%/resources/themes/Night Mapping/icons/qcheckbox-checked.svg
		5160	%%DATADIR%%/resources/themes/Night Mapping/icons/qcheckbox-intermediary.svg
5160	%%DATADIR%%/resources/themes/Night Mapping/icons/qcheckbox-unchecked-disabled.svg	5161	%%DATADIR%%/resources/themes/Night Mapping/icons/qcheckbox-unchecked-disabled.svg
5161	%%DATADIR%%/resources/themes/Night Mapping/icons/qcheckbox-unchecked.svg	5162	%%DATADIR%%/resources/themes/Night Mapping/icons/qcheckbox-unchecked.svg
5162	%%DATADIR%%/resources/themes/Night Mapping/icons/qradiobox-checked-disabled.svg	5163	%%DATADIR%%/resources/themes/Night Mapping/icons/qradiobox-checked-disabled.svg

Lines 3-35 Link Here

(-)graphics/qgis-ltr/Makefile (-54 / +68 lines)
3		3
4	PORTNAME= qgis	4	PORTNAME= qgis
5	DISTVERSIONPREFIX= final-	5	DISTVERSIONPREFIX= final-
6	DISTVERSION= 3_10_4	6	DISTVERSION= 3_10_9
7	PORTREVISION= 3
8	CATEGORIES= graphics geography	7	CATEGORIES= graphics geography
9	PKGNAMESUFFIX= -ltr	8	PKGNAMESUFFIX= -ltr
		9
10	MAINTAINER= rhurlin@gwdg.de	10	MAINTAINER= rhurlin@gwdg.de
11	COMMENT= Free and Open Source Geographic Information System	11	COMMENT= Free and Open Source Geographic Information System
12		12
13	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/	13	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
14	PATCHFILES= 4bb4bc8fb1b6.patch:-p1	14	PATCHFILES= 33192f38bc7d.patch:-p1 \
		15	12203f0ce527.patch:-p1 \
		16	6e9d42d70099.patch:-p1
15		17
16	LICENSE= GPLv2	18	LICENSE= GPLv2
		19	LICENSE_FILE= ${WRKSRC}/doc/LICENSE
17		20
18	BUILD_DEPENDS= gpsbabel>=1.5.4:astro/gpsbabel \	21	BUILD_DEPENDS= gpsbabel>=1.5.4:astro/gpsbabel \
19	txt2tags:textproc/txt2tags \
20	${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \	22	${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
21	${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.0:devel/py-dateutil@${PY_FLAVOR} \	23	${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \
22	${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \	24	${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
23	${PYTHON_PKGNAMEPREFIX}httplib2>=0.12.1:www/py-httplib2@${PY_FLAVOR} \	25	${PYTHON_PKGNAMEPREFIX}httplib2>=0.17.3:www/py-httplib2@${PY_FLAVOR} \
24	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \	26	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
25	${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.1.1:textproc/py-MarkupSafe@${PY_FLAVOR} \	27	${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.1.1:textproc/py-MarkupSafe@${PY_FLAVOR} \
26	${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \	28	${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
27	${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \	29	${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \
28	${PYTHON_PKGNAMEPREFIX}OWSLib>=0.18.0:graphics/py-OWSLib@${PY_FLAVOR} \	30	${PYTHON_PKGNAMEPREFIX}OWSLib>=0.20.0:graphics/py-OWSLib@${PY_FLAVOR} \
29	${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \	31	${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
30	${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \	32	${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \
31	${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \	33	${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
32	${PYTHON_PKGNAMEPREFIX}pygments>=2.4.1:textproc/py-pygments@${PY_FLAVOR} \	34	${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \
33	${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \	35	${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
34	${PYTHON_PKGNAMEPREFIX}pytz>=2019.1:devel/py-pytz@${PY_FLAVOR} \	36	${PYTHON_PKGNAMEPREFIX}pytz>=2019.1:devel/py-pytz@${PY_FLAVOR} \
35	${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR} \	37	${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR} \
Lines 36-71 Link Here
36	${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} \	38	${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} \
37	${PYTHON_PKGNAMEPREFIX}sqlite3>=3.6.8:databases/py-sqlite3@${PY_FLAVOR} \	39	${PYTHON_PKGNAMEPREFIX}sqlite3>=3.6.8:databases/py-sqlite3@${PY_FLAVOR} \
38	${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR}	40	${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR}
39	RUN_DEPENDS= astyle:devel/astyle \
40	${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
41	${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.0:devel/py-dateutil@${PY_FLAVOR} \
42	${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \
43	${PYTHON_PKGNAMEPREFIX}gdal>=2.4.1:graphics/py-gdal@${PY_FLAVOR} \
44	${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \
45	${PYTHON_PKGNAMEPREFIX}httplib2>=0.12.1:www/py-httplib2@${PY_FLAVOR} \
46	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
47	${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.1.1:textproc/py-MarkupSafe@${PY_FLAVOR} \
48	${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
49	${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
50	${PYTHON_PKGNAMEPREFIX}nbformat>=4.4.0:devel/py-nbformat@${PY_FLAVOR} \
51	${PYTHON_PKGNAMEPREFIX}networkx>=2.1:math/py-networkx@${PY_FLAVOR} \
52	${PYTHON_PKGNAMEPREFIX}numpy>=1.16.1:math/py-numpy@${PY_FLAVOR} \
53	${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.1:graphics/py-OWSLib@${PY_FLAVOR} \
54	${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
55	${PY_PILLOW} \
56	${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
57	${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
58	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.3:databases/py-psycopg2@${PY_FLAVOR} \
59	${PYTHON_PKGNAMEPREFIX}pygments>=2.4.1:textproc/py-pygments@${PY_FLAVOR} \
60	${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
61	${PYTHON_PKGNAMEPREFIX}pytz>=2019.1:devel/py-pytz@${PY_FLAVOR} \
62	${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR} \
63	${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.2_2:graphics/py-scikit-image@${PY_FLAVOR} \
64	${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \
65	${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} \
66	${PYTHON_PKGNAMEPREFIX}sqlite3>=3.6.8:databases/py-sqlite3@${PY_FLAVOR} \
67	${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
68	${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR}
69	LIB_DEPENDS= libexiv2.so:graphics/exiv2 \	41	LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
70	libexpat.so:textproc/expat2 \	42	libexpat.so:textproc/expat2 \
71	libgdal.so:graphics/gdal \	43	libgdal.so:graphics/gdal \
Lines 83-109 Link Here
83	libsz.so:science/szip \	55	libsz.so:science/szip \
84	libxerces-c.so:textproc/xerces-c3 \	56	libxerces-c.so:textproc/xerces-c3 \
85	libzip.so:archivers/libzip	57	libzip.so:archivers/libzip
		58	RUN_DEPENDS= astyle:devel/astyle \
		59	${PYTHON_PKGNAMEPREFIX}black>=19.10:devel/py-black@${PY_FLAVOR} \
		60	${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
		61	${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \
		62	${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
		63	${PYTHON_PKGNAMEPREFIX}gdal>=3.1.0:graphics/py-gdal@${PY_FLAVOR} \
		64	${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \
		65	${PYTHON_PKGNAMEPREFIX}geopandas>=0.7.0:graphics/py-geopandas@${PY_FLAVOR} \
		66	${PYTHON_PKGNAMEPREFIX}httplib2>=0.17.3:www/py-httplib2@${PY_FLAVOR} \
		67	${PYTHON_PKGNAMEPREFIX}jedi>=0.12.1:devel/py-jedi@${PY_FLAVOR} \
		68	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
		69	${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.1.1:textproc/py-MarkupSafe@${PY_FLAVOR} \
		70	${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
		71	${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \
		72	${PYTHON_PKGNAMEPREFIX}nbformat>=5.0.7:devel/py-nbformat@${PY_FLAVOR} \
		73	${PYTHON_PKGNAMEPREFIX}networkx>=2.1:math/py-networkx@${PY_FLAVOR} \
		74	${PYTHON_PKGNAMEPREFIX}nltk>=3.4.1:textproc/py-nltk@${PY_FLAVOR} \
		75	${PYTHON_PKGNAMEPREFIX}numpy>=1.16.6:math/py-numpy@${PY_FLAVOR} \
		76	${PYTHON_PKGNAMEPREFIX}OWSLib>=0.18.0:graphics/py-OWSLib@${PY_FLAVOR} \
		77	${PYTHON_PKGNAMEPREFIX}pandas>=0.24.2:math/py-pandas@${PY_FLAVOR} \
		78	${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
		79	${PY_PILLOW} \
		80	${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \
		81	${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
		82	${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \
		83	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.5:databases/py-psycopg2@${PY_FLAVOR} \
		84	${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \
		85	${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
		86	${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.2.6:graphics/py-pyrsgis@${PY_FLAVOR} \
		87	${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \
		88	${PYTHON_PKGNAMEPREFIX}qt5-quick>=5.13.1:x11-toolkits/py-qt5-quick@${PY_FLAVOR} \
		89	${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
		90	${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.3:graphics/py-scikit-image@${PY_FLAVOR} \
		91	${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \
		92	${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \
		93	${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \
		94	${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
		95	${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR}
86		96
87	### Fortran is needed by numpy, GRASS, etc.	97	### Fortran is needed by numpy, GRASS, etc.
88	USES= bison cmake compiler:features cpe desktop-file-utils \	98	USES= bison cmake compiler:features cpe desktop-file-utils \
89	fortran gmake gl gnome pgsql pyqt:5 python:3.6+ qca qt:5 \	99	fortran gmake gl gnome pgsql pyqt:5 python:3.6+ qca qt:5 \
90	shebangfix sqlite:3	100	shebangfix sqlite:3
		101	USE_GITHUB= yes
		102	GH_PROJECT= ${PORTNAME:tu}
		103	USE_GL= gl
91	USE_GNOME= libxml2	104	USE_GNOME= libxml2
92	USE_GL= gl	105	INSTALLS_ICONS= yes
		106	USE_LDCONFIG= yes
		107	USE_PYQT= core gui network qml quickwidgets qscintilla2 \
		108	sip sql svg webkit_run webkitwidgets_run xml
93	USE_QT= 3d buildtools_build core concurrent dbus declarative \	109	USE_QT= 3d buildtools_build core concurrent dbus declarative \
94	designer doc gamepad gui linguist_build location \	110	designer doc gamepad gui linguist_build location \
95	network printsupport qmake_build script serialport \	111	network printsupport qmake_build script serialport \
96	sql sql-pgsql sql-sqlite3 svg testlib uitools \	112	sql sql-pgsql sql-sqlite3 svg testlib uitools \
97	webengine widgets webkit xml	113	webengine widgets webkit xml
98	USE_PYQT= core gui network qml quickwidgets qscintilla2 \
99	sip sql svg webkit_run webkitwidgets_run xml
100	USE_LDCONFIG= yes
101		114
102	CONFLICTS_INSTALL= qgis	115	SHEBANG_FILES= src/plugins/grass/scripts/*.py
103		116
104	USE_GITHUB= yes
105	GH_PROJECT= ${PORTNAME:tu}
106
107	CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Release \	117	CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Release \
108	-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \	118	-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
109	-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \	119	-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
Lines 117-129 Link Here
117	WITH_POSTGRESQL	127	WITH_POSTGRESQL
118	CMAKE_OFF= WITH_GLOBE WITH_QWTPOLAR	128	CMAKE_OFF= WITH_GLOBE WITH_QWTPOLAR
119		129
		130	CONFLICTS_INSTALL= qgis
		131
		132	PLIST_SUB= DISTVERSION=${PORTVERSION}
		133
120	.if !defined(MAINTAINER_MODE)	134	.if !defined(MAINTAINER_MODE)
121	CMAKE_ARGS+= -Wno-dev	135	CMAKE_ARGS+= -Wno-dev
122	CMAKE_OFF+= SUPPRESS_QT_WARNINGS	136	CMAKE_OFF+= SUPPRESS_QT_WARNINGS
123	.endif	137	.endif
124		138
125	SHEBANG_FILES= src/plugins/grass/scripts/*.py
126
127	OPTIONS_DEFINE= GRASS SERVER	139	OPTIONS_DEFINE= GRASS SERVER
128	OPTIONS_DEFAULT= GRASS SERVER	140	OPTIONS_DEFAULT= GRASS SERVER
129	NO_OPTIONS_SORT= yes	141	NO_OPTIONS_SORT= yes
Lines 137-144 Link Here
137	SERVER_LIB_DEPENDS= libfcgi.so:www/fcgi	149	SERVER_LIB_DEPENDS= libfcgi.so:www/fcgi
138	SERVER_CMAKE_BOOL= WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE	150	SERVER_CMAKE_BOOL= WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE
139		151
140	PLIST_SUB= DISTVERSION=${PORTVERSION}
141
142	.include <bsd.port.pre.mk>	152	.include <bsd.port.pre.mk>
143		153
144	post-patch:	154	post-patch:
Lines 149-154 Link Here
149	${WRKSRC}/src/core/CMakeLists.txt	159	${WRKSRC}/src/core/CMakeLists.txt
150	.endif	160	.endif
151		161
		162	@${REINPLACE_CMD} -e 's\|%%PYQT_SIPDIR%%\|${PYQT_SIPDIR}\|' \
		163	${WRKSRC}/cmake/FindPyQt5.py \
		164	${WRKSRC}/cmake/FindSIP.py
		165
152	pre-configure:	166	pre-configure:
153	${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3	167	${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3
154		168

Line 0 Link Here

(-)graphics/qgis-ltr/files/patch-CMakeLists.txt (+19 lines)
	1	--- CMakeLists.txt.orig 2020-08-27 11:28:26 UTC
	2	+++ CMakeLists.txt
	3	@@ -154,6 +154,7 @@ IF(WITH_CORE)
	4	# as otherwise user has to use PYTHONPATH environment variable to add
	5	# QGIS bindings to package search path
	6	SET (BINDINGS_GLOBAL_INSTALL FALSE CACHE BOOL "Install bindings to global python directory? (might need root)")
	7	+ SET (SIP_GLOBAL_INSTALL FALSE CACHE BOOL "Install sip source files to system sip directory? (might need root)")
	8	SET (WITH_STAGED_PLUGINS TRUE CACHE BOOL "Stage-install core Python plugins to run from build directory? (utilities and console are always staged)")
	9	SET (WITH_PY_COMPILE FALSE CACHE BOOL "Determines whether Python modules in staged or installed locations are byte-compiled")
	10	# concatenate QScintilla2 API files
	11	@@ -851,7 +852,7 @@ IF (WITH_CORE AND WITH_BINDINGS)
	12	INCLUDE(SIPMacros)
	13
	14	SET(SIP_INCLUDES ${PYQT_SIP_DIR} ${CMAKE_SOURCE_DIR}/python)
	15	- SET(SIP_CONCAT_PARTS 4)
	16	+ SET(SIP_CONCAT_PARTS 6)
	17
	18	IF (NOT BINDINGS_GLOBAL_INSTALL)
	19	SET(PYTHON_SITE_PACKAGES_DIR ${QGIS_DATA_DIR}/python)

Line 0 Link Here

(-)graphics/qgis-ltr/files/patch-cmake_FindPyQt5.py (+81 lines)
		1	--- cmake/FindPyQt5.py.orig 2020-08-28 05:25:49 UTC
		2	+++ cmake/FindPyQt5.py
		3	@@ -30,14 +30,15 @@
		4	# Redistribution and use is allowed according to the terms of the BSD license.
		5	# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
		6
		7	+import os.path
		8	+import PyQt5.QtCore
		9	+
		10	try:
		11	- import PyQt5.pyqtconfig
		12	- pyqtcfg = PyQt5.pyqtconfig.Configuration()
		13	+ __import__('sipbuild')
		14	except ImportError:
		15	- import PyQt5.QtCore
		16	- import sipconfig # won't work for SIP v5
		17	- import os.path
		18	+ import sipconfig # won't work for SIP v5
		19	import sys
		20	+
		21	cfg = sipconfig.Configuration()
		22	sip_dir = cfg.default_sip_dir
		23	if sys.platform.startswith('freebsd'):
		24	@@ -51,38 +52,44 @@ except ImportError:
		25	sip_dir = p
		26	break
		27	cfg = {
		28	- 'pyqt_version': PyQt5.QtCore.PYQT_VERSION,
		29	- 'pyqt_version_str': PyQt5.QtCore.PYQT_VERSION_STR,
		30	- 'pyqt_sip_flags': PyQt5.QtCore.PYQT_CONFIGURATION['sip_flags'],
		31	'pyqt_mod_dir': os.path.join(cfg.default_mod_dir, "PyQt5"),
		32	'pyqt_sip_dir': sip_dir,
		33	'pyqt_bin_dir': cfg.default_bin_dir,
		34	}
		35	- pyqtcfg = sipconfig.Configuration([cfg])
		36	+else: # Code for SIP v5
		37	+ from distutils.sysconfig import get_python_lib
		38	+ import shutil
		39	+ cfg = {
		40	+ 'pyqt_mod_dir': os.path.dirname(PyQt5.__file__),
		41	+ 'pyqt_sip_dir': "%%PYQT_SIPDIR%%",
		42	+ 'pyqt_bin_dir': os.path.dirname(shutil.which("pyuic5")),
		43	+ }
		44
		45	-print("pyqt_version:%06.0x" % pyqtcfg.pyqt_version)
		46	-print("pyqt_version_num:%d" % pyqtcfg.pyqt_version)
		47	-print("pyqt_version_str:%s" % pyqtcfg.pyqt_version_str)
		48	+print("pyqt_version:%06.0x" % PyQt5.QtCore.PYQT_VERSION)
		49	+print("pyqt_version_num:%d" % PyQt5.QtCore.PYQT_VERSION)
		50	+print("pyqt_version_str:%s" % PyQt5.QtCore.PYQT_VERSION_STR)
		51
		52	pyqt_version_tag = ""
		53	in_t = False
		54	-for item in pyqtcfg.pyqt_sip_flags.split(' '):
		55	+pyqt_config_list = PyQt5.QtCore.PYQT_CONFIGURATION["sip_flags"].split(' ')
		56	+for item in pyqt_config_list:
		57	if item == "-t":
		58	in_t = True
		59	elif in_t:
		60	- if item.startswith("Qt_4"):
		61	+ if item.startswith("Qt_5"):
		62	pyqt_version_tag = item
		63	else:
		64	in_t = False
65	print("pyqt_version_tag:%s" % pyqt_version_tag)
66
67	-print("pyqt_mod_dir:%s" % pyqtcfg.pyqt_mod_dir)
68	-print("pyqt_sip_dir:%s" % pyqtcfg.pyqt_sip_dir)
69	-print("pyqt_sip_flags:%s" % pyqtcfg.pyqt_sip_flags)
70	-print("pyqt_bin_dir:%s" % pyqtcfg.pyqt_bin_dir)
71	+print("pyqt_mod_dir:%s" % cfg['pyqt_mod_dir'])
72	+print("pyqt_sip_dir:%s" % cfg['pyqt_sip_dir'])
73	+print("pyqt_sip_flags:%s" % PyQt5.QtCore.PYQT_CONFIGURATION['sip_flags'])
74	+print("pyqt_bin_dir:%s" % cfg['pyqt_bin_dir'])
75
76	try:
77	import PyQt5.sip
78	+
79	print("pyqt_sip_module:PyQt5.sip")
80	except:
81	print("pyqt_sip_module:sip")

Line 0 Link Here

(-)graphics/qgis-ltr/files/patch-cmake_FindQGIS.cmake (+20 lines)
	1	--- cmake/FindQGIS.cmake.orig 2020-08-28 05:25:49 UTC
	2	+++ cmake/FindQGIS.cmake
	3	@@ -122,7 +122,7 @@ ELSE(WIN32)
	4	PATHS
	5	${QGIS_BUILD_PATH}/output/lib/qgis_core.framework/Headers
	6	${QGIS_MAC_PATH}/Frameworks/qgis_core.framework/Headers
	7	- {QGIS_PREFIX_PATH}/include/qgis
	8	+ ${QGIS_PREFIX_PATH}/include/qgis
	9	/usr/include/qgis
	10	/usr/local/include/qgis
	11	/Library/Frameworks/qgis_core.framework/Headers
	12	@@ -133,7 +133,7 @@ ELSE(WIN32)
	13	PATHS
	14	${QGIS_BUILD_PATH}/src/ui
	15	${QGIS_MAC_PATH}/Frameworks/qgis_gui.framework/Headers
	16	- {QGIS_PREFIX_PATH}/include/qgis
	17	+ ${QGIS_PREFIX_PATH}/include/qgis
	18	/usr/include/qgis
	19	/usr/local/include/qgis
	20	/Library/Frameworks/qgis_gui.framework/Headers

Line 0 Link Here

(-)graphics/qgis-ltr/files/patch-cmake_FindQtQmlTools.cmake (+16 lines)
	1	--- cmake/FindQtQmlTools.cmake.orig 2020-08-28 05:25:49 UTC
	2	+++ cmake/FindQtQmlTools.cmake
	3	@@ -22,12 +22,11 @@
	4
	5	MACRO(FIND_QMLPLUGINDUMP)
	6	get_filename_component(QT_BIN_DIR "${QT_QMAKE_EXECUTABLE}" DIRECTORY)
	7	-
	8	IF(NOT QMLPLUGINDUMP_EXECUTABLE)
	9	IF (MSVC)
	10	FIND_PROGRAM(QMLPLUGINDUMP_EXECUTABLE qmlplugindump.exe PATHS ${QT_BIN_DIR} NO_DEFAULT_PATH)
	11	ELSE (MSVC)
	12	- FIND_PROGRAM(QMLPLUGINDUMP_EXECUTABLE qmlplugindump PATHS ${QT_BIN_DIR} NO_DEFAULT_PATH)
	13	+ FIND_PROGRAM(QMLPLUGINDUMP_EXECUTABLE qmlplugindump PATHS ${QT_BIN_DIR})
	14	ENDIF (MSVC)
	15	ENDIF(NOT QMLPLUGINDUMP_EXECUTABLE)
	16

Line 0 Link Here

(-)graphics/qgis-ltr/files/patch-cmake_FindSIP.cmake (+17 lines)
	1	--- cmake/FindSIP.cmake.orig 2020-08-28 05:25:49 UTC
	2	+++ cmake/FindSIP.cmake
	3	@@ -40,8 +40,12 @@ ELSE(SIP_VERSION)
	4	STRING(REGEX REPLACE ".\nsip_version_str:([^\n]+).$" "\\1" SIP_VERSION_STR ${sip_config})
	5	STRING(REGEX REPLACE ".\nsip_bin:([^\n]+).$" "\\1" SIP_BINARY_PATH ${sip_config})
	6	STRING(REGEX REPLACE ".\ndefault_sip_dir:([^\n]+).$" "\\1" SIP_DEFAULT_SIP_DIR ${sip_config})
	7	- STRING(REGEX REPLACE ".\nsip_inc_dir:([^\n]+).$" "\\1" SIP_INCLUDE_DIR ${sip_config})
	8	- STRING(REGEX REPLACE ".\nsip_module_dir:([^\n]+).$" "\\1" SIP_MODULE_DIR ${sip_config})
	9	+ IF(${SIP_VERSION_STR} VERSION_LESS 5)
	10	+ STRING(REGEX REPLACE ".\nsip_inc_dir:([^\n]+).$" "\\1" SIP_INCLUDE_DIR ${sip_config})
	11	+ STRING(REGEX REPLACE ".\nsip_module_dir:([^\n]+).$" "\\1" SIP_MODULE_DIR ${sip_config})
	12	+ ELSE(${SIP_VERSION_STR} VERSION_LESS 5)
	13	+ FIND_PROGRAM(SIP_MODULE_EXECUTABLE sip-module)
	14	+ ENDIF(${SIP_VERSION_STR} VERSION_LESS 5)
	15	SET(SIP_FOUND TRUE)
	16	ENDIF(sip_config)
	17

Line 0 Link Here

(-)graphics/qgis-ltr/files/patch-cmake_FindSIP.py (+47 lines)
	1	--- cmake/FindSIP.py.orig 2020-08-28 05:25:49 UTC
	2	+++ cmake/FindSIP.py
	3	@@ -30,17 +30,31 @@
	4	# Redistribution and use is allowed according to the terms of the BSD license.
	5	# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
	6
	7	-import sipconfig
	8	+try:
	9	+ import sipbuild
	10	+except ImportError: # Code for SIP v4
	11	+ import sipconfig
	12
	13	-sipcfg = sipconfig.Configuration()
	14	-print("sip_version:%06.0x" % sipcfg.sip_version)
	15	-print("sip_version_num:%d" % sipcfg.sip_version)
	16	-print("sip_version_str:%s" % sipcfg.sip_version_str)
	17	-print("sip_bin:%s" % sipcfg.sip_bin)
	18	-print("default_sip_dir:%s" % sipcfg.default_sip_dir)
	19	-print("sip_inc_dir:%s" % sipcfg.sip_inc_dir)
	20	-# SIP 4.19.10+ has new sipcfg.sip_module_dir
	21	-if hasattr(sipcfg, "sip_module_dir"):
	22	- print("sip_module_dir:%s" % sipcfg.sip_module_dir)
	23	-else:
	24	- print("sip_module_dir:%s" % sipcfg.sip_mod_dir)
	25	+ sipcfg = sipconfig.Configuration()
	26	+ print("sip_version:%06.0x" % sipcfg.sip_version)
	27	+ print("sip_version_num:%d" % sipcfg.sip_version)
	28	+ print("sip_version_str:%s" % sipcfg.sip_version_str)
	29	+ print("sip_bin:%s" % sipcfg.sip_bin)
	30	+ print("default_sip_dir:%s" % sipcfg.default_sip_dir)
	31	+ print("sip_inc_dir:%s" % sipcfg.sip_inc_dir)
	32	+ # SIP 4.19.10+ has new sipcfg.sip_module_dir
	33	+ if hasattr(sipcfg, "sip_module_dir"):
	34	+ print("sip_module_dir:%s" % sipcfg.sip_module_dir)
	35	+ else:
	36	+ print("sip_module_dir:%s" % sipcfg.sip_mod_dir)
	37	+else: # Code for SIP v5
	38	+ print("sip_version:%06.0x" % sipbuild.version.SIP_VERSION)
	39	+ print("sip_version_num:%d" % sipbuild.version.SIP_VERSION)
	40	+ print("sip_version_str:%s" % sipbuild.version.SIP_VERSION_STR)
	41	+
	42	+ import shutil
	43	+ print("sip_bin:%s" % shutil.which("sip5"))
	44	+
	45	+ from distutils.sysconfig import get_python_lib
	46	+ python_modules_dir = "%%PYQT_SIPDIR%%"
	47	+ print("default_sip_dir:%s" % python_modules_dir)

Line 0 Link Here

(-)graphics/qgis-ltr/files/patch-cmake_SIPMacros.cmake (+15 lines)
	1	--- cmake/SIPMacros.cmake.orig 2020-08-28 05:25:49 UTC
	2	+++ cmake/SIPMacros.cmake
	3	@@ -121,6 +121,12 @@ MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MODULE_NAME MODU
	4	DEPENDS ${SIP_EXTRA_FILES_DEPEND}
	5	VERBATIM
	6	)
	7	+ IF (SIP_MODULE_EXECUTABLE)
	8	+ ADD_CUSTOM_COMMAND(
	9	+ OUTPUT ${_sip_output_files} APPEND
	10	+ COMMAND ${SIP_MODULE_EXECUTABLE} --target-dir ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} --sip-h ${PYQT5_SIP_IMPORT}
	11	+ )
	12	+ ENDIF (SIP_MODULE_EXECUTABLE)
	13
	14	ADD_CUSTOM_TARGET(generate_sip_${MODULE_NAME}_cpp_files DEPENDS ${_sip_output_files})
	15

Lines 1-19 Link Here

(-)graphics/qgis-ltr/files/patch-src_core_CMakeLists.txt (-15 / +2 lines)
1	--- src/core/CMakeLists.txt.orig 2019-10-28 04:34:30 UTC	1	--- src/core/CMakeLists.txt.orig 2020-08-14 12:07:53 UTC
2	--- src/core/CMakeLists.txt.orig 2020-06-19 12:15:52 UTC
3	+++ src/core/CMakeLists.txt	2	+++ src/core/CMakeLists.txt
4	@@ -693,9 +693,9 @@ SET(QGIS_CORE_SRCS	3	@@ -894,6 +894,7 @@ ELSE(MSVC)
5	)
6
7	FILE(GLOB JSON_HELP_FILES "${CMAKE_SOURCE_DIR}/resources/function_help/json/*")
8	-IF(NOT USING_NINJA)
9	+IF(CMAKE_VERSION VERSION_LESS "3.18" AND NOT USING_NINJA)
10	STRING(REPLACE "$" "$$" JSON_HELP_FILES "${JSON_HELP_FILES}")
11	-ENDIF(NOT USING_NINJA)
12	+ENDIF(CMAKE_VERSION VERSION_LESS "3.18" AND NOT USING_NINJA)
13	STRING(REPLACE "\(" "\\(" JSON_HELP_FILES "${JSON_HELP_FILES}")
14	STRING(REPLACE "\)" "\\)" JSON_HELP_FILES "${JSON_HELP_FILES}")
15	ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgsexpression_texts.cpp
16	@@ -889,6 +889,7 @@ ELSE(MSVC)
17	SET_SOURCE_FILES_PROPERTIES(${QGIS_CORE_MOC_SRCS} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations" )	4	SET_SOURCE_FILES_PROPERTIES(${QGIS_CORE_MOC_SRCS} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations" )
18	IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND (CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo))	5	IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND (CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo))
19	SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/qgsexpression_texts.cpp PROPERTIES COMPILE_FLAGS "-O1")	6	SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/qgsexpression_texts.cpp PROPERTIES COMPILE_FLAGS "-O1")