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

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

commit:     9006d1fdbdfce4ad61a1893892d433cd8f860ce8
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 15:08:47 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 15:18:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9006d1fd

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

As recommended for use with Plasma 6 which is currently being tested:
https://community.kde.org/Plasma/Plasma_6.0_Release_notes#Required_Qt_Version

Tests changes were excluded due to not applying cleanly, but this
does not prevent current tests from building and passing.

Will be properly included in qtbase-6.6.2

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

 dev-qt/qtbase/Manifest                                           | 1 +
 dev-qt/qtbase/{qtbase-6.6.1-r2.ebuild => qtbase-6.6.1-r3.ebuild} | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index 67b563a63d76..fa0011732b3d 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -1 +1,2 @@
+DIST qtbase-6.6.1-QTBUG-116905.patch.xz 7132 BLAKE2B 5ad6108f3d278c7014a124733a7e0151d79ab9b82256948c09f2d7d93494020131ec52bae0a0c9ae1959afe724bc033805b28f12676b018dce7d04668d8dec01 SHA512 61c13a96b19bd9c06056681101c2c9d301a5d014c4a155b82ba9b7bce2ba0e715041cd6c3e8e45c9ec3d52c3b77bcf3145fbbf502a72ffbaac02f4eb6b82c912
 DIST qtbase-everywhere-src-6.6.1.tar.xz 48370760 BLAKE2B 2dd551d15eef30c7d9a5f4c406143d6f8908d7ebade9daf9fbd3d82a25765425956f2cb8689c50f87f6477de2150eee7b820ef25bb4355c51e7e7fad3ef73005 SHA512 93e77b9b077a3acd5607b643db282fdd7ed0bdfa07df74c3f0d2285afeb1672a6fa229a7e7a6c8a462701305fc22ffef20c212d906484e50fb5cdb706a7b72e1

diff --git a/dev-qt/qtbase/qtbase-6.6.1-r2.ebuild b/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
similarity index 98%
rename from dev-qt/qtbase/qtbase-6.6.1-r2.ebuild
rename to dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
index 5b21d1f773b8..6125bd277f01 100644
--- a/dev-qt/qtbase/qtbase-6.6.1-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
@@ -6,6 +6,7 @@ EAPI=8
 inherit flag-o-matic qt6-build toolchain-funcs
 
 DESCRIPTION="Cross-platform application development framework"
+SRC_URI+=" https://dev.gentoo.org/~ionen/distfiles/${P}-QTBUG-116905.patch.xz"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
@@ -138,6 +139,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
 	"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
 	"${FILESDIR}"/${P}-CVE-2023-51714.patch
+	"${WORKDIR}"/${P}-QTBUG-116905.patch
 )
 
 src_prepare() {