Date: Thu, 2 Dec 2021 14:12:45 GMT From: Rainer Hurling <rhurlin@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 95de1b454625 - 2021Q4 - graphics/qgis: Fix broken patch naming Message-ID: <202112021412.1B2ECjgZ008519@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q4 has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=95de1b454625c8c251fe0ee8109391efe26de43f commit 95de1b454625c8c251fe0ee8109391efe26de43f Author: Rainer Hurling <rhurlin@FreeBSD.org> AuthorDate: 2021-12-02 14:06:05 +0000 Commit: Rainer Hurling <rhurlin@FreeBSD.org> CommitDate: 2021-12-02 14:06:05 +0000 graphics/qgis: Fix broken patch naming Accidentally, the patches in commit 75007752abec044026edbb53aa0742cc47b49a89 were named incorrectly. Reported by: pkg-fallout Fixes: 75007752abec, Fix on CURRENT after llvm13 intro --- ...rutils.cpp => patch-src_core_providers_ogr_qgsogrprovider.cpp} | 8 ++++---- ...viderutils.h => patch-src_core_providers_ogr_qgsogrprovider.h} | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp b/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrprovider.cpp similarity index 61% rename from graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp rename to graphics/qgis/files/patch-src_core_providers_ogr_qgsogrprovider.cpp index 92563ca24ac9..bbde70a1a76c 100644 --- a/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp +++ b/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrprovider.cpp @@ -1,6 +1,6 @@ ---- 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 +--- 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 } @@ -9,7 +9,7 @@ { if ( !ds ) return; -@@ -2319,7 +2319,6 @@ void QgsOgrProviderUtils::releaseDataset( QgsOgrDatase +@@ -5942,7 +5942,6 @@ void QgsOgrProviderUtils::releaseDataset( QgsOgrDatase QMutexLocker locker( sGlobalMutex() ); releaseInternal( ds->mIdent, ds->mDs, true ); delete ds; diff --git a/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.h b/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrprovider.h similarity index 67% rename from graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.h rename to graphics/qgis/files/patch-src_core_providers_ogr_qgsogrprovider.h index 472ef5ed8c07..a4979c9e5a9b 100644 --- a/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.h +++ b/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrprovider.h @@ -1,6 +1,6 @@ ---- 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 +--- 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*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112021412.1B2ECjgZ008519>