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

Carlos De Maine null at kde.org
Fri Apr 11 12:00:58 BST 2025


Git commit 65a51c1950c657604c0928f71f9da73b94067626 by Carlos De Maine.
Committed on 11/04/2025 at 11:00.
Pushed by carlosdem into branch 'Neon/release'.

drop patch

D  +0    -26   debian/patches/2ef615228bba9a8eb282437bfb7472f925610e89.diff
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/qt6/qt6-base/-/commit/65a51c1950c657604c0928f71f9da73b94067626

diff --git a/debian/patches/2ef615228bba9a8eb282437bfb7472f925610e89.diff b/debian/patches/2ef615228bba9a8eb282437bfb7472f925610e89.diff
deleted file mode 100644
index 51cd5e2..0000000
--- a/debian/patches/2ef615228bba9a8eb282437bfb7472f925610e89.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/corelib/text/qlocale_unix.cpp b/src/corelib/text/qlocale_unix.cpp
-index a934f24c0167f18b8d6b87f966beaa62877a30d1..91dbb74c2073f5abe258bdbf7ed76fca8d8e7926 100644
---- a/src/corelib/text/qlocale_unix.cpp
-+++ b/src/corelib/text/qlocale_unix.cpp
-@@ -127,6 +127,8 @@ QLocale QSystemLocale::fallbackLocale() const
- QVariant QSystemLocale::query(QueryType type, QVariant &&in) const
- {
-     QSystemLocaleData *d = qSystemLocaleData();
-+    if (!d)
-+        return QVariant();
- 
-     if (type == LocaleChanged) {
-         d->readEnvironment();
-diff --git a/src/corelib/text/qlocale_win.cpp b/src/corelib/text/qlocale_win.cpp
-index 9fdb46a4c9222337353e5a0ba3095cdd5f6f542d..793751daaf01b158c8317deeda8babeaba83fd79 100644
---- a/src/corelib/text/qlocale_win.cpp
-+++ b/src/corelib/text/qlocale_win.cpp
-@@ -828,6 +828,8 @@ QLocale QSystemLocale::fallbackLocale() const
- QVariant QSystemLocale::query(QueryType type, QVariant &&in) const
- {
-     QSystemLocalePrivate *d = systemLocalePrivate();
-+    if (!d)
-+        return QVariant();
-     switch(type) {
-     case DecimalPoint:
-         return d->decimalPoint();
diff --git a/debian/patches/series b/debian/patches/series
index 0c849a2..6d8be4b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 # Neon added
-2ef615228bba9a8eb282437bfb7472f925610e89.diff
 a43c7e58046604796aa69974ea1c5d3e2648c755.diff
 
 # Needs to be fixed upstream.


More information about the Neon-commits mailing list