gentoo auto-resync : 24:08:2024 - 14:56:07

3 files changed, 31 insertions, 1 deletions

diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index 9c82d6224700..434fa8461bf7 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -5,8 +5,9 @@ AUX qtbase-6.6.3-gcc14-avx512fp16.patch 470 BLAKE2B 616b4fdcee6819a0ca4de1220f75
 AUX qtbase-6.7.2-CVE-2024-39936.patch 7171 BLAKE2B d1b6e9a35e35f1e6b3e7a7c975fb6719b8594ee5f3212bc18bfe4a1990d70424a682071551c5971d62d6351a38e36b6f4c4acb9241af1ad2e64ec604ca440394 SHA512 cd6b48ebe7c1dc1224a54f0d32845e598223a3c40c6da11b4639646fb073c6b5a2e54d9625ba0413afb876a83c2d50bdf616f4876154fb33fa941d6cbf053291
 AUX qtbase-6.7.2-float16-sse2.patch 1773 BLAKE2B c5b8bb7065db6186d81fb9267235327eba698c096d3e8051a2671d4655ada21ff063b297b00b8da098bb07b6a4abc9fb42fb7652e9de8aa759a349f8f1e58afc SHA512 af4b3c014ce86de25c02d7846ff0e354762513313d353971e6259da1dea20d6bc5ae7fb475469d29c3251d4e9e6446afda8b21086df50ba1108083d112bbfe73
 AUX qtbase-6.7.2-gcc15-odr.patch 1162 BLAKE2B 640688d21fb70ce67378e0f8ac5ddac12b657a9802c0f2e524e6c210cf055955cda41300dd792949541e085d5e8a7ef19dcceaa36f6f73da651f89e88dab2ff4 SHA512 3dd8f26d02fb11075f97b3284e8c0ed1bcff5feafc6535026078dc5b38ed106ae144c18db1fff502b1cebb06761f55d995a8e31c8a6b701f08d21fdbb170bba1
+AUX qtbase-6.7.2-qwindowprivate-crash.patch 1337 BLAKE2B 1d8e354dc0db89744073bf555263129904592fb7c05b315713a21eae94b52a4b847dae906700cc5551fa21f828373ed044903dd10e8b86670b9296aa2009a3a3 SHA512 30e54110b9351aa2f7614a416b1fdf0d192a42386bdc5e75bd91fa2ecb98c48066b4e3858f97e00abbcbf2ddd5e90eab1594e285434d083215eaa34463dfa65b
 DIST qtbase-everywhere-src-6.7.2.tar.xz 49364504 BLAKE2B b48b8a8decafe3262d459b9446c25561851fef88b3316107c2909f5964e8122a558b5501a3e59667bdf4776d36ea5ba0d9f227538c45c1f8e94fbc8fff4244a6 SHA512 eb4b2f1fb02ab0ed5508d32449e140778278ff1a619cfcae14920b276b5c46e01a566d73fb8f84cf2cfc81e19cb11e53ab500df6b27d12ab875aa8c07bd15d6b
-EBUILD qtbase-6.7.2-r2.ebuild 9880 BLAKE2B d0b3a956261bc41e8830b1dc162ae80b1021adad7d68d3b7b2a8959db7c39cfdcb15a2e1160878007030c32d6e1f10f6cd30fca0bb8ec261ed8c0afab4149a6a SHA512 d8f9c1810566f0262b39955d3b2fde6d253012146aba144feb590b82577d7cf0f74a94a28b60bcda8b7ff2281e28a49844ddfa6a385679e2c5cb786240690e3a
+EBUILD qtbase-6.7.2-r3.ebuild 9934 BLAKE2B 98cd5a869867774c0a8f8b66fd5cf2d82ddb0618a310df16cfef41ccb86c7b2105a30edc15d0ac0b959f0f6f308b696fa52929163beb2d16459eb5c5771366ef SHA512 d8a3d9a276bcc0e8dc74f197dbc4a962a192d222de222f4b719fd1b89aa96d220786d20043d268ce5ee2aa96237415230192febf3af15306dee1fb3d93c61b61
 EBUILD qtbase-6.7.9999.ebuild 9792 BLAKE2B d72b01ed47ae38fe000328592b241a6a5ac08a48290d0c5daa541201a6fa5b830f9f4c59b7e65744cf580f0c31ed0d6889b4b7b1ba8d5024dfb69fdcf9c28c20 SHA512 90325744d31ed5ba8fe0152306e1407f828f00e06c6667fb2a917bcb905a1e391420e56e3074e9638e136f439e3aa2535de256c0484f1d70037830c789bbe43c
 EBUILD qtbase-6.8.9999.ebuild 10231 BLAKE2B 6582a481a27100606457b10a4040c39c6720fe8962ae4b85163adcc05f1052729560c71aab81be01c67754c55abaacc76ef0699c2e195ce29461a53728577979 SHA512 0e19345616ea933eee1650d5f5447ef6d852dd084082cd3e89b748d18e6cc1f8f38548c90eb08475b20468d52c96f743fa67a52f37fcd125483b134e9825f0a5
 EBUILD qtbase-6.9999.ebuild 10231 BLAKE2B 6582a481a27100606457b10a4040c39c6720fe8962ae4b85163adcc05f1052729560c71aab81be01c67754c55abaacc76ef0699c2e195ce29461a53728577979 SHA512 0e19345616ea933eee1650d5f5447ef6d852dd084082cd3e89b748d18e6cc1f8f38548c90eb08475b20468d52c96f743fa67a52f37fcd125483b134e9825f0a5
diff --git a/dev-qt/qtbase/files/qtbase-6.7.2-qwindowprivate-crash.patch b/dev-qt/qtbase/files/qtbase-6.7.2-qwindowprivate-crash.patch
new file mode 100644
index 000000000000..353383921b7f
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.7.2-qwindowprivate-crash.patch
@@ -0,0 +1,28 @@
+https://bugs.kde.org/show_bug.cgi?id=490791
+https://codereview.qt-project.org/c/qt/qtbase/+/584636
+From: David Edmundson <davidedmundson@kde.org>
+Date: Wed, 31 Jul 2024 11:59:14 +0100
+Subject: [PATCH] QWidget: Store initialScreen as QPointer
+
+A Toplevel QWidget can hold a pointer to the screen where it will
+eventually show contents, before a QWidgetWindow is created which then
+takes precedence.
+
+The screen member of QWindows is always kept up-to-date when a screen is
+removed, but not the contents of a toplevel window. If a widget has
+setScreen called but is never shown, it has potentially dangling pointer
+which can cause issues in the future.
+
+Pick-to: 6.5
+Change-Id: Ia7c80549e8b3c90a75cdde745487e87ecddaca63
+Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
+(cherry picked from commit d67acf94afffde6a71498be6e30447f3acf7558e)
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+(cherry picked from commit 6af4e5f604fff40cdb3be40099b8884362806ef4)
+--- a/src/widgets/kernel/qwidget_p.h
++++ b/src/widgets/kernel/qwidget_p.h
+@@ -110,3 +110,3 @@
+     Qt::WindowFlags savedFlags; // Save widget flags while showing fullscreen
+-    QScreen *initialScreen; // Screen when passing a QDesktop[Screen]Widget as parent.
++    QPointer<QScreen> initialScreen; // Screen when passing a QDesktop[Screen]Widget as parent.
+ 
diff --git a/dev-qt/qtbase/qtbase-6.7.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.7.2-r3.ebuild
index 68a5c8f9e4fa..ff2eb438c253 100644
--- a/dev-qt/qtbase/qtbase-6.7.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.2-r3.ebuild
@@ -148,6 +148,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.7.2-CVE-2024-39936.patch
 	"${FILESDIR}"/${PN}-6.7.2-gcc15-odr.patch
 	"${FILESDIR}"/${PN}-6.7.2-float16-sse2.patch
+	"${FILESDIR}"/${PN}-6.7.2-qwindowprivate-crash.patch
 )
 
 src_prepare() {