commit:     804d589f6c6727ce234ebf807593a793a878672e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 14 14:24:23 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 14 15:43:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=804d589f

kde-misc/latte-dock: 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.

See also: https://invent.kde.org/plasma/latte-dock/-/merge_requests/19

- Raise QTMIN/KFMIN and cleanup obsolete slot op while at it.
- Update HOMEPAGE

Closes: https://bugs.gentoo.org/790185
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../latte-dock-0.9.11-kwindowsystem-5.82.patch     | 32 ++++++++++++
 kde-misc/latte-dock/latte-dock-0.9.11-r1.ebuild    | 61 ++++++++++++++++++++++
 2 files changed, 93 insertions(+)

diff --git 
a/kde-misc/latte-dock/files/latte-dock-0.9.11-kwindowsystem-5.82.patch 
b/kde-misc/latte-dock/files/latte-dock-0.9.11-kwindowsystem-5.82.patch
new file mode 100644
index 00000000000..91fc96d41f7
--- /dev/null
+++ b/kde-misc/latte-dock/files/latte-dock-0.9.11-kwindowsystem-5.82.patch
@@ -0,0 +1,32 @@
+From e62605321d739b941fdf0861bd24843ba1137216 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <[email protected]>
+Date: Fri, 14 May 2021 16:13:01 +0200
+Subject: [PATCH] Port away from deprecated API (NET::StaysOnTop ->
+ NET::KeepAbove)
+
+Deprecated since 5.0.
+
+Signed-off-by: Andreas Sturmlechner <[email protected]>
+---
+ app/wm/xwindowinterface.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/app/wm/xwindowinterface.cpp b/app/wm/xwindowinterface.cpp
+index 932f8e43..cc66ff4b 100644
+--- a/app/wm/xwindowinterface.cpp
++++ b/app/wm/xwindowinterface.cpp
+@@ -666,9 +666,9 @@ void XWindowInterface::requestToggleKeepAbove(WindowId wid)
+     NETWinInfo ni(QX11Info::connection(), wid.toUInt(), 
QX11Info::appRootWindow(), NET::WMState, NET::Properties2());
+ 
+     if (wInfo.isKeepAbove()) {
+-        ni.setState(NET::States(), NET::StaysOnTop);
++        ni.setState(NET::States(), NET::KeepAbove);
+     } else {
+-        ni.setState(NET::StaysOnTop, NET::StaysOnTop);
++        ni.setState(NET::KeepAbove, NET::KeepAbove);
+     }
+ }
+ 
+-- 
+2.31.1
+

diff --git a/kde-misc/latte-dock/latte-dock-0.9.11-r1.ebuild 
b/kde-misc/latte-dock/latte-dock-0.9.11-r1.ebuild
new file mode 100644
index 00000000000..4e9b65b65c6
--- /dev/null
+++ b/kde-misc/latte-dock/latte-dock-0.9.11-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.82.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+       SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+       KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Elegant dock, based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/latte-dock/";
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5
+       >=dev-qt/qtgraphicaleffects-${QTMIN}:5
+       || (
+               >=dev-qt/qtgui-${QTMIN}:5[X(-)]
+               >=dev-qt/qtgui-${QTMIN}:5[xcb(-)]
+       )
+       >=dev-qt/qtwidgets-${QTMIN}:5
+       >=dev-qt/qtx11extras-${QTMIN}:5
+       >=kde-frameworks/kactivities-${KFMIN}:5
+       >=kde-frameworks/karchive-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kcrash-${KFMIN}:5
+       >=kde-frameworks/kdbusaddons-${KFMIN}:5
+       >=kde-frameworks/kdeclarative-${KFMIN}:5
+       >=kde-frameworks/kglobalaccel-${KFMIN}:5
+       >=kde-frameworks/kguiaddons-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kiconthemes-${KFMIN}:5
+       >=kde-frameworks/knewstuff-${KFMIN}:5
+       >=kde-frameworks/knotifications-${KFMIN}:5
+       >=kde-frameworks/kpackage-${KFMIN}:5
+       >=kde-frameworks/kwayland-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5
+       >=kde-frameworks/kxmlgui-${KFMIN}:5
+       >=kde-frameworks/plasma-${KFMIN}:5[X]
+       x11-libs/libSM
+       x11-libs/libX11
+       x11-libs/libxcb
+"
+RDEPEND="${DEPEND}
+       >=dev-qt/qtquickcontrols-${QTMIN}:5
+       >=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+DOCS=( CHANGELOG.md README.md )
+
+PATCHES=( "${FILESDIR}/${P}-kwindowsystem-5.82.patch" ) # bug 790185

Reply via email to