commit: 2b1eec972434094aba624b94a9400f69343d36ef Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Mar 26 11:41:36 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Mar 26 11:51:47 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b1eec97
dev-qt/qtwidgets: Switch to QT5_KDEPATCHSET_REV=6 Contains both recent patches. Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-qt/qtwidgets/Manifest | 1 + .../files/qtwidgets-5.15.8-QTBUG-104917.patch | 54 ---------------------- dev-qt/qtwidgets/qtwidgets-5.15.8-r4.ebuild | 7 +-- 3 files changed, 2 insertions(+), 60 deletions(-) diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest index db6cd834f163..f65bdbf9d40c 100644 --- a/dev-qt/qtwidgets/Manifest +++ b/dev-qt/qtwidgets/Manifest @@ -1,3 +1,4 @@ DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8 SHA512 f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd +DIST qtbase-5.15.8-gentoo-kde-6.tar.xz 796880 BLAKE2B 014fd9c9693fe1a5adc54f1d147db4bbb4bf6f5fbde5950a9586a6868d16b63b83cf24821c33fd2a325d6b70a1fa655b0fc0da7ef74ae175e278ebda1f8c9aa4 SHA512 910a7e42e13f33b53984b4f61c58e53c1cf0accfa9eb1e143cc011882fff6cab14fa7c66562396b3a929f5ec6ecf56724d74df34ac15f32cc4d8ae6cb8da797b DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.15.8-QTBUG-104917.patch b/dev-qt/qtwidgets/files/qtwidgets-5.15.8-QTBUG-104917.patch deleted file mode 100644 index fae665b14d2e..000000000000 --- a/dev-qt/qtwidgets/files/qtwidgets-5.15.8-QTBUG-104917.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 38c54b3ff58972fa16810740fc43933620b6dc0d Mon Sep 17 00:00:00 2001 -From: Axel Spoerl <[email protected]> -Date: Wed, 27 Jul 2022 15:17:03 +0200 -Subject: [PATCH] Add nullptr guard in - QStyleSheetStyle::drawPrimitive(PE_PanelLineEdit) - -Drawing PE_PanelLineEdit in QStyleSheetStyle with the default argument -widget = nullptr causes a segfault. - -drawPrimitive tries to fall back to a container widget's render rule -and therefore calls containerWidget() - which crashes when called with -nullptr. - -Container widget fallback is pointless when drawPrimitive() is called -with widget == nullptr. This patch skips it in that case. - -Fixes: QTBUG-104917 -Pick-to: 6.4 6.3 6.2 -Change-Id: I09e57dccfebb81a308944c233846d5b9ef58819e -Reviewed-by: Volker Hilsheimer <[email protected]> -(cherry picked from commit effc8be3ce848770a093d51d5651908c375e83f8) ---- - src/widgets/styles/qstylesheetstyle.cpp | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - -diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp -index 9fcb8ba522..50fdee0f69 100644 ---- a/src/widgets/styles/qstylesheetstyle.cpp -+++ b/src/widgets/styles/qstylesheetstyle.cpp -@@ -4449,12 +4449,15 @@ void QStyleSheetStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *op - - case PE_PanelLineEdit: - if (const QStyleOptionFrame *frm = qstyleoption_cast<const QStyleOptionFrame *>(opt)) { -- QWidget *container = containerWidget(w); -- if (container != w) { -- QRenderRule containerRule = renderRule(container, opt); -- if (!containerRule.hasNativeBorder() || !containerRule.baseStyleCanDraw()) -- return; -- rule = containerRule; -+ // Fall back to container widget's render rule -+ if (w) { -+ QWidget *container = containerWidget(w); -+ if (container != w) { -+ QRenderRule containerRule = renderRule(container, opt); -+ if (!containerRule.hasNativeBorder() || !containerRule.baseStyleCanDraw()) -+ return; -+ rule = containerRule; -+ } - } - - if (rule.hasNativeBorder()) { --- -2.40.0 - diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.8-r4.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.8-r4.ebuild index 45c06643f187..a445122d69a2 100644 --- a/dev-qt/qtwidgets/qtwidgets-5.15.8-r4.ebuild +++ b/dev-qt/qtwidgets/qtwidgets-5.15.8-r4.ebuild @@ -4,7 +4,7 @@ EAPI=8 if [[ ${PV} != *9999* ]]; then - QT5_KDEPATCHSET_REV=5 + QT5_KDEPATCHSET_REV=6 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi @@ -48,11 +48,6 @@ QT5_GENTOO_PRIVATE_CONFIG=( :widgets ) -PATCHES=( - "${FILESDIR}/${P}-QTBUG-106569.patch" - "${FILESDIR}/${P}-QTBUG-104917.patch" # KDE-bug 467373 -) - src_configure() { local myconf=( -opengl $(usex gles2-only es2 desktop)
