commit: 049b702a92852fd8c9633b50b74c0abb365cdad3
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Fri Feb 7 14:54:18 2025 +0000
Commit: orbea <orbea <AT> riseup <DOT> net>
CommitDate: Fri Feb 7 14:54:18 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=049b702a
dev-qt/qtbase: add 6.8.2-r1, drop 6.8.2
Signed-off-by: orbea <orbea <AT> riseup.net>
.../qtbase/files/qtbase-6.8.2-QTBUG-133500.patch | 58 ++++++++++++++++++++++
dev-qt/qtbase/files/qtbase-6.8.2-pyqt6.patch | 18 -------
...{qtbase-6.8.2.ebuild => qtbase-6.8.2-r1.ebuild} | 2 +-
3 files changed, 59 insertions(+), 19 deletions(-)
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 0000000..89a388e
--- /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/files/qtbase-6.8.2-pyqt6.patch
b/dev-qt/qtbase/files/qtbase-6.8.2-pyqt6.patch
deleted file mode 100644
index de728b7..0000000
--- a/dev-qt/qtbase/files/qtbase-6.8.2-pyqt6.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Revert of [1] which breaks PyQt6, and reverting "shouldn't"
-negatively affected anything. Can probably leave this until
-6.9.x instead (or at least until PyQt6-6.8.2 is released).
-Please file a bug to Gentoo if believe that this is wrong.
-
-Ideally need to fix PyQt6 itself, but proper fix hasn't been
-figured out yet, and PyQt6-6.8.2 may take a while to release.
---- a/src/corelib/text/qstringconverter_base.h
-+++ b/src/corelib/text/qstringconverter_base.h
-@@ -81,8 +81,5 @@ public:
- };
- protected:
-- QStringConverterBase() = default;
- ~QStringConverterBase() = default;
-- QStringConverterBase(QStringConverterBase &&) = default;
-- QStringConverterBase &operator=(QStringConverterBase &&) = default;
- };
- Q_DECLARE_OPERATORS_FOR_FLAGS(QStringConverterBase::Flags)
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 527fa35..25f54df 100644
--- a/dev-qt/qtbase/qtbase-6.8.2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.2-r1.ebuild
@@ -147,7 +147,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}"/${PN}-6.8.2-pyqt6.patch
+ "${FILESDIR}"/${P}-QTBUG-133500.patch
)
src_prepare() {
