Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/latte-dock/files/, kde-misc/latte-dock/
Date: Fri, 14 May 2021 15:43:49
Message-Id: 1621007013.804d589f6c6727ce234ebf807593a793a878672e.asturm@gentoo
1 commit: 804d589f6c6727ce234ebf807593a793a878672e
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 14 14:24:23 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri May 14 15:43:33 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=804d589f
7
8 kde-misc/latte-dock: Fix build w/ >=kde-frameworks/kwindowsystem-5.82
9
10 Gentoo ebuild sets KWINDOWSYSTEM_NO_WIDGETS=ON which drops deprecated
11 KF5WindowSystem API from <=5.62. This case was already deprecated since
12 5.0 though.
13
14 See also: https://invent.kde.org/plasma/latte-dock/-/merge_requests/19
15
16 - Raise QTMIN/KFMIN and cleanup obsolete slot op while at it.
17 - Update HOMEPAGE
18
19 Closes: https://bugs.gentoo.org/790185
20 Package-Manager: Portage-3.0.18, Repoman-3.0.3
21 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
22
23 .../latte-dock-0.9.11-kwindowsystem-5.82.patch | 32 ++++++++++++
24 kde-misc/latte-dock/latte-dock-0.9.11-r1.ebuild | 61 ++++++++++++++++++++++
25 2 files changed, 93 insertions(+)
26
27 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
28 new file mode 100644
29 index 00000000000..91fc96d41f7
30 --- /dev/null
31 +++ b/kde-misc/latte-dock/files/latte-dock-0.9.11-kwindowsystem-5.82.patch
32 @@ -0,0 +1,32 @@
33 +From e62605321d739b941fdf0861bd24843ba1137216 Mon Sep 17 00:00:00 2001
34 +From: Andreas Sturmlechner <asturm@g.o>
35 +Date: Fri, 14 May 2021 16:13:01 +0200
36 +Subject: [PATCH] Port away from deprecated API (NET::StaysOnTop ->
37 + NET::KeepAbove)
38 +
39 +Deprecated since 5.0.
40 +
41 +Signed-off-by: Andreas Sturmlechner <asturm@g.o>
42 +---
43 + app/wm/xwindowinterface.cpp | 4 ++--
44 + 1 file changed, 2 insertions(+), 2 deletions(-)
45 +
46 +diff --git a/app/wm/xwindowinterface.cpp b/app/wm/xwindowinterface.cpp
47 +index 932f8e43..cc66ff4b 100644
48 +--- a/app/wm/xwindowinterface.cpp
49 ++++ b/app/wm/xwindowinterface.cpp
50 +@@ -666,9 +666,9 @@ void XWindowInterface::requestToggleKeepAbove(WindowId wid)
51 + NETWinInfo ni(QX11Info::connection(), wid.toUInt(), QX11Info::appRootWindow(), NET::WMState, NET::Properties2());
52 +
53 + if (wInfo.isKeepAbove()) {
54 +- ni.setState(NET::States(), NET::StaysOnTop);
55 ++ ni.setState(NET::States(), NET::KeepAbove);
56 + } else {
57 +- ni.setState(NET::StaysOnTop, NET::StaysOnTop);
58 ++ ni.setState(NET::KeepAbove, NET::KeepAbove);
59 + }
60 + }
61 +
62 +--
63 +2.31.1
64 +
65
66 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
67 new file mode 100644
68 index 00000000000..4e9b65b65c6
69 --- /dev/null
70 +++ b/kde-misc/latte-dock/latte-dock-0.9.11-r1.ebuild
71 @@ -0,0 +1,61 @@
72 +# Copyright 1999-2021 Gentoo Authors
73 +# Distributed under the terms of the GNU General Public License v2
74 +
75 +EAPI=7
76 +
77 +KFMIN=5.82.0
78 +QTMIN=5.15.2
79 +inherit ecm kde.org
80 +
81 +if [[ ${KDE_BUILD_TYPE} = release ]]; then
82 + SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
83 + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
84 +fi
85 +
86 +DESCRIPTION="Elegant dock, based on KDE Frameworks"
87 +HOMEPAGE="https://apps.kde.org/latte-dock/"
88 +
89 +LICENSE="GPL-2+"
90 +SLOT="0"
91 +IUSE=""
92 +
93 +DEPEND="
94 + >=dev-qt/qtdbus-${QTMIN}:5
95 + >=dev-qt/qtdeclarative-${QTMIN}:5
96 + >=dev-qt/qtgraphicaleffects-${QTMIN}:5
97 + || (
98 + >=dev-qt/qtgui-${QTMIN}:5[X(-)]
99 + >=dev-qt/qtgui-${QTMIN}:5[xcb(-)]
100 + )
101 + >=dev-qt/qtwidgets-${QTMIN}:5
102 + >=dev-qt/qtx11extras-${QTMIN}:5
103 + >=kde-frameworks/kactivities-${KFMIN}:5
104 + >=kde-frameworks/karchive-${KFMIN}:5
105 + >=kde-frameworks/kconfig-${KFMIN}:5
106 + >=kde-frameworks/kcoreaddons-${KFMIN}:5
107 + >=kde-frameworks/kcrash-${KFMIN}:5
108 + >=kde-frameworks/kdbusaddons-${KFMIN}:5
109 + >=kde-frameworks/kdeclarative-${KFMIN}:5
110 + >=kde-frameworks/kglobalaccel-${KFMIN}:5
111 + >=kde-frameworks/kguiaddons-${KFMIN}:5
112 + >=kde-frameworks/ki18n-${KFMIN}:5
113 + >=kde-frameworks/kiconthemes-${KFMIN}:5
114 + >=kde-frameworks/knewstuff-${KFMIN}:5
115 + >=kde-frameworks/knotifications-${KFMIN}:5
116 + >=kde-frameworks/kpackage-${KFMIN}:5
117 + >=kde-frameworks/kwayland-${KFMIN}:5
118 + >=kde-frameworks/kwindowsystem-${KFMIN}:5
119 + >=kde-frameworks/kxmlgui-${KFMIN}:5
120 + >=kde-frameworks/plasma-${KFMIN}:5[X]
121 + x11-libs/libSM
122 + x11-libs/libX11
123 + x11-libs/libxcb
124 +"
125 +RDEPEND="${DEPEND}
126 + >=dev-qt/qtquickcontrols-${QTMIN}:5
127 + >=dev-qt/qtquickcontrols2-${QTMIN}:5
128 +"
129 +
130 +DOCS=( CHANGELOG.md README.md )
131 +
132 +PATCHES=( "${FILESDIR}/${P}-kwindowsystem-5.82.patch" ) # bug 790185