commit: f58754d36b351a623ad5ad3503ef9d098c98ef12
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 2 11:30:48 2025 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Feb 2 12:25:51 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f58754d3
dev-qt/qtbase: drop obsolete pyqt6 workaround
Changes installed headers, but do not believe that
it is worth a revbump given the semi-long build.
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.2.ebuild | 1 -
2 files changed, 19 deletions(-)
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 de728b73f404..000000000000
--- 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.ebuild
index 584b606a0590..a4a17c32f1ed 100644
--- a/dev-qt/qtbase/qtbase-6.8.2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.2.ebuild
@@ -146,7 +146,6 @@ 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() {
