diff options
| author | Rainer Hurling <rhurlin@FreeBSD.org> | 2021-12-19 08:21:17 +0000 |
|---|---|---|
| committer | Rainer Hurling <rhurlin@FreeBSD.org> | 2021-12-19 09:36:57 +0000 |
| commit | 5936dd19952ed39374c46a8e8b3085af8004bdcb (patch) | |
| tree | bdfea495364cbe9c7335c8aa08bfc3137220e4e9 | |
| parent | ed9ddecf4f43176304b33bba2bed60c68a5c32cd (diff) | |
| download | ports-5936dd19952ed39374c46a8e8b3085af8004bdcb.tar.gz ports-5936dd19952ed39374c46a8e8b3085af8004bdcb.zip | |
graphics/qgis: 3.22.2
Patches for qgsogrproviderutils not necessary any more, since committed upstream.
Changelog: https://github.com/qgis/QGIS/compare/final-3_22_1%5E...final-3_22_2
Reported by: Repology
| -rw-r--r-- | graphics/qgis/Makefile | 4 | ||||
| -rw-r--r-- | graphics/qgis/distinfo | 6 | ||||
| -rw-r--r-- | graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp | 19 | ||||
| -rw-r--r-- | graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.h | 11 |
4 files changed, 5 insertions, 35 deletions
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index 1efaa86b44e0..1281c0b5b9e6 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -2,7 +2,7 @@ PORTNAME= qgis DISTVERSIONPREFIX= final- -DISTVERSION= 3_22_1 +DISTVERSION= 3_22_2 CATEGORIES= graphics geography PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -79,7 +79,7 @@ RUN_DEPENDS= astyle:devel/astyle \ ${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} \ + ${PYNUMPY} \ ${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} \ diff --git a/graphics/qgis/distinfo b/graphics/qgis/distinfo index 033669f4e754..8b513cff4a67 100644 --- a/graphics/qgis/distinfo +++ b/graphics/qgis/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1637394887 -SHA256 (qgis-QGIS-final-3_22_1_GH0.tar.gz) = ab85a83b30954c08faece0fe0bde9cd8dd767a67c7aa892174c5319b85025fc3 -SIZE (qgis-QGIS-final-3_22_1_GH0.tar.gz) = 159867816 +TIMESTAMP = 1639834513 +SHA256 (qgis-QGIS-final-3_22_2_GH0.tar.gz) = e3268d13cc2947e67bcb61c5ffafee7e56272eb082be8afc9605ccfcf44d453e +SIZE (qgis-QGIS-final-3_22_2_GH0.tar.gz) = 159914025 diff --git a/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp b/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp deleted file mode 100644 index 92563ca24ac9..000000000000 --- a/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- src/core/providers/ogr/qgsogrproviderutils.cpp.orig 2021-11-19 12:08:37 UTC -+++ src/core/providers/ogr/qgsogrproviderutils.cpp -@@ -2311,7 +2311,7 @@ void QgsOgrProviderUtils::release( QgsOgrLayer *&layer - } - - --void QgsOgrProviderUtils::releaseDataset( QgsOgrDataset *&ds ) -+void QgsOgrProviderUtils::releaseDataset( QgsOgrDataset *ds ) - { - if ( !ds ) - return; -@@ -2319,7 +2319,6 @@ void QgsOgrProviderUtils::releaseDataset( QgsOgrDatase - QMutexLocker locker( sGlobalMutex() ); - releaseInternal( ds->mIdent, ds->mDs, true ); - delete ds; -- ds = nullptr; - } - - bool QgsOgrProviderUtils::canDriverShareSameDatasetAmongLayers( const QString &driverName ) diff --git a/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.h b/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.h deleted file mode 100644 index 472ef5ed8c07..000000000000 --- a/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/core/providers/ogr/qgsogrproviderutils.h.orig 2021-11-19 12:08:37 UTC -+++ src/core/providers/ogr/qgsogrproviderutils.h -@@ -216,7 +216,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 ); |