[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/, dev-qt/qtbase/files/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     b6f9606b334e9a98fe822c9df95b9e168f806696
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  6 13:34:58 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Feb  6 14:32:23 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6f9606b

dev-qt/qtbase: backport fix for QTBUG-133500

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../qtbase/files/qtbase-6.8.2-QTBUG-133500.patch   | 58 ++++++++++++++++++++++
 ...{qtbase-6.8.2.ebuild => qtbase-6.8.2-r1.ebuild} |  1 +
 2 files changed, 59 insertions(+)

diff --git a/dev-qt/qtbase/files/qtbase-6.8.2-QTBUG-133500.patch b/dev-qt/qtbase/files/qtbase-6.8.2-QTBUG-133500.patch
new file mode 100644
index 000000000000..89a388eed6aa
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.8.2-QTBUG-133500.patch
@@ -0,0 +1,58 @@
+Combined backport of [1][2][3] from upcoming Qt 6.8.3 for [4][5][6].
+
+[1] https://github.com/qt/qtbase/commit/12d4bf1ab52748cb84894f50d437064b439e0b7d
+[2] https://github.com/qt/qtbase/commit/2ef615228bba9a8eb282437bfb7472f925610e89
+[3] https://github.com/qt/qtbase/commit/a43c7e58046604796aa69974ea1c5d3e2648c755
+[4] https://bugreports.qt.io/browse/QTBUG-133206
+[5] https://bugreports.qt.io/browse/QTBUG-133500
+[6] https://bugs.kde.org/show_bug.cgi?id=499537
+--- a/src/corelib/global/qlibraryinfo.cpp
++++ b/src/corelib/global/qlibraryinfo.cpp
+@@ -7,4 +7,5 @@
+ #include "qfile.h"
+ #if QT_CONFIG(settings)
++#include "qresource.h"
+ #include "qsettings.h"
+ #endif
+@@ -104,5 +105,5 @@
+ 
+     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
+--- a/src/corelib/text/qlocale.cpp
++++ b/src/corelib/text/qlocale.cpp
+@@ -1113,8 +1113,11 @@
+ 
+ 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;
++    }
+ }
+ 
+--- a/src/corelib/text/qlocale_unix.cpp
++++ b/src/corelib/text/qlocale_unix.cpp
+@@ -128,4 +128,6 @@
+ {
+     QSystemLocaleData *d = qSystemLocaleData();
++    if (!d)
++        return QVariant();
+ 
+     if (type == LocaleChanged) {
+--- a/src/corelib/text/qlocale_win.cpp
++++ b/src/corelib/text/qlocale_win.cpp
+@@ -829,4 +829,6 @@
+ {
+     QSystemLocalePrivate *d = systemLocalePrivate();
++    if (!d)
++        return QVariant();
+     switch(type) {
+     case DecimalPoint:

diff --git a/dev-qt/qtbase/qtbase-6.8.2.ebuild b/dev-qt/qtbase/qtbase-6.8.2-r1.ebuild
similarity index 99%
rename from dev-qt/qtbase/qtbase-6.8.2.ebuild
rename to dev-qt/qtbase/qtbase-6.8.2-r1.ebuild
index a4a17c32f1ed..af4d6a54a114 100644
--- a/dev-qt/qtbase/qtbase-6.8.2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.2-r1.ebuild
@@ -146,6 +146,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
 	"${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
 	"${FILESDIR}"/${PN}-6.8.0-qcontiguouscache.patch
+	"${FILESDIR}"/${P}-QTBUG-133500.patch
 )
 
 src_prepare() {