1 |
commit: bb911d4fbed9273f6c10b2107077492a19f5fdbd |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 9 07:30:02 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 9 07:34:12 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb911d4f |
7 |
|
8 |
kde-plasma/plasma-workspace: backport widgetexplorer patch |
9 |
|
10 |
As requested by upstream at |
11 |
https://mail.kde.org/pipermail/distributions/2022-September/001287.html. |
12 |
|
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
....25.5-widgetexplorer-recurse-containments.patch | 26 +++ |
16 |
.../plasma-workspace-5.25.5-r1.ebuild | 219 +++++++++++++++++++++ |
17 |
2 files changed, 245 insertions(+) |
18 |
|
19 |
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-widgetexplorer-recurse-containments.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-widgetexplorer-recurse-containments.patch |
20 |
new file mode 100644 |
21 |
index 000000000000..1efe75b9b41d |
22 |
--- /dev/null |
23 |
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-widgetexplorer-recurse-containments.patch |
24 |
@@ -0,0 +1,26 @@ |
25 |
+https://invent.kde.org/plasma/plasma-workspace/-/commit/c7ba560ccaac5e469cb2d6bf66c39e1acf967454 |
26 |
+https://mail.kde.org/pipermail/distributions/2022-September/001287.html |
27 |
+ |
28 |
+From: Nicolas Fella <nicolas.fella@×××.de> |
29 |
+Date: Sun, 21 Aug 2022 16:33:50 +0200 |
30 |
+Subject: [PATCH] [widgetexplorer] Don't recurse into applet's containments |
31 |
+ |
32 |
+The intention of this code appears to be finding system tray applets, since the systemtray is a containment within another applet/containment |
33 |
+ |
34 |
+However the code causes an infinit recursion since we are calling addContainment on the same containment again |
35 |
+ |
36 |
+The recursion also is unnecessary since corona->containments() already lists the system tray containment, so we don't need to find it by recursing through the panel's children |
37 |
+--- a/components/shellprivate/widgetexplorer/widgetexplorer.cpp |
38 |
++++ b/components/shellprivate/widgetexplorer/widgetexplorer.cpp |
39 |
+@@ -280,10 +280,6 @@ void WidgetExplorerPrivate::addContainment(Containment *containment) |
40 |
+ |
41 |
+ foreach (Applet *applet, containment->applets()) { |
42 |
+ if (applet->pluginMetaData().isValid()) { |
43 |
+- Containment *childContainment = applet->property("containment").value<Containment *>(); |
44 |
+- if (childContainment) { |
45 |
+- addContainment(childContainment); |
46 |
+- } |
47 |
+ runningApplets[applet->pluginMetaData().pluginId()]++; |
48 |
+ } else { |
49 |
+ qDebug() << "Invalid plugin metadata. :("; |
50 |
+GitLab |
51 |
|
52 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r1.ebuild |
53 |
new file mode 100644 |
54 |
index 000000000000..2fac44d7b28b |
55 |
--- /dev/null |
56 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r1.ebuild |
57 |
@@ -0,0 +1,219 @@ |
58 |
+# Copyright 1999-2022 Gentoo Authors |
59 |
+# Distributed under the terms of the GNU General Public License v2 |
60 |
+ |
61 |
+EAPI=8 |
62 |
+ |
63 |
+ECM_HANDBOOK="optional" |
64 |
+ECM_TEST="forceoptional" |
65 |
+KFMIN=5.95.0 |
66 |
+PVCUT=$(ver_cut 1-3) |
67 |
+QTMIN=5.15.5 |
68 |
+VIRTUALX_REQUIRED="test" |
69 |
+inherit ecm plasma.kde.org |
70 |
+ |
71 |
+DESCRIPTION="KDE Plasma workspace" |
72 |
+ |
73 |
+LICENSE="GPL-2" # TODO: CHECK |
74 |
+SLOT="5" |
75 |
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" |
76 |
+IUSE="appstream +calendar +fontconfig geolocation gps +policykit |
77 |
+screencast +semantic-desktop telemetry" |
78 |
+ |
79 |
+REQUIRED_USE="gps? ( geolocation )" |
80 |
+RESTRICT="test" |
81 |
+ |
82 |
+# slot op: various private QtWaylandClient headers |
83 |
+COMMON_DEPEND=" |
84 |
+ >=dev-libs/wayland-1.15 |
85 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
86 |
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] |
87 |
+ >=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput] |
88 |
+ >=dev-qt/qtnetwork-${QTMIN}:5 |
89 |
+ >=dev-qt/qtsql-${QTMIN}:5 |
90 |
+ >=dev-qt/qtsvg-${QTMIN}:5 |
91 |
+ >=dev-qt/qtwayland-${QTMIN}:5= |
92 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
93 |
+ >=dev-qt/qtx11extras-${QTMIN}:5 |
94 |
+ >=dev-qt/qtxml-${QTMIN}:5 |
95 |
+ >=kde-frameworks/kactivities-${KFMIN}:5 |
96 |
+ >=kde-frameworks/kactivities-stats-${KFMIN}:5 |
97 |
+ >=kde-frameworks/karchive-${KFMIN}:5 |
98 |
+ >=kde-frameworks/kauth-${KFMIN}:5 |
99 |
+ >=kde-frameworks/kbookmarks-${KFMIN}:5 |
100 |
+ >=kde-frameworks/kcompletion-${KFMIN}:5 |
101 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
102 |
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
103 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
104 |
+ >=kde-frameworks/kcrash-${KFMIN}:5 |
105 |
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5 |
106 |
+ >=kde-frameworks/kdeclarative-${KFMIN}:5 |
107 |
+ >=kde-frameworks/kded-${KFMIN}:5 |
108 |
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5 |
109 |
+ >=kde-frameworks/kguiaddons-${KFMIN}:5 |
110 |
+ >=kde-frameworks/ki18n-${KFMIN}:5 |
111 |
+ >=kde-frameworks/kiconthemes-${KFMIN}:5 |
112 |
+ >=kde-frameworks/kidletime-${KFMIN}:5 |
113 |
+ >=kde-frameworks/kinit-${KFMIN}:5 |
114 |
+ >=kde-frameworks/kio-${KFMIN}:5 |
115 |
+ >=kde-frameworks/kitemmodels-${KFMIN}:5 |
116 |
+ >=kde-frameworks/kitemviews-${KFMIN}:5 |
117 |
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5 |
118 |
+ >=kde-frameworks/knewstuff-${KFMIN}:5 |
119 |
+ >=kde-frameworks/knotifications-${KFMIN}:5 |
120 |
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5 |
121 |
+ >=kde-frameworks/kpackage-${KFMIN}:5 |
122 |
+ >=kde-frameworks/kpeople-${KFMIN}:5 |
123 |
+ >=kde-frameworks/krunner-${KFMIN}:5 |
124 |
+ >=kde-frameworks/kservice-${KFMIN}:5 |
125 |
+ >=kde-frameworks/ktexteditor-${KFMIN}:5 |
126 |
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5 |
127 |
+ >=kde-frameworks/kunitconversion-${KFMIN}:5 |
128 |
+ >=kde-frameworks/kwallet-${KFMIN}:5 |
129 |
+ >=kde-frameworks/kwayland-${KFMIN}:5 |
130 |
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
131 |
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5 |
132 |
+ >=kde-frameworks/kxmlgui-${KFMIN}:5 |
133 |
+ >=kde-frameworks/plasma-${KFMIN}:5 |
134 |
+ >=kde-frameworks/prison-${KFMIN}:5[qml] |
135 |
+ >=kde-frameworks/solid-${KFMIN}:5 |
136 |
+ >=kde-plasma/breeze-${PVCUT}:5 |
137 |
+ >=kde-plasma/kscreenlocker-${PVCUT}:5 |
138 |
+ >=kde-plasma/kwin-${PVCUT}:5 |
139 |
+ >=kde-plasma/layer-shell-qt-${PVCUT}:5 |
140 |
+ >=kde-plasma/libkscreen-${PVCUT}:5 |
141 |
+ >=kde-plasma/libksysguard-${PVCUT}:5 |
142 |
+ >=kde-plasma/libkworkspace-${PVCUT}:5 |
143 |
+ >=media-libs/phonon-4.11.0 |
144 |
+ sci-libs/libqalculate:= |
145 |
+ sys-libs/zlib |
146 |
+ x11-libs/libICE |
147 |
+ x11-libs/libSM |
148 |
+ x11-libs/libX11 |
149 |
+ x11-libs/libXau |
150 |
+ x11-libs/libxcb |
151 |
+ x11-libs/libXcursor |
152 |
+ x11-libs/libXfixes |
153 |
+ x11-libs/libXrender |
154 |
+ x11-libs/libXtst |
155 |
+ x11-libs/xcb-util |
156 |
+ x11-libs/xcb-util-image |
157 |
+ appstream? ( dev-libs/appstream[qt5] ) |
158 |
+ calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) |
159 |
+ fontconfig? ( |
160 |
+ >=dev-qt/qtprintsupport-${QTMIN}:5 |
161 |
+ media-libs/fontconfig |
162 |
+ x11-libs/libXft |
163 |
+ x11-libs/xcb-util-image |
164 |
+ ) |
165 |
+ geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) |
166 |
+ gps? ( sci-geosciences/gpsd ) |
167 |
+ policykit? ( virtual/libcrypt:= ) |
168 |
+ screencast? ( |
169 |
+ >=dev-qt/qtgui-${QTMIN}:5=[egl] |
170 |
+ media-libs/libglvnd |
171 |
+ >=media-video/pipewire-0.3:= |
172 |
+ x11-libs/libdrm |
173 |
+ ) |
174 |
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) |
175 |
+ telemetry? ( dev-libs/kuserfeedback:5 ) |
176 |
+" |
177 |
+DEPEND="${COMMON_DEPEND} |
178 |
+ >=dev-libs/plasma-wayland-protocols-1.6.0 |
179 |
+ >=dev-qt/qtconcurrent-${QTMIN}:5 |
180 |
+ >=dev-util/wayland-scanner-1.19.0 |
181 |
+ x11-base/xorg-proto |
182 |
+ fontconfig? ( x11-libs/libXrender ) |
183 |
+ test? ( >=dev-libs/wayland-protocols-1.24 ) |
184 |
+" |
185 |
+RDEPEND="${COMMON_DEPEND} |
186 |
+ app-text/iso-codes |
187 |
+ >=dev-qt/qdbus-${QTMIN}:* |
188 |
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5 |
189 |
+ >=dev-qt/qtpaths-${QTMIN}:5 |
190 |
+ >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets] |
191 |
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5 |
192 |
+ kde-apps/kio-extras:5 |
193 |
+ >=kde-frameworks/kirigami-${KFMIN}:5 |
194 |
+ >=kde-frameworks/kquickcharts-${KFMIN}:5 |
195 |
+ >=kde-plasma/milou-${PVCUT}:5 |
196 |
+ >=kde-plasma/plasma-integration-${PVCUT}:5 |
197 |
+ sys-apps/dbus |
198 |
+ x11-apps/xmessage |
199 |
+ x11-apps/xprop |
200 |
+ x11-apps/xrdb |
201 |
+ x11-apps/xsetroot |
202 |
+ !<kde-plasma/breeze-5.22.90:5 |
203 |
+ !<kde-plasma/plasma-desktop-5.23.90:5 |
204 |
+ policykit? ( sys-apps/accountsservice ) |
205 |
+" |
206 |
+BDEPEND=" |
207 |
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5 |
208 |
+ virtual/pkgconfig |
209 |
+" |
210 |
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5" |
211 |
+ |
212 |
+PATCHES=( |
213 |
+ "${FILESDIR}/${PN}-5.24.80-split-libkworkspace.patch" # downstream |
214 |
+ "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478 |
215 |
+ "${FILESDIR}/${P}-widgetexplorer-recurse-containments.patch" # https://mail.kde.org/pipermail/distributions/2022-September/001287.html |
216 |
+) |
217 |
+ |
218 |
+src_prepare() { |
219 |
+ ecm_src_prepare |
220 |
+ |
221 |
+ cmake_comment_add_subdirectory libkworkspace |
222 |
+ # delete colliding libkworkspace translations |
223 |
+ if [[ ${KDE_BUILD_TYPE} = release ]]; then |
224 |
+ find po -type f -name "*po" -and -name "libkworkspace*" -delete || die |
225 |
+ fi |
226 |
+ |
227 |
+ # TODO: try to get a build switch upstreamed |
228 |
+ if ! use screencast; then |
229 |
+ sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die |
230 |
+ fi |
231 |
+ |
232 |
+ # TODO: try to get a build switch upstreamed |
233 |
+ if use geolocation; then |
234 |
+ use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \ |
235 |
+ -i dataengines/geolocation/CMakeLists.txt || die |
236 |
+ fi |
237 |
+ |
238 |
+ if ! use policykit; then |
239 |
+ cmake_run_in kcms cmake_comment_add_subdirectory users |
240 |
+ fi |
241 |
+} |
242 |
+ |
243 |
+src_configure() { |
244 |
+ local mycmakeargs=( |
245 |
+ -DBUILD_xembed-sni-proxy=OFF |
246 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON |
247 |
+ $(cmake_use_find_package appstream AppStreamQt) |
248 |
+ $(cmake_use_find_package calendar KF5Holidays) |
249 |
+ $(cmake_use_find_package fontconfig Fontconfig) |
250 |
+ $(cmake_use_find_package geolocation KF5NetworkManagerQt) |
251 |
+ $(cmake_use_find_package semantic-desktop KF5Baloo) |
252 |
+ $(cmake_use_find_package telemetry KUserFeedback) |
253 |
+ ) |
254 |
+ |
255 |
+ ecm_src_configure |
256 |
+} |
257 |
+ |
258 |
+src_install() { |
259 |
+ ecm_src_install |
260 |
+ |
261 |
+ # default startup and shutdown scripts |
262 |
+ insinto /etc/xdg/plasma-workspace/env |
263 |
+ doins "${FILESDIR}"/10-agent-startup.sh |
264 |
+ |
265 |
+ insinto /etc/xdg/plasma-workspace/shutdown |
266 |
+ doins "${FILESDIR}"/10-agent-shutdown.sh |
267 |
+ fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh |
268 |
+} |
269 |
+ |
270 |
+pkg_postinst () { |
271 |
+ ecm_pkg_postinst |
272 |
+ |
273 |
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions," |
274 |
+ elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh" |
275 |
+ elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh" |
276 |
+} |