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

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

commit:     2ea34a5b0580710f1260bc339746567a50cb1583
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 20 06:15:29 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 20 08:26:19 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ea34a5b

dev-qt/qtbase: add workaround for PyQt6 in 6.8.9999

In preparation for 6.8.2.

Don't particularly like this, but couldn't make sense of SIP
to fix that one and it'll end up being a blocker for bumping.
And then upstream stance tend to be "wait for PyQt6-<matching>"
which may take a while.

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

 dev-qt/qtbase/files/qtbase-6.8.2-pyqt6.patch | 18 ++++++++++++++++++
 dev-qt/qtbase/qtbase-6.8.9999.ebuild         |  3 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qtbase/files/qtbase-6.8.2-pyqt6.patch b/dev-qt/qtbase/files/qtbase-6.8.2-pyqt6.patch
new file mode 100644
index 000000000000..de728b73f404
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.8.2-pyqt6.patch
@@ -0,0 +1,18 @@
+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.9999.ebuild b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
index 11036a11512b..584b606a0590 100644
--- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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}"/${PN}-6.8.2-pyqt6.patch
 )
 
 src_prepare() {