git: 74992bc9668c - 2021Q4 - graphics/qgis-ltr: Fix broken patch naming
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 25 Nov 2021 19:09:52 UTC
The branch 2021Q4 has been updated by rhurlin:
URL: https://cgit.FreeBSD.org/ports/commit/?id=74992bc9668c5a9b73722b6f2a83da7045ab34b0
commit 74992bc9668c5a9b73722b6f2a83da7045ab34b0
Author: Rainer Hurling <rhurlin@FreeBSD.org>
AuthorDate: 2021-11-25 18:58:56 +0000
Commit: Rainer Hurling <rhurlin@FreeBSD.org>
CommitDate: 2021-11-25 19:09:09 +0000
graphics/qgis-ltr: Fix broken patch naming
Accidentally, the patches in commit af60a61a9333df126249d5659c350c4a7b969a9a were named incorrectly.
Reported by: pkg-fallout
Fixes: af60a61a9333, Fix on CURRENT after llvm13 intro
MFH: 2021Q4
(cherry picked from commit eca1a49f0e033e30ebc3848aa8e0f4f4a9a805b2)
---
...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-ltr/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp b/graphics/qgis-ltr/files/patch-src_core_providers_ogr_qgsogrprovider.cpp
similarity index 61%
rename from graphics/qgis-ltr/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp
rename to graphics/qgis-ltr/files/patch-src_core_providers_ogr_qgsogrprovider.cpp
index 92563ca24ac9..bbde70a1a76c 100644
--- a/graphics/qgis-ltr/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp
+++ b/graphics/qgis-ltr/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-ltr/files/patch-src_core_providers_ogr_qgsogrproviderutils.h b/graphics/qgis-ltr/files/patch-src_core_providers_ogr_qgsogrprovider.h
similarity index 67%
rename from graphics/qgis-ltr/files/patch-src_core_providers_ogr_qgsogrproviderutils.h
rename to graphics/qgis-ltr/files/patch-src_core_providers_ogr_qgsogrprovider.h
index 472ef5ed8c07..a4979c9e5a9b 100644
--- a/graphics/qgis-ltr/files/patch-src_core_providers_ogr_qgsogrproviderutils.h
+++ b/graphics/qgis-ltr/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*