Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 17 Apr 2021 18:44:44 GMT
From:      Rainer Hurling <rhurlin@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 120ca822d164 - main - graphics/qgis-ltr: Update to 3.16.6
Message-ID:  <202104171844.13HIii27014755@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by rhurlin:

URL: https://cgit.FreeBSD.org/ports/commit/?id=120ca822d1646e9f35bbf2906815c8d3c826aba6

commit 120ca822d1646e9f35bbf2906815c8d3c826aba6
Author:     Rainer Hurling <rhurlin@FreeBSD.org>
AuthorDate: 2021-04-17 18:41:43 +0000
Commit:     Rainer Hurling <rhurlin@FreeBSD.org>
CommitDate: 2021-04-17 18:41:43 +0000

    graphics/qgis-ltr: Update to 3.16.6
    
    This is a major update of the LTR release from 3.10.14 to 3.16.6.
    
    Changelog: https://changelog.qgis.org/en/qgis/version/3.16/
    
    Reported by:    portscout
---
 graphics/qgis-ltr/Makefile                         |  22 +-
 graphics/qgis-ltr/distinfo                         |   6 +-
 graphics/qgis-ltr/files/patch-CMakeLists.txt       |  19 -
 graphics/qgis-ltr/files/patch-cmake_FindPyQt5.py   |  81 ----
 graphics/qgis-ltr/files/patch-cmake_FindQGIS.cmake |  20 -
 .../files/patch-cmake_FindQtQmlTools.cmake         |  16 -
 graphics/qgis-ltr/files/patch-cmake_FindQwt.cmake  |  10 -
 graphics/qgis-ltr/files/patch-cmake_FindSIP.cmake  |  17 -
 graphics/qgis-ltr/files/patch-cmake_FindSIP.py     |  47 --
 .../qgis-ltr/files/patch-cmake_SIPMacros.cmake     |  15 -
 .../qgis-ltr/files/patch-src_core_CMakeLists.txt   |  10 -
 graphics/qgis-ltr/pkg-plist                        | 529 ++++++++++++++++-----
 12 files changed, 420 insertions(+), 372 deletions(-)

diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile
index 2d2bb8c5ce5c..6aa87b1ff6a5 100644
--- a/graphics/qgis-ltr/Makefile
+++ b/graphics/qgis-ltr/Makefile
@@ -2,15 +2,11 @@
 
 PORTNAME=	qgis
 DISTVERSIONPREFIX=	final-
-DISTVERSION=	3_10_14
-PORTREVISION=	4
+DISTVERSION=	3_16_6
 CATEGORIES=	graphics geography
 PKGNAMESUFFIX=	-ltr
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	33192f38bc7d.patch:-p1 \
-		12203f0ce527.patch:-p1 \
-		6e9d42d70099.patch:-p1
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Free and Open Source Geographic Information System
@@ -93,12 +89,15 @@ RUN_DEPENDS=	astyle:devel/astyle \
 		${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}rasterio>=0:graphics/py-rasterio@${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}scikit-learn>=0:science/py-scikit-learn@${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}xlrd>=2.0.1:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR}
 
 ### Fortran is needed by numpy, GRASS, etc.
@@ -112,7 +111,7 @@ USE_GNOME=	libxml2
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 USE_PYQT=	core gui network qml quick quickwidgets qscintilla2 \
-		sip sql svg webkit_run webkitwidgets_run xml
+		pysip 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 \
@@ -133,15 +132,15 @@ CMAKE_ON=	BUILD_TESTING ENABLE_TESTS USE_OPENCL WITH_3D WITH_ASTYLE \
 		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
 
-CONFLICTS_INSTALL=	qgis
-
-PLIST_SUB=	DISTVERSION=${PORTVERSION}
-
 OPTIONS_DEFINE=		GRASS SERVER
 OPTIONS_DEFAULT=	GRASS SERVER
 NO_OPTIONS_SORT=	yes
@@ -164,9 +163,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|"-mllvm -inline-threshold=128"|"-O1"|g' \
 		${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
diff --git a/graphics/qgis-ltr/distinfo b/graphics/qgis-ltr/distinfo
index 76441809bbbd..c89e30f88ec2 100644
--- a/graphics/qgis-ltr/distinfo
+++ b/graphics/qgis-ltr/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1611089782
-SHA256 (qgis-QGIS-final-3_10_14_GH0.tar.gz) = 515c533d8ba72362a752150303982ebdb1d451e407be62852d2b6ff2ad3a669c
-SIZE (qgis-QGIS-final-3_10_14_GH0.tar.gz) = 122102662
+TIMESTAMP = 1618676896
+SHA256 (qgis-QGIS-final-3_16_6_GH0.tar.gz) = bfa58e743c445c4681633d2854dbb753233ede3073036144bd08681e4277ea87
+SIZE (qgis-QGIS-final-3_16_6_GH0.tar.gz) = 136606116
 SHA256 (33192f38bc7d.patch) = 97d3f882bea11c5342ddf53f6c055f9f38c5af18edb2d52c116f1dab4a49189b
 SIZE (33192f38bc7d.patch) = 12604
 SHA256 (12203f0ce527.patch) = bb30342fbf19f1a9150abd97fb1b5d6bbe3f3062bb217a7179332d0b02168235
diff --git a/graphics/qgis-ltr/files/patch-CMakeLists.txt b/graphics/qgis-ltr/files/patch-CMakeLists.txt
deleted file mode 100644
index 02c317be891c..000000000000
--- a/graphics/qgis-ltr/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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)
diff --git a/graphics/qgis-ltr/files/patch-cmake_FindPyQt5.py b/graphics/qgis-ltr/files/patch-cmake_FindPyQt5.py
deleted file mode 100644
index 9524721ba06c..000000000000
--- a/graphics/qgis-ltr/files/patch-cmake_FindPyQt5.py
+++ /dev/null
@@ -1,81 +0,0 @@
---- 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")
diff --git a/graphics/qgis-ltr/files/patch-cmake_FindQGIS.cmake b/graphics/qgis-ltr/files/patch-cmake_FindQGIS.cmake
deleted file mode 100644
index 5a90daef2255..000000000000
--- a/graphics/qgis-ltr/files/patch-cmake_FindQGIS.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
diff --git a/graphics/qgis-ltr/files/patch-cmake_FindQtQmlTools.cmake b/graphics/qgis-ltr/files/patch-cmake_FindQtQmlTools.cmake
deleted file mode 100644
index 009e2cc63e8d..000000000000
--- a/graphics/qgis-ltr/files/patch-cmake_FindQtQmlTools.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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)
- 
diff --git a/graphics/qgis-ltr/files/patch-cmake_FindQwt.cmake b/graphics/qgis-ltr/files/patch-cmake_FindQwt.cmake
deleted file mode 100644
index 908f76ac23e1..000000000000
--- a/graphics/qgis-ltr/files/patch-cmake_FindQwt.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
---- cmake/FindQwt.cmake.orig	2020-08-28 05:25:49 UTC
-+++ cmake/FindQwt.cmake
-@@ -32,6 +32,7 @@ endif()
- FIND_PATH(QWT_INCLUDE_DIR NAMES qwt.h PATHS
-   "${_qwt_fw}/Headers"
-   /usr/include
-+  /usr/include/qt5
-   /usr/local/include
-   /usr/local/include/qt5
-   "$ENV{LIB_DIR}/include"
diff --git a/graphics/qgis-ltr/files/patch-cmake_FindSIP.cmake b/graphics/qgis-ltr/files/patch-cmake_FindSIP.cmake
deleted file mode 100644
index a3d12d1928c9..000000000000
--- a/graphics/qgis-ltr/files/patch-cmake_FindSIP.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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)
- 
diff --git a/graphics/qgis-ltr/files/patch-cmake_FindSIP.py b/graphics/qgis-ltr/files/patch-cmake_FindSIP.py
deleted file mode 100644
index cb9b2f5e5ee5..000000000000
--- a/graphics/qgis-ltr/files/patch-cmake_FindSIP.py
+++ /dev/null
@@ -1,47 +0,0 @@
---- 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)
diff --git a/graphics/qgis-ltr/files/patch-cmake_SIPMacros.cmake b/graphics/qgis-ltr/files/patch-cmake_SIPMacros.cmake
deleted file mode 100644
index f0e4bbdad9e6..000000000000
--- a/graphics/qgis-ltr/files/patch-cmake_SIPMacros.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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})
- 
diff --git a/graphics/qgis-ltr/files/patch-src_core_CMakeLists.txt b/graphics/qgis-ltr/files/patch-src_core_CMakeLists.txt
deleted file mode 100644
index 749088613a4b..000000000000
--- a/graphics/qgis-ltr/files/patch-src_core_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/core/CMakeLists.txt.orig	2020-08-14 12:07:53 UTC
-+++ src/core/CMakeLists.txt
-@@ -894,6 +894,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 --git a/graphics/qgis-ltr/pkg-plist b/graphics/qgis-ltr/pkg-plist
index 46d71d28d1ac..3f27e3f1eb43 100644
--- a/graphics/qgis-ltr/pkg-plist
+++ b/graphics/qgis-ltr/pkg-plist
@@ -2,10 +2,11 @@
 bin/qgis
 bin/qgis_bench
 %%SERVER%%bin/qgis_mapserv.fcgi
+%%SERVER%%bin/qgis_mapserver
+bin/qgis_process
 %%SERVER%%bin/wms_metadata.xml
 include/qgis/Bezier3D.h
 include/qgis/CloughTocherInterpolator.h
-include/qgis/DualEdgeTriangulation.h
 include/qgis/HalfEdge.h
 include/qgis/LinTriangleInterpolator.h
 include/qgis/MathUtils.h
@@ -13,7 +14,6 @@ include/qgis/NormVecDecorator.h
 include/qgis/ParametricLine.h
 include/qgis/TriDecorator.h
 include/qgis/TriangleInterpolator.h
-include/qgis/Triangulation.h
 include/qgis/Vector3D.h
 include/qgis/characterwidget.h
 include/qgis/json_fwd.hpp
@@ -30,10 +30,15 @@ include/qgis/qgisinterface.h
 include/qgis/qgisplugin.h
 include/qgis/qgs25drenderer.h
 include/qgis/qgs25drendererwidget.h
+include/qgis/qgs3d.h
+include/qgis/qgs3dalgorithms.h
 include/qgis/qgs3danimationsettings.h
 include/qgis/qgs3dmapscene.h
 include/qgis/qgs3dmapsettings.h
 include/qgis/qgs3drendererregistry.h
+include/qgis/qgs3dsceneexporter.h
+include/qgis/qgs3dsymbolregistry.h
+include/qgis/qgs3dsymbolwidget.h
 include/qgis/qgs3dtypes.h
 include/qgis/qgs3dutils.h
 include/qgis/qgsaabb.h
@@ -46,48 +51,71 @@ include/qgis/qgsabstractdatasourcewidget.h
 include/qgis/qgsabstractgeometry.h
 include/qgis/qgsabstractgeopdfexporter.h
 include/qgis/qgsabstractlayoutiterator.h
+include/qgis/qgsabstractmaptoolhandler.h
+include/qgis/qgsabstractmaterialsettings.h
 include/qgis/qgsabstractmetadatabase.h
 include/qgis/qgsabstractproviderconnection.h
 include/qgis/qgsabstractreportsection.h
 include/qgis/qgsabstractvaliditycheck.h
+include/qgis/qgsabstractvectorlayer3drenderer.h
 include/qgis/qgsaction.h
 include/qgis/qgsactionmanager.h
 include/qgis/qgsactionmenu.h
 include/qgis/qgsactionscope.h
 include/qgis/qgsactionscoperegistry.h
+include/qgis/qgsaddattrdialog.h
+include/qgis/qgsaddtaborgroup.h
 include/qgis/qgsadvanceddigitizingdockwidget.h
 include/qgis/qgsadvanceddigitizingfloater.h
 include/qgis/qgsaggregatecalculator.h
 include/qgis/qgsaggregatetoolbutton.h
+include/qgis/qgsalgorithmfiledownloader.h
 include/qgis/qgsalgorithmimportphotos.h
 include/qgis/qgsalignmentcombobox.h
 include/qgis/qgsalignraster.h
 include/qgis/qgsanalysis.h
 include/qgis/qgsanimatedicon.h
 include/qgis/qgsannotation.h
+include/qgis/qgsannotationitem.h
+include/qgis/qgsannotationitemregistry.h
+include/qgis/qgsannotationlayer.h
+include/qgis/qgsannotationlayerrenderer.h
+include/qgis/qgsannotationlineitem.h
 include/qgis/qgsannotationmanager.h
+include/qgis/qgsannotationmarkeritem.h
+include/qgis/qgsannotationpointtextitem.h
+include/qgis/qgsannotationpolygonitem.h
 include/qgis/qgsannotationregistry.h
 include/qgis/qgsapplication.h
+include/qgis/qgsapplicationexitblockerinterface.h
+include/qgis/qgsarcgisvectortileconnectiondialog.h
 include/qgis/qgsarchive.h
 include/qgis/qgsarrowsymbollayer.h
 include/qgis/qgsarrowsymbollayerwidget.h
 include/qgis/qgsaspectfilter.h
+include/qgis/qgsattributeactiondialog.h
+include/qgis/qgsattributeactionpropertiesdialog.h
 include/qgis/qgsattributedialog.h
 include/qgis/qgsattributeeditorcontext.h
 include/qgis/qgsattributeeditorelement.h
 include/qgis/qgsattributeform.h
+include/qgis/qgsattributeformcontaineredit.h
 include/qgis/qgsattributeformeditorwidget.h
 include/qgis/qgsattributeforminterface.h
 include/qgis/qgsattributeformlegacyinterface.h
 include/qgis/qgsattributeformrelationeditorwidget.h
 include/qgis/qgsattributeformwidget.h
 include/qgis/qgsattributes.h
+include/qgis/qgsattributesforminitcode.h
+include/qgis/qgsattributesformproperties.h
 include/qgis/qgsattributetableconfig.h
 include/qgis/qgsattributetabledelegate.h
 include/qgis/qgsattributetablefiltermodel.h
 include/qgis/qgsattributetablemodel.h
 include/qgis/qgsattributetableview.h
+include/qgis/qgsattributetypedialog.h
 include/qgis/qgsattributetypeloaddialog.h
+include/qgis/qgsattributewidgetedit.h
 include/qgis/qgsauthauthoritieseditor.h
 include/qgis/qgsauthcertificateinfo.h
 include/qgis/qgsauthcertificatemanager.h
@@ -118,8 +146,11 @@ include/qgis/qgsauthsslerrorsdialog.h
 include/qgis/qgsauthsslimportdialog.h
 include/qgis/qgsauthtrustedcasdialog.h
 include/qgis/qgsauxiliarystorage.h
+include/qgis/qgsbasicnumericformat.h
+include/qgis/qgsbearingnumericformat.h
 include/qgis/qgsbearingutils.h
 include/qgis/qgsbilinearrasterresampler.h
+include/qgis/qgsbillboardgeometry.h
 include/qgis/qgsbinarywidgetfactory.h
 include/qgis/qgsbinarywidgetwrapper.h
 include/qgis/qgsblendmodecombobox.h
@@ -156,10 +187,7 @@ include/qgis/qgscheckboxfieldformatter.h
 include/qgis/qgscheckboxsearchwidgetwrapper.h
 include/qgis/qgscheckboxwidgetfactory.h
 include/qgis/qgscheckboxwidgetwrapper.h
-include/qgis/qgschunkedentity_p.h
-include/qgis/qgschunklist_p.h
 include/qgis/qgschunkloader_p.h
-include/qgis/qgschunknode_p.h
 include/qgis/qgschunkqueuejob_p.h
 include/qgis/qgscircle.h
 include/qgis/qgscircularstring.h
@@ -177,9 +205,12 @@ include/qgis/qgsclassificationwidgetwrapperfactory.h
 include/qgis/qgsclipper.h
 include/qgis/qgscliptominmaxenhancement.h
 include/qgis/qgscodeeditor.h
+include/qgis/qgscodeeditorcolorscheme.h
+include/qgis/qgscodeeditorcolorschemeregistry.h
 include/qgis/qgscodeeditorcss.h
 include/qgis/qgscodeeditorexpression.h
 include/qgis/qgscodeeditorhtml.h
+include/qgis/qgscodeeditorjs.h
 include/qgis/qgscodeeditorpython.h
 include/qgis/qgscodeeditorsql.h
 include/qgis/qgscollapsiblegroupbox.h
@@ -208,10 +239,12 @@ include/qgis/qgsconditionalstyle.h
 include/qgis/qgsconfig.h
 include/qgis/qgsconfigureshortcutsdialog.h
 include/qgis/qgsconnectionpool.h
+include/qgis/qgsconnectionregistry.h
 include/qgis/qgscontrastenhancement.h
 include/qgis/qgscontrastenhancementfunction.h
 include/qgis/qgscoordinateboundspreviewmapwidget.h
 include/qgis/qgscoordinateformatter.h
+include/qgis/qgscoordinateoperationwidget.h
 include/qgis/qgscoordinatereferencesystem.h
 include/qgis/qgscoordinatetransform.h
 include/qgis/qgscoordinatetransformcontext.h
@@ -221,13 +254,19 @@ include/qgis/qgscptcitycolorrampdialog.h
 include/qgis/qgscredentialdialog.h
 include/qgis/qgscredentials.h
 include/qgis/qgscubicrasterresampler.h
+include/qgis/qgscurrencynumericformat.h
 include/qgis/qgscurve.h
 include/qgis/qgscurveeditorwidget.h
 include/qgis/qgscurvepolygon.h
 include/qgis/qgscustomdrophandler.h
 include/qgis/qgscustomlayerorderwidget.h
+include/qgis/qgscustomprojectopenhandler.h
 include/qgis/qgsdartmeasurement.h
 include/qgis/qgsdashspacedialog.h
+include/qgis/qgsdatabaseschemacombobox.h
+include/qgis/qgsdatabaseschemamodel.h
+include/qgis/qgsdatabasetablecombobox.h
+include/qgis/qgsdatabasetablemodel.h
 include/qgis/qgsdatadefinedsizelegend.h
 include/qgis/qgsdatadefinedsizelegendwidget.h
 include/qgis/qgsdataitem.h
@@ -236,6 +275,7 @@ include/qgis/qgsdataitemguiproviderregistry.h
 include/qgis/qgsdataitemprovider.h
 include/qgis/qgsdataitemproviderregistry.h
 include/qgis/qgsdataprovider.h
+include/qgis/qgsdataprovidertemporalcapabilities.h
 include/qgis/qgsdatasourcemanagerdialog.h
 include/qgis/qgsdatasourceselectdialog.h
 include/qgis/qgsdatasourceuri.h
@@ -253,22 +293,26 @@ include/qgis/qgsdbfilterproxymodel.h
 include/qgis/qgsdefaultsearchwidgetwrapper.h
 include/qgis/qgsdefaultvalue.h
 include/qgis/qgsdemterraingenerator.h
-include/qgis/qgsdemterraintilegeometry_p.h
-include/qgis/qgsdemterraintileloader_p.h
 include/qgis/qgsderivativefilter.h
 include/qgis/qgsdetaileditemdata.h
 include/qgis/qgsdetaileditemdelegate.h
 include/qgis/qgsdetaileditemwidget.h
+include/qgis/qgsdevtoolwidget.h
+include/qgis/qgsdevtoolwidgetfactory.h
 include/qgis/qgsdiagram.h
+include/qgis/qgsdiagramproperties.h
 include/qgis/qgsdiagramrenderer.h
 include/qgis/qgsdial.h
 include/qgis/qgsdialog.h
+include/qgis/qgsdirectionallightsettings.h
 include/qgis/qgsdistancearea.h
 include/qgis/qgsdockwidget.h
 include/qgis/qgsdockwidgetplugin.h
 include/qgis/qgsdoubleboxscalebarrenderer.h
 include/qgis/qgsdoublespinbox.h
 include/qgis/qgsdoublespinboxplugin.h
+include/qgis/qgsdoublevalidator.h
+include/qgis/qgsdualedgetriangulation.h
 include/qgis/qgsdualview.h
 include/qgis/qgsdummyconfigdlg.h
 include/qgis/qgsdxfexport.h
@@ -291,6 +335,7 @@ include/qgis/qgsenumerationwidgetfactory.h
 include/qgis/qgsenumerationwidgetwrapper.h
 include/qgis/qgserror.h
 include/qgis/qgserrordialog.h
+include/qgis/qgseventtracing.h
 include/qgis/qgsexception.h
 include/qgis/qgsexiftools.h
 include/qgis/qgsexpression.h
@@ -307,27 +352,36 @@ include/qgis/qgsexpressionhighlighter.h
 include/qgis/qgsexpressionlineedit.h
 include/qgis/qgsexpressionnode.h
 include/qgis/qgsexpressionnodeimpl.h
+include/qgis/qgsexpressionpreviewwidget.h
 include/qgis/qgsexpressionselectiondialog.h
+include/qgis/qgsexpressionstoredialog.h
+include/qgis/qgsexpressiontreeview.h
 include/qgis/qgsextentgroupbox.h
 include/qgis/qgsextentgroupboxplugin.h
+include/qgis/qgsextentwidget.h
 include/qgis/qgsexternalresourceconfigdlg.h
 include/qgis/qgsexternalresourcewidget.h
 include/qgis/qgsexternalresourcewidgetfactory.h
 include/qgis/qgsexternalresourcewidgetplugin.h
 include/qgis/qgsexternalresourcewidgetwrapper.h
 include/qgis/qgsfallbackfieldformatter.h
+include/qgis/qgsfallbacknumericformat.h
 include/qgis/qgsfeature.h
-include/qgis/qgsfeature3dhandler_p.h
+include/qgis/qgsfeatureexpressionvaluesgatherer.h
 include/qgis/qgsfeaturefiltermodel.h
-include/qgis/qgsfeaturefiltermodel_p.h
 include/qgis/qgsfeaturefilterprovider.h
 include/qgis/qgsfeatureid.h
 include/qgis/qgsfeatureiterator.h
 include/qgis/qgsfeaturelistcombobox.h
+include/qgis/qgsfeaturelistcomboboxplugin.h
 include/qgis/qgsfeaturelistmodel.h
 include/qgis/qgsfeaturelistview.h
 include/qgis/qgsfeaturelistviewdelegate.h
 include/qgis/qgsfeaturemodel.h
+include/qgis/qgsfeaturepickermodel.h
+include/qgis/qgsfeaturepickermodelbase.h
+include/qgis/qgsfeaturepickerwidget.h
+include/qgis/qgsfeaturepickerwidgetplugin.h
 include/qgis/qgsfeaturepool.h
 include/qgis/qgsfeaturerequest.h
 include/qgis/qgsfeatureselectiondlg.h
@@ -337,7 +391,7 @@ include/qgis/qgsfeaturesource.h
 include/qgis/qgsfeaturestore.h
 include/qgis/qgsfeedback.h
 include/qgis/qgsfield.h
-include/qgis/qgsfield_p.h
+include/qgis/qgsfieldcalculator.h
 include/qgis/qgsfieldcombobox.h
 include/qgis/qgsfieldcomboboxplugin.h
 include/qgis/qgsfieldconditionalformatwidget.h
@@ -346,6 +400,8 @@ include/qgis/qgsfieldexpressionwidget.h
 include/qgis/qgsfieldexpressionwidgetplugin.h
 include/qgis/qgsfieldformatter.h
 include/qgis/qgsfieldformatterregistry.h
+include/qgis/qgsfieldmappingmodel.h
+include/qgis/qgsfieldmappingwidget.h
 include/qgis/qgsfieldmodel.h
 include/qgis/qgsfieldproxymodel.h
 include/qgis/qgsfields.h
@@ -354,6 +410,7 @@ include/qgis/qgsfieldvalueslineedit.h
 include/qgis/qgsfilecontentsourcelineedit.h
 include/qgis/qgsfiledownloader.h
 include/qgis/qgsfiledownloaderdialog.h
+include/qgis/qgsfilefiltergenerator.h
 include/qgis/qgsfileutils.h
 include/qgis/qgsfilewidget.h
 include/qgis/qgsfilewidgetplugin.h
@@ -361,28 +418,32 @@ include/qgis/qgsfillsymbollayer.h
 include/qgis/qgsfilterlineedit.h
 include/qgis/qgsfilterlineeditplugin.h
 include/qgis/qgsfindfilesbypatternwidget.h
+include/qgis/qgsflatterraingenerator.h
 include/qgis/qgsfloatingwidget.h
-include/qgis/qgsfocuskeeper.h
 include/qgis/qgsfocuswatcher.h
 include/qgis/qgsfontbutton.h
 include/qgis/qgsfontbuttonplugin.h
 include/qgis/qgsfontutils.h
 include/qgis/qgsformannotation.h
+include/qgis/qgsfractionnumericformat.h
 include/qgis/qgsgdaldataitems.h
 include/qgis/qgsgdalguiprovider.h
 include/qgis/qgsgdalprovider.h
 include/qgis/qgsgdalsourceselect.h
 include/qgis/qgsgdalutils.h
 include/qgis/qgsgenericfeatureselectionmanager.h
+include/qgis/qgsgenericspatialindex.h
 include/qgis/qgsgeometry.h
 include/qgis/qgsgeometryanglecheck.h
 include/qgis/qgsgeometryareacheck.h
+include/qgis/qgsgeometrycheck.h
 include/qgis/qgsgeometrycheckcontext.h
 include/qgis/qgsgeometrychecker.h
 include/qgis/qgsgeometrycheckerror.h
 include/qgis/qgsgeometrycheckerutils.h
 include/qgis/qgsgeometrycheckfactory.h
 include/qgis/qgsgeometrycheckregistry.h
+include/qgis/qgsgeometrycheckresolutionmethod.h
 include/qgis/qgsgeometrycollection.h
 include/qgis/qgsgeometrycontainedcheck.h
 include/qgis/qgsgeometrydanglecheck.h
@@ -393,11 +454,13 @@ include/qgis/qgsgeometryeditutils.h
 include/qgis/qgsgeometryengine.h
 include/qgis/qgsgeometryfactory.h
 include/qgis/qgsgeometryfollowboundariescheck.h
+include/qgis/qgsgeometrygapcheck.h
 include/qgis/qgsgeometrygeneratorsymbollayer.h
 include/qgis/qgsgeometryholecheck.h
 include/qgis/qgsgeometryisvalidcheck.h
 include/qgis/qgsgeometrylineintersectioncheck.h
 include/qgis/qgsgeometrylinelayerintersectioncheck.h
+include/qgis/qgsgeometrymissingvertexcheck.h
 include/qgis/qgsgeometrymultipartcheck.h
 include/qgis/qgsgeometryoptions.h
 include/qgis/qgsgeometryoverlapcheck.h
@@ -423,10 +486,12 @@ include/qgis/qgsgeopackageprojectstoragedialog.h
 include/qgis/qgsgeopackageprojectstorageguiprovider.h
 include/qgis/qgsgeopackageproviderconnection.h
 include/qgis/qgsgeopackagerasterwritertask.h
+include/qgis/qgsgeopdflayertreemodel.h
 include/qgis/qgsgeos.h
 include/qgis/qgsgloweffect.h
 include/qgis/qgsgml.h
 include/qgis/qgsgmlschema.h
+include/qgis/qgsgoochmaterialsettings.h
 include/qgis/qgsgpsconnection.h
 include/qgis/qgsgpsconnectionregistry.h
 include/qgis/qgsgpsdconnection.h
@@ -440,6 +505,8 @@ include/qgis/qgsgraph.h
 include/qgis/qgsgraphanalyzer.h
 include/qgis/qgsgraphbuilder.h
 include/qgis/qgsgraphbuilderinterface.h
+include/qgis/qgsgraphdirector.h
+include/qgis/qgsgraphicsviewmousehandles.h
 include/qgis/qgsgridfilewriter.h
 include/qgis/qgsgroupwmsdatadialog.h
 include/qgis/qgsgui.h
@@ -450,39 +517,55 @@ include/qgis/qgshelp.h
 include/qgis/qgshiddenwidgetfactory.h
 include/qgis/qgshiddenwidgetwrapper.h
 include/qgis/qgshighlight.h
+include/qgis/qgshighlightablecombobox.h
+include/qgis/qgshighlightablelineedit.h
 include/qgis/qgshillshadefilter.h
 include/qgis/qgshillshaderenderer.h
 include/qgis/qgshillshaderendererwidget.h
 include/qgis/qgshistogram.h
 include/qgis/qgshistogramdiagram.h
 include/qgis/qgshistogramwidget.h
+include/qgis/qgshollowscalebarrenderer.h
 include/qgis/qgshstoreutils.h
 include/qgis/qgshtmlannotation.h
 include/qgis/qgshtmlutils.h
 include/qgis/qgshtmlwidgetwrapper.h
 include/qgis/qgshuesaturationfilter.h
+include/qgis/qgsidentifycontext.h
 include/qgis/qgsidentifymenu.h
 include/qgis/qgsidwinterpolator.h
 include/qgis/qgsifeatureselectionmanager.h
 include/qgis/qgsimagecache.h
 include/qgis/qgsimageoperation.h
 include/qgis/qgsindexedfeature.h
+include/qgis/qgsinstallgridshiftdialog.h
 include/qgis/qgsinternalgeometryengine.h
+include/qgis/qgsinterpolatedlinerenderer.h
 include/qgis/qgsinterpolator.h
 include/qgis/qgsinterval.h
 include/qgis/qgsinvertedpolygonrenderer.h
 include/qgis/qgsinvertedpolygonrendererwidget.h
+include/qgis/qgsjoindialog.h
 include/qgis/qgsjsonutils.h
 include/qgis/qgskde.h
 include/qgis/qgskeyvaluefieldformatter.h
 include/qgis/qgskeyvaluewidget.h
 include/qgis/qgskeyvaluewidgetfactory.h
 include/qgis/qgskeyvaluewidgetwrapper.h
+include/qgis/qgslabelengineconfigdialog.h
 include/qgis/qgslabelfeature.h
+include/qgis/qgslabeling.h
 include/qgis/qgslabelingengine.h
 include/qgis/qgslabelingenginesettings.h
 include/qgis/qgslabelinggui.h
+include/qgis/qgslabelingwidget.h
+include/qgis/qgslabellineanchorwidget.h
+include/qgis/qgslabellinesettings.h
+include/qgis/qgslabelobstaclesettings.h
+include/qgis/qgslabelobstaclesettingswidget.h
 include/qgis/qgslabelsearchtree.h
+include/qgis/qgslabelsettingswidgetbase.h
+include/qgis/qgslabelthinningsettings.h
 include/qgis/qgslayerdefinition.h
 include/qgis/qgslayermetadata.h
 include/qgis/qgslayermetadataformatter.h
@@ -492,6 +575,7 @@ include/qgis/qgslayertree.h
 include/qgis/qgslayertreeembeddedconfigwidget.h
 include/qgis/qgslayertreeembeddedwidgetregistry.h
 include/qgis/qgslayertreeembeddedwidgetsimpl.h
+include/qgis/qgslayertreefilterproxymodel.h
 include/qgis/qgslayertreegroup.h
 include/qgis/qgslayertreelayer.h
 include/qgis/qgslayertreemapcanvasbridge.h
@@ -505,8 +589,12 @@ include/qgis/qgslayertreeviewdefaultactions.h
 include/qgis/qgslayertreeviewindicator.h
 include/qgis/qgslayertreeviewitemdelegate.h
 include/qgis/qgslayout.h
+include/qgis/qgslayoutaddpagesdialog.h
 include/qgis/qgslayoutaligner.h
 include/qgis/qgslayoutatlas.h
+include/qgis/qgslayoutatlaswidget.h
+include/qgis/qgslayoutattributeselectiondialog.h
+include/qgis/qgslayoutattributetablewidget.h
 include/qgis/qgslayoutcombobox.h
 include/qgis/qgslayoutcustomdrophandler.h
 include/qgis/qgslayoutdesignerinterface.h
@@ -516,6 +604,10 @@ include/qgis/qgslayoutframe.h
 include/qgis/qgslayoutgeopdfexporter.h
 include/qgis/qgslayoutgridsettings.h
 include/qgis/qgslayoutguidecollection.h
+include/qgis/qgslayoutguidewidget.h
+include/qgis/qgslayoutguiutils.h
+include/qgis/qgslayouthtmlwidget.h
+include/qgis/qgslayoutimageexportoptionsdialog.h
 include/qgis/qgslayoutitem.h
 include/qgis/qgslayoutitem3dmap.h
 include/qgis/qgslayoutitemattributetable.h
@@ -526,10 +618,12 @@ include/qgis/qgslayoutitemguiregistry.h
 include/qgis/qgslayoutitemhtml.h
 include/qgis/qgslayoutitemlabel.h
 include/qgis/qgslayoutitemlegend.h
+include/qgis/qgslayoutitemmanualtable.h
 include/qgis/qgslayoutitemmap.h
 include/qgis/qgslayoutitemmapgrid.h
 include/qgis/qgslayoutitemmapitem.h
 include/qgis/qgslayoutitemmapoverview.h
+include/qgis/qgslayoutitemmarker.h
 include/qgis/qgslayoutitemnodeitem.h
 include/qgis/qgslayoutitempage.h
 include/qgis/qgslayoutitempicture.h
@@ -538,10 +632,18 @@ include/qgis/qgslayoutitempolyline.h
 include/qgis/qgslayoutitemregistry.h
 include/qgis/qgslayoutitemscalebar.h
 include/qgis/qgslayoutitemshape.h
+include/qgis/qgslayoutitemslistview.h
 include/qgis/qgslayoutitemtexttable.h
 include/qgis/qgslayoutitemundocommand.h
 include/qgis/qgslayoutitemwidget.h
+include/qgis/qgslayoutlabelwidget.h
+include/qgis/qgslayoutlegendlayersdialog.h
+include/qgis/qgslayoutlegendwidget.h
 include/qgis/qgslayoutmanager.h
+include/qgis/qgslayoutmanualtablewidget.h
+include/qgis/qgslayoutmapgridwidget.h
+include/qgis/qgslayoutmapwidget.h
+include/qgis/qgslayoutmarkerwidget.h
 include/qgis/qgslayoutmeasurement.h
 include/qgis/qgslayoutmeasurementconverter.h
 include/qgis/qgslayoutmodel.h
@@ -549,17 +651,28 @@ include/qgis/qgslayoutmousehandles.h
 include/qgis/qgslayoutmultiframe.h
 include/qgis/qgslayoutmultiframeundocommand.h
 include/qgis/qgslayoutnewitempropertiesdialog.h
+include/qgis/qgslayoutnortharrowhandler.h
 include/qgis/qgslayoutobject.h
 include/qgis/qgslayoutpagecollection.h
+include/qgis/qgslayoutpagepropertieswidget.h
+include/qgis/qgslayoutpdfexportoptionsdialog.h
+include/qgis/qgslayoutpicturewidget.h
 include/qgis/qgslayoutpoint.h
+include/qgis/qgslayoutpolygonwidget.h
+include/qgis/qgslayoutpolylinewidget.h
+include/qgis/qgslayoutpropertieswidget.h
+include/qgis/qgslayoutqptdrophandler.h
 include/qgis/qgslayoutrendercontext.h
 include/qgis/qgslayoutreportcontext.h
 include/qgis/qgslayoutreportsectionlabel.h
 include/qgis/qgslayoutruler.h
+include/qgis/qgslayoutscalebarwidget.h
 include/qgis/qgslayoutserializableobject.h
+include/qgis/qgslayoutshapewidget.h
 include/qgis/qgslayoutsize.h
 include/qgis/qgslayoutsnapper.h
 include/qgis/qgslayouttable.h
+include/qgis/qgslayouttablebackgroundcolorsdialog.h
 include/qgis/qgslayouttablecolumn.h
 include/qgis/qgslayoutundocommand.h
 include/qgis/qgslayoutundostack.h
@@ -580,26 +693,28 @@ include/qgis/qgslayoutviewtooltemporarykeyzoom.h
 include/qgis/qgslayoutviewtooltemporarymousepan.h
 include/qgis/qgslayoutviewtoolzoom.h
 include/qgis/qgslegendfilterbutton.h
+include/qgis/qgslegendpatchshape.h
+include/qgis/qgslegendpatchshapebutton.h
+include/qgis/qgslegendpatchshapewidget.h
 include/qgis/qgslegendrenderer.h
 include/qgis/qgslegendsettings.h
 include/qgis/qgslegendstyle.h
 include/qgis/qgslegendsymbolitem.h
 include/qgis/qgslimitedrandomcolorrampdialog.h
 include/qgis/qgsline3dsymbol.h
-include/qgis/qgsline3dsymbol_p.h
 include/qgis/qgslinearminmaxenhancement.h
 include/qgis/qgslinearminmaxenhancementwithclip.h
-include/qgis/qgslinematerial_p.h
 include/qgis/qgslinesegment.h
 include/qgis/qgslinestring.h
 include/qgis/qgslinesymbollayer.h
-include/qgis/qgslinevertexdata_p.h
 include/qgis/qgslinuxnative.h
 include/qgis/qgslistfieldformatter.h
 include/qgis/qgslistwidget.h
 include/qgis/qgslistwidgetfactory.h
 include/qgis/qgslistwidgetwrapper.h
+include/qgis/qgslocaldefaultsettings.h
 include/qgis/qgslocalec.h
+include/qgis/qgslocalizeddatapathregistry.h
 include/qgis/qgslocator.h
 include/qgis/qgslocatorcontext.h
 include/qgis/qgslocatorfilter.h
@@ -610,12 +725,17 @@ include/qgis/qgslogger.h
 include/qgis/qgslonglongvalidator.h
 include/qgis/qgsludialog.h
 include/qgis/qgsmanageconnectionsdialog.h
+include/qgis/qgsmapboxglstyleconverter.h
 include/qgis/qgsmapcanvas.h
 include/qgis/qgsmapcanvasannotationitem.h
+include/qgis/qgsmapcanvasinteractionblocker.h
 include/qgis/qgsmapcanvasitem.h
 include/qgis/qgsmapcanvasmap.h
 include/qgis/qgsmapcanvassnappingutils.h
 include/qgis/qgsmapcanvastracer.h
+include/qgis/qgsmapcanvasutils.h
+include/qgis/qgsmapclippingregion.h
+include/qgis/qgsmapclippingutils.h
 include/qgis/qgsmapdecoration.h
 include/qgis/qgsmaphittest.h
 include/qgis/qgsmaplayer.h
@@ -626,14 +746,18 @@ include/qgis/qgsmaplayerconfigwidget.h
 include/qgis/qgsmaplayerconfigwidgetfactory.h
 include/qgis/qgsmaplayerdependency.h
 include/qgis/qgsmaplayerlegend.h
+include/qgis/qgsmaplayerloadstyledialog.h
 include/qgis/qgsmaplayermodel.h
 include/qgis/qgsmaplayerproxymodel.h
 include/qgis/qgsmaplayerref.h
 include/qgis/qgsmaplayerrenderer.h
 include/qgis/qgsmaplayerstore.h
 include/qgis/qgsmaplayerstyle.h
+include/qgis/qgsmaplayerstylecategoriesmodel.h
+include/qgis/qgsmaplayerstyleguiutils.h
 include/qgis/qgsmaplayerstylemanager.h
 include/qgis/qgsmaplayerstylemanagerwidget.h
*** 1049 LINES SKIPPED ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104171844.13HIii27014755>