sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

graphics/qgis-ltr: Update to 3.22.4

Browse source 
This is the new LTR version, with a big version jump from 3.16.16.
The most important changes can be read at [1].

[1] https://www.qgis.org/de/site/forusers/visualchangelog322/index.html

Changelog: https://github.com/qgis/QGIS/compare/final-3_22_3%5E...final-3_22_4
This commit is contained in:
Rainer Hurling 2022-03-06 18:58:56 +01:00
parent 3f621a2c15
commit 3a44e4a8c0
7 changed files with 1085 additions and 945 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
graphics/qgis-ltr/Makefile
View file

@ -1,8 +1,7 @@
# Created by: Laurent Courty # Created by: Laurent Courty
PORTNAME= qgis PORTNAME= qgis
DISTVERSION= 3.16.16 DISTVERSION= 3.22.4
PORTREVISION= 2
CATEGORIES= graphics geography CATEGORIES= graphics geography
MASTER_SITES= https://qgis.org/downloads/ MASTER_SITES= https://qgis.org/downloads/
PKGNAMESUFFIX= -ltr PKGNAMESUFFIX= -ltr
@ -15,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/doc/LICENSE
BUILD_DEPENDS= gpsbabel>=1.5.4:astro/gpsbabel \ BUILD_DEPENDS= gpsbabel>=1.5.4:astro/gpsbabel \
opencl>=0:devel/opencl \ opencl>=0:devel/opencl \
sip:devel/py-sip4 \
${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${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}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
@ -45,6 +43,7 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
libmdal.so:math/mdal \ libmdal.so:math/mdal \
libnetcdf.so:science/netcdf \ libnetcdf.so:science/netcdf \
libOpenCL.so:devel/ocl-icd \ libOpenCL.so:devel/ocl-icd \
libpdal_base.so:math/pdal \
libproj.so:graphics/proj \ libproj.so:graphics/proj \
libprotobuf-lite.so:devel/protobuf \ libprotobuf-lite.so:devel/protobuf \
libqjson-qt5.so:devel/qjson \ libqjson-qt5.so:devel/qjson \
@ -62,6 +61,7 @@ RUN_DEPENDS= astyle:devel/astyle \
${PYTHON_PKGNAMEPREFIX}black>=19.10:devel/py-black@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}black>=19.10:devel/py-black@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${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}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}Fiona>=0:graphics/py-fiona@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${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}gdal>=3.1.0:graphics/py-gdal@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \
@ -106,12 +106,12 @@ USES= bison cmake compiler:features desktop-file-utils \
USE_GL= gl USE_GL= gl
USE_GNOME= libxml2 USE_GNOME= libxml2
USE_LDCONFIG= yes USE_LDCONFIG= yes
USE_PYQT= pyqt5 qscintilla2 USE_PYQT= pyqt5 qscintilla2 pysip sip
USE_QT= 3d buildtools_build core concurrent dbus declarative \ USE_QT= 3d buildtools_build core concurrent dbus declarative \
designer doc gamepad gui linguist_build location \ designer_build qdoc_build gamepad gui linguist_build location \
network printsupport qmake_build script serialport \ network printsupport qmake_build script serialport \
sql sql-pgsql sql-sqlite3 svg testlib uitools \ sql sql-pgsql sql-sqlite3 svg testlib uitools_build \
webengine widgets webkit xml webengine webkit widgets xml
SHEBANG_FILES= src/plugins/grass/scripts/*.py SHEBANG_FILES= src/plugins/grass/scripts/*.py
@ -125,7 +125,8 @@ CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Release \
-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \ -DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so -DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so
CMAKE_ON= BUILD_TESTING ENABLE_TESTS USE_OPENCL WITH_3D WITH_ASTYLE \ CMAKE_ON= BUILD_TESTING ENABLE_TESTS USE_OPENCL WITH_3D WITH_ASTYLE \
WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_POSTGRESQL WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_EPT WITH_POSTGRESQL \
WITH_PDAL
CMAKE_OFF= WITH_QWTPOLAR CMAKE_OFF= WITH_QWTPOLAR
CONFLICTS_INSTALL= qgis CONFLICTS_INSTALL= qgis
@ -152,6 +153,13 @@ SERVER_CMAKE_BOOL= WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
# QGIS requires flex >= 2.5.6, see
# https://github.com/qgis/QGIS/blob/fb0f334b06e0828e5695ffcaa7c7eb82d6516cb0/INSTALL.md
.if (${OPSYS} == FreeBSD && ${OSVERSION} < 1300501)
BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex
CMAKE_ARGS+= -DFLEX_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/flex
.endif
post-patch: post-patch:
# On i386, '-mllvm -inline-threshold=128' does not build under all circumstances # On i386, '-mllvm -inline-threshold=128' does not build under all circumstances
# See bugs 242557 and 241687. # See bugs 242557 and 241687.

6
graphics/qgis-ltr/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1642408257 TIMESTAMP = 1646576431
SHA256 (qgis-3.16.16.tar.bz2) = ccd2f404534fcb00b5e17863375462090c9575e68b32ce50b2e7e925d1e01a49 SHA256 (qgis-3.22.4.tar.bz2) = 80e93f55e3afaa951eac2b7298c96e92ef3ded35882fcb3c1442a3d05de3808d
SIZE (qgis-3.16.16.tar.bz2) = 119123296 SIZE (qgis-3.22.4.tar.bz2) = 137701974

47
graphics/qgis-ltr/files/patch-cmake_FindSIP.py
View file

@ -1,47 +0,0 @@
--- cmake/FindSIP.py.orig 2021-12-07 16:53:56 UTC
+++ cmake/FindSIP.py
@@ -30,31 +30,17 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-try:
- import sipbuild
-except ImportError: # Code for SIP v4
- import sipconfig
+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)
-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 = get_python_lib(plat_specific=1)
- print("default_sip_dir:%s" % python_modules_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)

22
graphics/qgis-ltr/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py → graphics/qgis-ltr/files/patch-python_plugins_sagaprovider_SagaAlgorithmProvider.py
View file

@ -1,13 +1,13 @@
--- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig 2019-12-07 13:18:21 UTC --- python/plugins/sagaprovider/SagaAlgorithmProvider.py.orig 2021-06-21 15:09:09 UTC
+++ python/plugins/processing/algs/saga/SagaAlgorithmProvider.py +++ python/plugins/sagaprovider/SagaAlgorithmProvider.py
@@ -79,13 +79,13 @@ class SagaAlgorithmProvider(QgsProcessingProvider): @@ -78,13 +78,13 @@ class SagaAlgorithmProvider(QgsProcessingProvider):
version is not None
def canBeActivated(self): and (
version = SagaUtils.getInstalledVersion(True) version.startswith(REQUIRED_VERSION)
- if version is not None and (version.startswith(REQUIRED_VERSION) or version.startswith(BETA_SUPPORT_VERSION)): - or version.startswith(BETA_SUPPORT_VERSION)
+ if version is not None and (version.startswith(REQUIRED_VERSION) or version >= BETA_SUPPORT_VERSION): + or version >= BETA_SUPPORT_VERSION
return True )
return False )
def warningMessage(self): def warningMessage(self):
version = SagaUtils.getInstalledVersion(True) version = SagaUtils.getInstalledVersion(True)
@ -16,7 +16,7 @@
return self.tr('SAGA version {} is not officially supported - algorithms may encounter issues').format(version) return self.tr('SAGA version {} is not officially supported - algorithms may encounter issues').format(version)
return '' return ''
@@ -96,7 +96,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider): @@ -95,7 +95,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider):
self.tr('Processing'), Qgis.Critical) self.tr('Processing'), Qgis.Critical)
return return

19
graphics/qgis-ltr/files/patch-src_core_providers_ogr_qgsogrprovider.cpp
View file

@ -1,19 +0,0 @@
--- src/core/providers/ogr/qgsogrprovider.cpp.orig 2021-11-19 12:10:19 UTC
+++ src/core/providers/ogr/qgsogrprovider.cpp
@@ -5934,7 +5934,7 @@ void QgsOgrProviderUtils::release( QgsOgrLayer *&layer
}
-void QgsOgrProviderUtils::releaseDataset( QgsOgrDataset *&ds )
+void QgsOgrProviderUtils::releaseDataset( QgsOgrDataset *ds )
{
if ( !ds )
return;
@@ -5942,7 +5942,6 @@ void QgsOgrProviderUtils::releaseDataset( QgsOgrDatase
QMutexLocker locker( sGlobalMutex() );
releaseInternal( ds->mIdent, ds->mDs, true );
delete ds;
- ds = nullptr;
}
bool QgsOgrProviderUtils::canDriverShareSameDatasetAmongLayers( const QString &driverName )

11
graphics/qgis-ltr/files/patch-src_core_providers_ogr_qgsogrprovider.h
View file

@ -1,11 +0,0 @@
--- src/core/providers/ogr/qgsogrprovider.h.orig 2021-11-19 12:10:19 UTC
+++ src/core/providers/ogr/qgsogrprovider.h
@@ -503,7 +503,7 @@ class CORE_EXPORT QgsOgrProviderUtils
static void release( QgsOgrLayer *&layer );
//! Release a QgsOgrDataset*
- static void releaseDataset( QgsOgrDataset *&ds );
+ static void releaseDataset( QgsOgrDataset *ds );
//! Make sure that the existing pool of opened datasets on dsName is not accessible for new getLayer() attempts
static void invalidateCachedDatasets( const QString &dsName );

1901
graphics/qgis-ltr/pkg-plist
View file

File diff suppressed because it is too large Load diff