1 |
commit: a71bd2f4602ac581a44b1e32ffe9be8f530472b7 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 9 15:16:25 2022 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 9 16:03:02 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a71bd2f4 |
7 |
|
8 |
kde-frameworks/kconfigwidgets: Drop IUSE=auth, fix graphical glitch |
9 |
|
10 |
Upstream commit babd8078cc92b3f46dbab0286d7629ada1c2d10f |
11 |
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=452211 |
12 |
|
13 |
Bug: https://bugs.gentoo.org/836361 |
14 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
15 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
16 |
|
17 |
...ets-5.92.0-khamburgermenu-ensure-polished.patch | 32 ++++++++++++++++++++++ |
18 |
...92.0.ebuild => kconfigwidgets-5.92.0-r1.ebuild} | 7 +++-- |
19 |
kde-frameworks/kconfigwidgets/metadata.xml | 1 - |
20 |
3 files changed, 36 insertions(+), 4 deletions(-) |
21 |
|
22 |
diff --git a/kde-frameworks/kconfigwidgets/files/kconfigwidgets-5.92.0-khamburgermenu-ensure-polished.patch b/kde-frameworks/kconfigwidgets/files/kconfigwidgets-5.92.0-khamburgermenu-ensure-polished.patch |
23 |
new file mode 100644 |
24 |
index 000000000000..34249bb1d7dc |
25 |
--- /dev/null |
26 |
+++ b/kde-frameworks/kconfigwidgets/files/kconfigwidgets-5.92.0-khamburgermenu-ensure-polished.patch |
27 |
@@ -0,0 +1,32 @@ |
28 |
+From babd8078cc92b3f46dbab0286d7629ada1c2d10f Mon Sep 17 00:00:00 2001 |
29 |
+From: David Redondo <kde@×××××××××××××.de> |
30 |
+Date: Tue, 22 Mar 2022 10:52:04 +0100 |
31 |
+Subject: [PATCH] khamburgermenu: Ensure menu is polished before creating |
32 |
+ window |
33 |
+ |
34 |
+By force creating the window, there is no chance for the style |
35 |
+to change the surface format that will be used because it's fixed |
36 |
+once the window has been created. |
37 |
+This caused for example in a graphical glitch with Breeze, so |
38 |
+manually ensure the menu is polished. |
39 |
+--- |
40 |
+ src/khamburgermenuhelpers.cpp | 3 +++ |
41 |
+ 1 file changed, 3 insertions(+) |
42 |
+ |
43 |
+diff --git a/src/khamburgermenuhelpers.cpp b/src/khamburgermenuhelpers.cpp |
44 |
+index d1ae2835..beecba7c 100644 |
45 |
+--- a/src/khamburgermenuhelpers.cpp |
46 |
++++ b/src/khamburgermenuhelpers.cpp |
47 |
+@@ -50,6 +50,9 @@ bool ButtonPressListener::eventFilter(QObject *watched, QEvent *event) |
48 |
+ if (!menu) { |
49 |
+ return false; |
50 |
+ } |
51 |
++ // ensure polished so the style can change the surfaceformat of the window which is |
52 |
++ // not possible once the window has been created |
53 |
++ menu->ensurePolished(); |
54 |
+ menu->winId(); // trigger being a native widget already, to ensure windowHandle created |
55 |
+ // generic code if not known if the available parent widget is a native widget or not |
56 |
+ auto parentWindowHandle = watchedButton->windowHandle(); |
57 |
+-- |
58 |
+GitLab |
59 |
+ |
60 |
|
61 |
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.92.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.92.0-r1.ebuild |
62 |
similarity index 86% |
63 |
rename from kde-frameworks/kconfigwidgets/kconfigwidgets-5.92.0.ebuild |
64 |
rename to kde-frameworks/kconfigwidgets/kconfigwidgets-5.92.0-r1.ebuild |
65 |
index 7312473f399e..f8823acf4896 100644 |
66 |
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.92.0.ebuild |
67 |
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.92.0-r1.ebuild |
68 |
@@ -13,26 +13,27 @@ DESCRIPTION="Framework providing an assortment of configuration-related widgets" |
69 |
|
70 |
LICENSE="LGPL-2+" |
71 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" |
72 |
-IUSE="+auth +man" |
73 |
+IUSE="+man" |
74 |
|
75 |
DEPEND=" |
76 |
>=dev-qt/qtdbus-${QTMIN}:5 |
77 |
>=dev-qt/qtgui-${QTMIN}:5 |
78 |
>=dev-qt/qtwidgets-${QTMIN}:5 |
79 |
+ =kde-frameworks/kauth-${PVCUT}*:5 |
80 |
=kde-frameworks/kcodecs-${PVCUT}*:5 |
81 |
=kde-frameworks/kconfig-${PVCUT}*:5 |
82 |
=kde-frameworks/kcoreaddons-${PVCUT}*:5 |
83 |
=kde-frameworks/kguiaddons-${PVCUT}*:5 |
84 |
=kde-frameworks/ki18n-${PVCUT}*:5 |
85 |
=kde-frameworks/kwidgetsaddons-${PVCUT}*:5 |
86 |
- auth? ( =kde-frameworks/kauth-${PVCUT}*:5 ) |
87 |
" |
88 |
RDEPEND="${DEPEND}" |
89 |
BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )" |
90 |
|
91 |
+PATCHES=( "${FILESDIR}/${P}-khamburgermenu-ensure-polished.patch" ) # KDE-bug 452211 |
92 |
+ |
93 |
src_configure() { |
94 |
local mycmakeargs=( |
95 |
- -DWITH_KAUTH=$(usex auth) |
96 |
$(cmake_use_find_package man KF5DocTools) |
97 |
) |
98 |
|
99 |
|
100 |
diff --git a/kde-frameworks/kconfigwidgets/metadata.xml b/kde-frameworks/kconfigwidgets/metadata.xml |
101 |
index dcf525b73fcc..3ace511214fd 100644 |
102 |
--- a/kde-frameworks/kconfigwidgets/metadata.xml |
103 |
+++ b/kde-frameworks/kconfigwidgets/metadata.xml |
104 |
@@ -9,7 +9,6 @@ |
105 |
<bugs-to>https://bugs.kde.org/</bugs-to> |
106 |
</upstream> |
107 |
<use> |
108 |
- <flag name="auth">Enable authentication support via <pkg>kde-frameworks/kauth</pkg></flag> |
109 |
<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag> |
110 |
</use> |
111 |
<slots> |