[neon/qt6/qt6-base/Neon/release] debian/patches: add diffs as recomended in kde-distro's list

[Carlos De Maine]

Git commit c2101f5d4b2c94fed7c80da5308b956449a27c90 by Carlos De Maine.
Committed on 08/02/2025 at 20:52.
Pushed by carlosdem into branch 'Neon/release'.

add diffs as recomended in kde-distro's list

A  +21   -0    debian/patches/12d4bf1ab52748cb84894f50d437064b439e0b7d.diff
A  +26   -0    debian/patches/2ef615228bba9a8eb282437bfb7472f925610e89.diff
A  +21   -0    debian/patches/a43c7e58046604796aa69974ea1c5d3e2648c755.diff
M  +3    -0    debian/patches/series

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

diff --git a/debian/patches/12d4bf1ab52748cb84894f50d437064b439e0b7d.diff b/debian/patches/12d4bf1ab52748cb84894f50d437064b439e0b7d.diff
new file mode 100644
index 0000000..d61f964
--- /dev/null
+++ b/debian/patches/12d4bf1ab52748cb84894f50d437064b439e0b7d.diff
@@ -0,0 +1,21 @@
+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/2ef615228bba9a8eb282437bfb7472f925610e89.diff b/debian/patches/2ef615228bba9a8eb282437bfb7472f925610e89.diff
new file mode 100644
index 0000000..51cd5e2
--- /dev/null
+++ b/debian/patches/2ef615228bba9a8eb282437bfb7472f925610e89.diff
@@ -0,0 +1,26 @@
+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/a43c7e58046604796aa69974ea1c5d3e2648c755.diff b/debian/patches/a43c7e58046604796aa69974ea1c5d3e2648c755.diff
new file mode 100644
index 0000000..bbe4953
--- /dev/null
+++ b/debian/patches/a43c7e58046604796aa69974ea1c5d3e2648c755.diff
@@ -0,0 +1,21 @@
+diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
+index 94f3e60deba52b880e21ac01134a9446e89535e1..5f6042be29dffff6fb3934ed0ec116f5d0d94911 100644
+--- a/src/corelib/global/qlibraryinfo.cpp
++++ b/src/corelib/global/qlibraryinfo.cpp
+@@ -6,6 +6,7 @@
+ #include "qstringlist.h"
+ #include "qfile.h"
+ #if QT_CONFIG(settings)
++#include "qresource.h"
+ #include "qsettings.h"
+ #endif
+ #include "qlibraryinfo.h"
+@@ -103,7 +104,7 @@ static std::unique_ptr<QSettings> findConfiguration()
+         return std::make_unique<QSettings>(*qtconfManualPath, QSettings::IniFormat);
+ 
+     QString qtconfig = QStringLiteral(":/qt/etc/qt.conf");
+-    if (QFile::exists(qtconfig))
++    if (QResource(qtconfig, QLocale::c()).isValid())
+         return std::make_unique<QSettings>(qtconfig, QSettings::IniFormat);
+ #ifdef Q_OS_DARWIN
+     CFBundleRef bundleRef = CFBundleGetMainBundle();
diff --git a/debian/patches/series b/debian/patches/series
index 874bf2f..698d111 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,7 @@
 # Neon added
+12d4bf1ab52748cb84894f50d437064b439e0b7d.diff
+2ef615228bba9a8eb282437bfb7472f925610e89.diff
+a43c7e58046604796aa69974ea1c5d3e2648c755.diff
 
 # Needs to be fixed upstream.
 Add-SH-detection.patch