summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2022-04-09 17:16:25 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2022-04-09 18:03:02 +0200
commita71bd2f4602ac581a44b1e32ffe9be8f530472b7 (patch)
tree17df838846366f950e358d347ba0111653aea05f
parentdev-qt/qtwayland: Drop 5.15.3 (r0) (diff)
downloadgentoo-a71bd2f4602ac581a44b1e32ffe9be8f530472b7.tar.gz
gentoo-a71bd2f4602ac581a44b1e32ffe9be8f530472b7.tar.bz2
gentoo-a71bd2f4602ac581a44b1e32ffe9be8f530472b7.zip
kde-frameworks/kconfigwidgets: Drop IUSE=auth, fix graphical glitch
Upstream commit babd8078cc92b3f46dbab0286d7629ada1c2d10f KDE-bug: https://bugs.kde.org/show_bug.cgi?id=452211 Bug: https://bugs.gentoo.org/836361 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-frameworks/kconfigwidgets/files/kconfigwidgets-5.92.0-khamburgermenu-ensure-polished.patch32
-rw-r--r--kde-frameworks/kconfigwidgets/kconfigwidgets-5.92.0-r1.ebuild (renamed from kde-frameworks/kconfigwidgets/kconfigwidgets-5.92.0.ebuild)7
-rw-r--r--kde-frameworks/kconfigwidgets/metadata.xml1
3 files changed, 36 insertions, 4 deletions
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
new file mode 100644
index 000000000000..34249bb1d7dc
--- /dev/null
+++ b/kde-frameworks/kconfigwidgets/files/kconfigwidgets-5.92.0-khamburgermenu-ensure-polished.patch
@@ -0,0 +1,32 @@
+From babd8078cc92b3f46dbab0286d7629ada1c2d10f Mon Sep 17 00:00:00 2001
+From: David Redondo <kde@david-redondo.de>
+Date: Tue, 22 Mar 2022 10:52:04 +0100
+Subject: [PATCH] khamburgermenu: Ensure menu is polished before creating
+ window
+
+By force creating the window, there is no chance for the style
+to change the surface format that will be used because it's fixed
+once the window has been created.
+This caused for example in a graphical glitch with Breeze, so
+manually ensure the menu is polished.
+---
+ src/khamburgermenuhelpers.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/khamburgermenuhelpers.cpp b/src/khamburgermenuhelpers.cpp
+index d1ae2835..beecba7c 100644
+--- a/src/khamburgermenuhelpers.cpp
++++ b/src/khamburgermenuhelpers.cpp
+@@ -50,6 +50,9 @@ bool ButtonPressListener::eventFilter(QObject *watched, QEvent *event)
+ if (!menu) {
+ return false;
+ }
++ // ensure polished so the style can change the surfaceformat of the window which is
++ // not possible once the window has been created
++ menu->ensurePolished();
+ menu->winId(); // trigger being a native widget already, to ensure windowHandle created
+ // generic code if not known if the available parent widget is a native widget or not
+ auto parentWindowHandle = watchedButton->windowHandle();
+--
+GitLab
+
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.92.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.92.0-r1.ebuild
index 7312473f399e..f8823acf4896 100644
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.92.0.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.92.0-r1.ebuild
@@ -13,26 +13,27 @@ DESCRIPTION="Framework providing an assortment of configuration-related widgets"
LICENSE="LGPL-2+"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="+auth +man"
+IUSE="+man"
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
+ =kde-frameworks/kauth-${PVCUT}*:5
=kde-frameworks/kcodecs-${PVCUT}*:5
=kde-frameworks/kconfig-${PVCUT}*:5
=kde-frameworks/kcoreaddons-${PVCUT}*:5
=kde-frameworks/kguiaddons-${PVCUT}*:5
=kde-frameworks/ki18n-${PVCUT}*:5
=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- auth? ( =kde-frameworks/kauth-${PVCUT}*:5 )
"
RDEPEND="${DEPEND}"
BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+PATCHES=( "${FILESDIR}/${P}-khamburgermenu-ensure-polished.patch" ) # KDE-bug 452211
+
src_configure() {
local mycmakeargs=(
- -DWITH_KAUTH=$(usex auth)
$(cmake_use_find_package man KF5DocTools)
)
diff --git a/kde-frameworks/kconfigwidgets/metadata.xml b/kde-frameworks/kconfigwidgets/metadata.xml
index dcf525b73fcc..3ace511214fd 100644
--- a/kde-frameworks/kconfigwidgets/metadata.xml
+++ b/kde-frameworks/kconfigwidgets/metadata.xml
@@ -9,7 +9,6 @@
<bugs-to>https://bugs.kde.org/</bugs-to>
</upstream>
<use>
- <flag name="auth">Enable authentication support via <pkg>kde-frameworks/kauth</pkg></flag>
<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
</use>
<slots>