summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-05-15 18:22:17 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-05-15 18:22:28 +0200
commitb290c70a948a6c68af221c2ac9e272f597757101 (patch)
tree3d4e69048c1c3071e93372af54b1ec834a24195e
parentsys-auth/sssd: add USE=systemtap (diff)
downloadgentoo-b290c70a948a6c68af221c2ac9e272f597757101.tar.gz
gentoo-b290c70a948a6c68af221c2ac9e272f597757101.tar.bz2
gentoo-b290c70a948a6c68af221c2ac9e272f597757101.zip
media-gfx/kuickshow: Fix build w/ >=kde-frameworks/kwindowsystem-5.82
Gentoo ebuild sets KWINDOWSYSTEM_NO_WIDGETS=ON which drops deprecated KF5WindowSystem API from <=5.62. This case was already deprecated since 5.0 though. Upstream commit 52e30eb18b9b6becbd58e8c1333f9f81afbeb8d6 Closes: https://bugs.gentoo.org/790200 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--media-gfx/kuickshow/files/kuickshow-0.10.1-kwindowsystem-5.82.patch29
-rw-r--r--media-gfx/kuickshow/kuickshow-0.10.1.ebuild4
2 files changed, 32 insertions, 1 deletions
diff --git a/media-gfx/kuickshow/files/kuickshow-0.10.1-kwindowsystem-5.82.patch b/media-gfx/kuickshow/files/kuickshow-0.10.1-kwindowsystem-5.82.patch
new file mode 100644
index 000000000000..84883fc64156
--- /dev/null
+++ b/media-gfx/kuickshow/files/kuickshow-0.10.1-kwindowsystem-5.82.patch
@@ -0,0 +1,29 @@
+From 52e30eb18b9b6becbd58e8c1333f9f81afbeb8d6 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 14 May 2021 18:31:23 +0200
+Subject: [PATCH] Port away from deprecated API (NET::StaysOnTop ->
+ NET::KeepAbove)
+
+Deprecated since 5.0.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/aboutwidget.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/aboutwidget.cpp b/src/aboutwidget.cpp
+index 79cb942..5ec75b2 100644
+--- a/src/aboutwidget.cpp
++++ b/src/aboutwidget.cpp
+@@ -41,7 +41,7 @@ AboutWidget::AboutWidget( QWidget *parent )
+
+ // KDE specific settings for "window" display (it's just a frame, not a real window)
+ KWindowSystem::setType(winId(), NET::Override);
+- KWindowSystem::setState(winId(), NET::StaysOnTop | NET::SkipTaskbar);
++ KWindowSystem::setState(winId(), NET::KeepAbove | NET::SkipTaskbar);
+
+ // these settings are difficult to set in designer
+ QPalette whitePalette((QColor(Qt::white)));
+--
+2.31.1
+
diff --git a/media-gfx/kuickshow/kuickshow-0.10.1.ebuild b/media-gfx/kuickshow/kuickshow-0.10.1.ebuild
index 9e8a35b597b5..fd2850a1a6f9 100644
--- a/media-gfx/kuickshow/kuickshow-0.10.1.ebuild
+++ b/media-gfx/kuickshow/kuickshow-0.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -40,3 +40,5 @@ DEPEND="
RDEPEND="${DEPEND}
!media-gfx/kuickshow:4
"
+
+PATCHES=( "${FILESDIR}/${P}-kwindowsystem-5.82.patch" ) # bug 790200