[neon/qt6/qt6-base/Neon/release] debian/patches: drop upstreamed patch

Carlos De Maine null at kde.org
Fri Apr 11 11:50:15 BST 2025


Git commit 5013e510d9a7670e3c7ea4b9e8a731434f5dbc98 by Carlos De Maine.
Committed on 11/04/2025 at 10:50.
Pushed by carlosdem into branch 'Neon/release'.

drop upstreamed patch

D  +0    -21   debian/patches/12d4bf1ab52748cb84894f50d437064b439e0b7d.diff
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/qt6/qt6-base/-/commit/5013e510d9a7670e3c7ea4b9e8a731434f5dbc98

diff --git a/debian/patches/12d4bf1ab52748cb84894f50d437064b439e0b7d.diff b/debian/patches/12d4bf1ab52748cb84894f50d437064b439e0b7d.diff
deleted file mode 100644
index d61f964..0000000
--- a/debian/patches/12d4bf1ab52748cb84894f50d437064b439e0b7d.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp
-index 4f5b5452648e8c33a2cfe3488fd309ae299b0cf5..eff083b3d941035b9a47c16ccd7b0e551851bbff 100644
---- a/src/corelib/text/qlocale.cpp
-+++ b/src/corelib/text/qlocale.cpp
-@@ -1112,10 +1112,13 @@ QLocale::QLocale(QStringView name)
- */
- 
- QLocale::QLocale()
--    : d(*defaultLocalePrivate)
-+    : d(c_private())
- {
--    // Make sure system data is up to date:
--    systemData();
-+    if (!defaultLocalePrivate.isDestroyed()) {
-+        // Make sure system data is up to date:
-+        systemData();
-+        d = *defaultLocalePrivate;
-+    }
- }
- 
- /*!
diff --git a/debian/patches/series b/debian/patches/series
index 698d111..0c849a2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 # Neon added
-12d4bf1ab52748cb84894f50d437064b439e0b7d.diff
 2ef615228bba9a8eb282437bfb7472f925610e89.diff
 a43c7e58046604796aa69974ea1c5d3e2648c755.diff
 


More information about the Neon-commits mailing list