1 |
commit: 16e3445cf4f8d159317df5a3abfb6c489af2c5b7 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 15 11:59:38 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 16 11:09:46 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16e3445c |
7 |
|
8 |
kde-plasma/plasma-workspace: drop 5.21.5* |
9 |
|
10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
11 |
|
12 |
kde-plasma/plasma-workspace/Manifest | 1 - |
13 |
.../plasma-workspace-5.21.5-FindFontconfig.cmake | 96 ------ |
14 |
...asma-workspace-5.21.5-dangerous-shortcuts.patch | 45 --- |
15 |
...-workspace-5.21.5-revert-activate-krunner.patch | 56 --- |
16 |
...workspace-5.21.5-transparency-panelConfig.patch | 27 -- |
17 |
.../plasma-workspace-5.21.5-transparency.patch | 376 --------------------- |
18 |
.../plasma-workspace-5.21.5.ebuild | 214 ------------ |
19 |
7 files changed, 815 deletions(-) |
20 |
|
21 |
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest |
22 |
index 013d9857393..0039ae12111 100644 |
23 |
--- a/kde-plasma/plasma-workspace/Manifest |
24 |
+++ b/kde-plasma/plasma-workspace/Manifest |
25 |
@@ -1,2 +1 @@ |
26 |
-DIST plasma-workspace-5.21.5.tar.xz 9724000 BLAKE2B 2688c8aacd4e5584bb2660a287563aa683af4d469aad45f3521d31ec569d403204cceeb167062a9d8dfe591972db3758d5f46c21ca7c30453cd6740f3e3b470a SHA512 6918c1a29e977ac7f3ebf6ac7308f20f20712db96bf10599f3372987509630aa2ca8bc6adf0b1af4e543ccd2a2001e38ce02d759d25f09588c7c1aaa358af1b4 |
27 |
DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47 |
28 |
|
29 |
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-FindFontconfig.cmake b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-FindFontconfig.cmake |
30 |
deleted file mode 100644 |
31 |
index db5f18300ed..00000000000 |
32 |
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-FindFontconfig.cmake |
33 |
+++ /dev/null |
34 |
@@ -1,96 +0,0 @@ |
35 |
-# SPDX-FileCopyrightText: 2006, 2007 Laurent Montel <montel@×××.org> |
36 |
-# SPDX-FileCopyrightText: 2018 Volker Krause <vkrause@×××.org> |
37 |
-# |
38 |
-# SPDX-License-Identifier: BSD-3-Clause |
39 |
- |
40 |
-#[=======================================================================[.rst: |
41 |
-FindFontconfig |
42 |
--------------- |
43 |
- |
44 |
-Try to find Fontconfig. |
45 |
-Once done this will define the following variables: |
46 |
- |
47 |
-``Fontconfig_FOUND`` |
48 |
- True if Fontconfig is available |
49 |
-``Fontconfig_INCLUDE_DIRS`` |
50 |
- The include directory to use for the Fontconfig headers |
51 |
-``Fontconfig_LIBRARIES`` |
52 |
- The Fontconfig libraries for linking |
53 |
-``Fontconfig_DEFINITIONS`` |
54 |
- Compiler switches required for using Fontconfig |
55 |
-``Fontconfig_VERSION`` |
56 |
- The version of Fontconfig that has been found |
57 |
- |
58 |
-If ``Fontconfig_FOUND`` is TRUE, it will also define the following |
59 |
-imported target: |
60 |
- |
61 |
-``Fontconfig::Fontconfig`` |
62 |
- |
63 |
-Since 5.57.0. |
64 |
-#]=======================================================================] |
65 |
- |
66 |
-# use pkg-config to get the directories and then use these values |
67 |
-# in the FIND_PATH() and FIND_LIBRARY() calls |
68 |
-find_package(PkgConfig QUIET) |
69 |
-pkg_check_modules(PC_FONTCONFIG QUIET fontconfig) |
70 |
- |
71 |
-set(Fontconfig_DEFINITIONS ${PC_FONTCONFIG_CFLAGS_OTHER}) |
72 |
- |
73 |
-find_path(Fontconfig_INCLUDE_DIRS fontconfig/fontconfig.h |
74 |
- PATHS |
75 |
- ${PC_FONTCONFIG_INCLUDE_DIRS} |
76 |
- /usr/X11/include |
77 |
-) |
78 |
- |
79 |
-find_library(Fontconfig_LIBRARIES NAMES fontconfig |
80 |
- PATHS |
81 |
- ${PC_FONTCONFIG_LIBRARY_DIRS} |
82 |
-) |
83 |
- |
84 |
-set(Fontconfig_VERSION ${PC_FONTCONFIG_VERSION}) |
85 |
-if (NOT Fontconfig_VERSION) |
86 |
- find_file(Fontconfig_VERSION_HEADER |
87 |
- NAMES "fontconfig/fontconfig.h" |
88 |
- HINTS ${Fontconfig_INCLUDE_DIRS} |
89 |
- ) |
90 |
- mark_as_advanced(Fontconfig_VERSION_HEADER) |
91 |
- if (Fontconfig_VERSION_HEADER) |
92 |
- file(READ ${Fontconfig_VERSION_HEADER} _fontconfig_version_header_content) |
93 |
- string(REGEX MATCH "#define FC_MAJOR[ \t]+[0-9]+" Fontconfig_MAJOR_VERSION_MATCH ${_fontconfig_version_header_content}) |
94 |
- string(REGEX MATCH "#define FC_MINOR[ \t]+[0-9]+" Fontconfig_MINOR_VERSION_MATCH ${_fontconfig_version_header_content}) |
95 |
- string(REGEX MATCH "#define FC_REVISION[ \t]+[0-9]+" Fontconfig_PATCH_VERSION_MATCH ${_fontconfig_version_header_content}) |
96 |
- string(REGEX REPLACE ".*FC_MAJOR[ \t]+(.*)" "\\1" Fontconfig_MAJOR_VERSION ${Fontconfig_MAJOR_VERSION_MATCH}) |
97 |
- string(REGEX REPLACE ".*FC_MINOR[ \t]+(.*)" "\\1" Fontconfig_MINOR_VERSION ${Fontconfig_MINOR_VERSION_MATCH}) |
98 |
- string(REGEX REPLACE ".*FC_REVISION[ \t]+(.*)" "\\1" Fontconfig_PATCH_VERSION ${Fontconfig_PATCH_VERSION_MATCH}) |
99 |
- set(Fontconfig_VERSION "${Fontconfig_MAJOR_VERSION}.${Fontconfig_MINOR_VERSION}.${Fontconfig_PATCH_VERSION}") |
100 |
- endif() |
101 |
-endif() |
102 |
- |
103 |
-include(FindPackageHandleStandardArgs) |
104 |
-find_package_handle_standard_args(Fontconfig |
105 |
- FOUND_VAR Fontconfig_FOUND |
106 |
- REQUIRED_VARS Fontconfig_LIBRARIES Fontconfig_INCLUDE_DIRS |
107 |
- VERSION_VAR Fontconfig_VERSION |
108 |
-) |
109 |
-mark_as_advanced(Fontconfig_LIBRARIES Fontconfig_INCLUDE_DIRS) |
110 |
- |
111 |
-if(Fontconfig_FOUND AND NOT TARGET Fontconfig::Fontconfig) |
112 |
- add_library(Fontconfig::Fontconfig UNKNOWN IMPORTED) |
113 |
- set_target_properties(Fontconfig::Fontconfig PROPERTIES |
114 |
- IMPORTED_LOCATION "${Fontconfig_LIBRARIES}" |
115 |
- INTERFACE_INCLUDE_DIRECTORIES "${Fontconfig_INCLUDE_DIRS}" |
116 |
- INTERFACE_COMPILER_DEFINITIONS "${Fontconfig_DEFINITIONS}" |
117 |
- ) |
118 |
-endif() |
119 |
- |
120 |
-# backward compatibility, remove in kf6 |
121 |
-set(FONTCONFIG_INCLUDE_DIR "${Fontconfig_INCLUDE_DIRS}") |
122 |
-set(FONTCONFIG_LIBRARIES "${Fontconfig_LIBRARIES}") |
123 |
-set(FONTCONFIG_DEFINITIONS "${Fontconfig_DEFINITIONS}") |
124 |
-mark_as_advanced(FONTCONFIG_INCLUDE_DIR FONTCONFIG_LIBRARIES FONTCONFIG_DEFINITIONS) |
125 |
- |
126 |
-include(FeatureSummary) |
127 |
-set_package_properties(Fontconfig PROPERTIES |
128 |
- URL "https://www.fontconfig.org/" |
129 |
- DESCRIPTION "Fontconfig is a library for configuring and customizing font access" |
130 |
-) |
131 |
|
132 |
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-dangerous-shortcuts.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-dangerous-shortcuts.patch |
133 |
deleted file mode 100644 |
134 |
index f04bb866d5d..00000000000 |
135 |
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-dangerous-shortcuts.patch |
136 |
+++ /dev/null |
137 |
@@ -1,45 +0,0 @@ |
138 |
-From e8e17c5ef8734fa56a78405e32277568e4e1095e Mon Sep 17 00:00:00 2001 |
139 |
-From: Nate Graham <nate@×××.org> |
140 |
-Date: Thu, 22 Apr 2021 08:38:18 -0600 |
141 |
-Subject: [PATCH] [ksmserver] Remove default shortcuts for "Without |
142 |
- Confirmation" actions |
143 |
- |
144 |
-These actions bypass the user setting for whether or not to show the |
145 |
-logout screen and always log out/reboot/etc. immediately. Because they |
146 |
-have default keyboard shortcuts, they can be triggered by accident and |
147 |
-cause unexpected logouts/reboots/etc. |
148 |
- |
149 |
-BUG: 435954 |
150 |
-FIXED-IN: 5.22 |
151 |
---- |
152 |
- ksmserver/server.cpp | 6 +++--- |
153 |
- 1 file changed, 3 insertions(+), 3 deletions(-) |
154 |
- |
155 |
-diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp |
156 |
-index ac9da9f09..6f3179fb9 100644 |
157 |
---- a/ksmserver/server.cpp |
158 |
-+++ b/ksmserver/server.cpp |
159 |
-@@ -880,17 +880,17 @@ void KSMServer::setupShortcuts() |
160 |
- |
161 |
- a = actionCollection->addAction(QStringLiteral("Log Out Without Confirmation")); |
162 |
- a->setText(i18n("Log Out Without Confirmation")); |
163 |
-- KGlobalAccel::self()->setGlobalShortcut(a, QList<QKeySequence>() << Qt::ALT + Qt::CTRL + Qt::SHIFT + Qt::Key_Delete); |
164 |
-+ KGlobalAccel::self()->setGlobalShortcut(a, QKeySequence()); |
165 |
- connect(a, &QAction::triggered, this, &KSMServer::logoutWithoutConfirmation); |
166 |
- |
167 |
- a = actionCollection->addAction(QStringLiteral("Halt Without Confirmation")); |
168 |
- a->setText(i18n("Halt Without Confirmation")); |
169 |
-- KGlobalAccel::self()->setGlobalShortcut(a, QList<QKeySequence>() << Qt::ALT + Qt::CTRL + Qt::SHIFT + Qt::Key_PageDown); |
170 |
-+ KGlobalAccel::self()->setGlobalShortcut(a, QKeySequence()); |
171 |
- connect(a, &QAction::triggered, this, &KSMServer::haltWithoutConfirmation); |
172 |
- |
173 |
- a = actionCollection->addAction(QStringLiteral("Reboot Without Confirmation")); |
174 |
- a->setText(i18n("Reboot Without Confirmation")); |
175 |
-- KGlobalAccel::self()->setGlobalShortcut(a, QList<QKeySequence>() << Qt::ALT + Qt::CTRL + Qt::SHIFT + Qt::Key_PageUp); |
176 |
-+ KGlobalAccel::self()->setGlobalShortcut(a, QKeySequence()); |
177 |
- connect(a, &QAction::triggered, this, &KSMServer::rebootWithoutConfirmation); |
178 |
- } |
179 |
- } |
180 |
--- |
181 |
-GitLab |
182 |
- |
183 |
|
184 |
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-revert-activate-krunner.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-revert-activate-krunner.patch |
185 |
deleted file mode 100644 |
186 |
index c2637286da1..00000000000 |
187 |
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-revert-activate-krunner.patch |
188 |
+++ /dev/null |
189 |
@@ -1,56 +0,0 @@ |
190 |
-From 9bdae154bb3711b0220d0a8a685b2329f487d1f2 Mon Sep 17 00:00:00 2001 |
191 |
-From: Andreas Sturmlechner <asturm@g.o> |
192 |
-Date: Mon, 15 Feb 2021 17:35:19 +0100 |
193 |
-Subject: [PATCH] Revert "Activate KRunner instead of running the binary" |
194 |
- |
195 |
-Causes applications to be started with cwd "/". |
196 |
- |
197 |
-See also: https://bugs.gentoo.org/767478 |
198 |
- |
199 |
-This reverts commit 0e575a20ef36532b5b40a40ea30f915976942477. |
200 |
---- |
201 |
- krunner/CMakeLists.txt | 3 ++- |
202 |
- krunner/{krunner.desktop => krunner.desktop.cmake} | 4 ++-- |
203 |
- 2 files changed, 4 insertions(+), 3 deletions(-) |
204 |
- rename krunner/{krunner.desktop => krunner.desktop.cmake} (94%) |
205 |
- |
206 |
-diff --git a/krunner/CMakeLists.txt b/krunner/CMakeLists.txt |
207 |
-index 07d27c1dc..8e1f2e3bd 100644 |
208 |
---- a/krunner/CMakeLists.txt |
209 |
-+++ b/krunner/CMakeLists.txt |
210 |
-@@ -31,7 +31,8 @@ target_compile_definitions(krunner PRIVATE -DPROJECT_VERSION="${PROJECT_VERSION} |
211 |
- install(TARGETS krunner ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) |
212 |
- install(FILES ${krunner_dbusAppXML} DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} ) |
213 |
- |
214 |
--install(FILES krunner.desktop DESTINATION ${DATA_INSTALL_DIR}/kglobalaccel) |
215 |
-+configure_file(krunner.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/krunner.desktop @ONLY) |
216 |
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/krunner.desktop DESTINATION ${DATA_INSTALL_DIR}/kglobalaccel) |
217 |
- |
218 |
- set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KRunnerAppDBusInterface") |
219 |
- configure_package_config_file(KRunnerAppDBusInterfaceConfig.cmake.in |
220 |
-diff --git a/krunner/krunner.desktop b/krunner/krunner.desktop.cmake |
221 |
-similarity index 94% |
222 |
-rename from krunner/krunner.desktop |
223 |
-rename to krunner/krunner.desktop.cmake |
224 |
-index 7a0398696..c4c8c9d92 100644 |
225 |
---- a/krunner/krunner.desktop |
226 |
-+++ b/krunner/krunner.desktop.cmake |
227 |
-@@ -1,5 +1,5 @@ |
228 |
- [Desktop Entry] |
229 |
--Exec=dbus-send --type=method_call --dest=org.kde.krunner /App org.kde.krunner.App.toggleDisplay |
230 |
-+Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner |
231 |
- Name=KRunner |
232 |
- Name[ar]=مشغّل.ك |
233 |
- Name[ast]=KRunner |
234 |
-@@ -60,7 +60,7 @@ Actions=RunClipboard |
235 |
- X-KDE-Wayland-Interfaces=org_kde_plasma_window_management |
236 |
- |
237 |
- [Desktop Action RunClipboard] |
238 |
--Exec=dbus-send --type=method_call --dest=org.kde.krunner /App org.kde.krunner.App.displayWithClipboardContents |
239 |
-+Exec=krunner -c |
240 |
- Name=Run command on clipboard contents |
241 |
- Name[az]=Əmri, mübadilə buferindən başlatmaq |
242 |
- Name[ca]=Executa una ordre al contingut del porta-retalls |
243 |
--- |
244 |
-2.31.1 |
245 |
- |
246 |
|
247 |
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency-panelConfig.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency-panelConfig.patch |
248 |
deleted file mode 100644 |
249 |
index fb7993e6db7..00000000000 |
250 |
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency-panelConfig.patch |
251 |
+++ /dev/null |
252 |
@@ -1,27 +0,0 @@ |
253 |
-From 1cf02aad96bfe650a1f4d1465ae15234205fb061 Mon Sep 17 00:00:00 2001 |
254 |
-From: Bharadwaj Raju <bharadwaj.raju777@××××××××××.com> |
255 |
-Date: Mon, 26 Apr 2021 18:47:51 +0000 |
256 |
-Subject: [PATCH] Load panelOpacity from config parent, not from config |
257 |
- |
258 |
-BUG: 434285 |
259 |
-FIXED-IN: 5.22 |
260 |
---- |
261 |
- shell/panelview.cpp | 2 +- |
262 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
263 |
- |
264 |
-diff --git a/shell/panelview.cpp b/shell/panelview.cpp |
265 |
-index 5ed743024..4533e856f 100644 |
266 |
---- a/shell/panelview.cpp |
267 |
-+++ b/shell/panelview.cpp |
268 |
-@@ -633,7 +633,7 @@ void PanelView::restore() |
269 |
- // the place for this config key is changed in Plasma 5.9 |
270 |
- // Do NOT use readConfigValueWithFallBack |
271 |
- setVisibilityMode((VisibilityMode)panelConfig.parent().readEntry<int>("panelVisibility", panelConfig.readEntry<int>("panelVisibility", (int)NormalPanel))); |
272 |
-- setOpacityMode((OpacityMode)readConfigValueWithFallBack("panelOpacity", PanelView::OpacityMode::Adaptive)); |
273 |
-+ setOpacityMode((OpacityMode)config().parent().readEntry<int>("panelOpacity", configDefaults().parent().readEntry<int>("panelOpacity", PanelView::OpacityMode::Adaptive))); |
274 |
- m_initCompleted = true; |
275 |
- resizePanel(); |
276 |
- positionPanel(); |
277 |
--- |
278 |
-GitLab |
279 |
- |
280 |
|
281 |
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency.patch |
282 |
deleted file mode 100644 |
283 |
index 1a925a137ce..00000000000 |
284 |
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency.patch |
285 |
+++ /dev/null |
286 |
@@ -1,376 +0,0 @@ |
287 |
-From 7db8d5ee551f30576588d31470fe287b6ad2adcd Mon Sep 17 00:00:00 2001 |
288 |
-From: =?UTF-8?q?Niccol=C3=B2=20Venerandi?= <niccolo@×××××××××.com> |
289 |
-Date: Mon, 1 Mar 2021 22:14:43 +0000 |
290 |
-Subject: [PATCH] Add support for adaptive opacity panels |
291 |
- |
292 |
-Co-authored-by: Jan Blackquill <uhhadd@×××××.com> |
293 |
---- |
294 |
- libtaskmanager/taskfilterproxymodel.cpp | 26 ++++++++++++++++++ |
295 |
- libtaskmanager/taskfilterproxymodel.h | 19 ++++++++++++++ |
296 |
- libtaskmanager/tasksmodel.cpp | 11 ++++++++ |
297 |
- libtaskmanager/tasksmodel.h | 19 ++++++++++++++ |
298 |
- shell/panelconfigview.cpp | 11 ++++++++ |
299 |
- shell/panelconfigview.h | 5 ++++ |
300 |
- shell/panelview.cpp | 35 +++++++++++++++++++++++++ |
301 |
- shell/panelview.h | 28 ++++++++++++++++++++ |
302 |
- 8 files changed, 154 insertions(+) |
303 |
- |
304 |
-diff --git a/libtaskmanager/taskfilterproxymodel.cpp b/libtaskmanager/taskfilterproxymodel.cpp |
305 |
-index 37a3076fd..6bb27537a 100644 |
306 |
---- a/libtaskmanager/taskfilterproxymodel.cpp |
307 |
-+++ b/libtaskmanager/taskfilterproxymodel.cpp |
308 |
-@@ -40,6 +40,7 @@ public: |
309 |
- bool filterByScreen = false; |
310 |
- bool filterByActivity = false; |
311 |
- bool filterNotMinimized = false; |
312 |
-+ bool filterNotMaximized = false; |
313 |
- bool filterSkipTaskbar = true; |
314 |
- bool filterSkipPager = false; |
315 |
- |
316 |
-@@ -185,6 +186,22 @@ void TaskFilterProxyModel::setFilterNotMinimized(bool filter) |
317 |
- } |
318 |
- } |
319 |
- |
320 |
-+bool TaskFilterProxyModel::filterNotMaximized() const |
321 |
-+{ |
322 |
-+ return d->filterNotMaximized; |
323 |
-+} |
324 |
-+ |
325 |
-+void TaskFilterProxyModel::setFilterNotMaximized(bool filter) |
326 |
-+{ |
327 |
-+ if (d->filterNotMaximized != filter) { |
328 |
-+ d->filterNotMaximized = filter; |
329 |
-+ |
330 |
-+ invalidateFilter(); |
331 |
-+ |
332 |
-+ emit filterNotMaximizedChanged(); |
333 |
-+ } |
334 |
-+} |
335 |
-+ |
336 |
- bool TaskFilterProxyModel::filterSkipTaskbar() const |
337 |
- { |
338 |
- return d->filterSkipTaskbar; |
339 |
-@@ -301,6 +318,15 @@ bool TaskFilterProxyModel::acceptsRow(int sourceRow) const |
340 |
- } |
341 |
- } |
342 |
- |
343 |
-+ // Filter not maximized. |
344 |
-+ if (d->filterNotMaximized) { |
345 |
-+ bool isMaximized = sourceIdx.data(AbstractTasksModel::IsMaximized).toBool(); |
346 |
-+ |
347 |
-+ if (!isMaximized) { |
348 |
-+ return false; |
349 |
-+ } |
350 |
-+ } |
351 |
-+ |
352 |
- return true; |
353 |
- } |
354 |
- |
355 |
-diff --git a/libtaskmanager/taskfilterproxymodel.h b/libtaskmanager/taskfilterproxymodel.h |
356 |
-index 7ad2cb9ce..88ba3adab 100644 |
357 |
---- a/libtaskmanager/taskfilterproxymodel.h |
358 |
-+++ b/libtaskmanager/taskfilterproxymodel.h |
359 |
-@@ -52,6 +52,7 @@ class TASKMANAGER_EXPORT TaskFilterProxyModel : public QSortFilterProxyModel, pu |
360 |
- Q_PROPERTY(bool filterByScreen READ filterByScreen WRITE setFilterByScreen NOTIFY filterByScreenChanged) |
361 |
- Q_PROPERTY(bool filterByActivity READ filterByActivity WRITE setFilterByActivity NOTIFY filterByActivityChanged) |
362 |
- Q_PROPERTY(bool filterNotMinimized READ filterNotMinimized WRITE setFilterNotMinimized NOTIFY filterNotMinimizedChanged) |
363 |
-+ Q_PROPERTY(bool filterNotMaximized READ filterNotMaximized WRITE setFilterNotMaximized NOTIFY filterNotMaximizedChanged) |
364 |
- Q_PROPERTY(bool filterSkipTaskbar READ filterSkipTaskbar WRITE setFilterSkipTaskbar NOTIFY filterSkipTaskbarChanged) |
365 |
- Q_PROPERTY(bool filterSkipPager READ filterSkipPager WRITE setFilterSkipPager NOTIFY filterSkipPagerChanged) |
366 |
- |
367 |
-@@ -212,6 +213,23 @@ public: |
368 |
- **/ |
369 |
- void setFilterNotMinimized(bool filter); |
370 |
- |
371 |
-+ /** |
372 |
-+ * Whether non-maximized tasks should be filtered. Defaults to |
373 |
-+ * @c false. |
374 |
-+ * |
375 |
-+ * @see setFilterNotMaximized |
376 |
-+ * @returns @c true if non-maximized tasks should be filtered. |
377 |
-+ **/ |
378 |
-+ bool filterNotMaximized() const; |
379 |
-+ |
380 |
-+ /** |
381 |
-+ * Set whether non-maximized tasks should be filtered. |
382 |
-+ * |
383 |
-+ * @see filterNotMaximized |
384 |
-+ * @param filter Whether non-maximized tasks should be filtered. |
385 |
-+ **/ |
386 |
-+ void setFilterNotMaximized(bool filter); |
387 |
-+ |
388 |
- /** |
389 |
- * Whether tasks which should be omitted from 'task bars' should be |
390 |
- * filtered. Defaults to @c true. |
391 |
-@@ -285,6 +303,7 @@ Q_SIGNALS: |
392 |
- void filterByScreenChanged() const; |
393 |
- void filterByActivityChanged() const; |
394 |
- void filterNotMinimizedChanged() const; |
395 |
-+ void filterNotMaximizedChanged() const; |
396 |
- void filterSkipTaskbarChanged() const; |
397 |
- void filterSkipPagerChanged() const; |
398 |
- void demandingAttentionSkipsFiltersChanged() const; |
399 |
-diff --git a/libtaskmanager/tasksmodel.cpp b/libtaskmanager/tasksmodel.cpp |
400 |
-index c6e66926b..11eb53fdf 100644 |
401 |
---- a/libtaskmanager/tasksmodel.cpp |
402 |
-+++ b/libtaskmanager/tasksmodel.cpp |
403 |
-@@ -302,6 +302,7 @@ void TasksModel::Private::initModels() |
404 |
- QObject::connect(filterProxyModel, &TaskFilterProxyModel::filterByScreenChanged, q, &TasksModel::filterByScreenChanged); |
405 |
- QObject::connect(filterProxyModel, &TaskFilterProxyModel::filterByActivityChanged, q, &TasksModel::filterByActivityChanged); |
406 |
- QObject::connect(filterProxyModel, &TaskFilterProxyModel::filterNotMinimizedChanged, q, &TasksModel::filterNotMinimizedChanged); |
407 |
-+ QObject::connect(filterProxyModel, &TaskFilterProxyModel::filterNotMaximizedChanged, q, &TasksModel::filterNotMaximizedChanged); |
408 |
- |
409 |
- groupingProxyModel = new TaskGroupingProxyModel(q); |
410 |
- groupingProxyModel->setSourceModel(filterProxyModel); |
411 |
-@@ -1152,6 +1153,16 @@ void TasksModel::setFilterNotMinimized(bool filter) |
412 |
- d->filterProxyModel->setFilterNotMinimized(filter); |
413 |
- } |
414 |
- |
415 |
-+bool TasksModel::filterNotMaximized() const |
416 |
-+{ |
417 |
-+ return d->filterProxyModel->filterNotMaximized(); |
418 |
-+} |
419 |
-+ |
420 |
-+void TasksModel::setFilterNotMaximized(bool filter) |
421 |
-+{ |
422 |
-+ d->filterProxyModel->setFilterNotMaximized(filter); |
423 |
-+} |
424 |
-+ |
425 |
- TasksModel::SortMode TasksModel::sortMode() const |
426 |
- { |
427 |
- return d->sortMode; |
428 |
-diff --git a/libtaskmanager/tasksmodel.h b/libtaskmanager/tasksmodel.h |
429 |
-index 18e3d9bb4..8c84012d0 100644 |
430 |
---- a/libtaskmanager/tasksmodel.h |
431 |
-+++ b/libtaskmanager/tasksmodel.h |
432 |
-@@ -73,6 +73,7 @@ class TASKMANAGER_EXPORT TasksModel : public QSortFilterProxyModel, public Abstr |
433 |
- Q_PROPERTY(bool filterByScreen READ filterByScreen WRITE setFilterByScreen NOTIFY filterByScreenChanged) |
434 |
- Q_PROPERTY(bool filterByActivity READ filterByActivity WRITE setFilterByActivity NOTIFY filterByActivityChanged) |
435 |
- Q_PROPERTY(bool filterNotMinimized READ filterNotMinimized WRITE setFilterNotMinimized NOTIFY filterNotMinimizedChanged) |
436 |
-+ Q_PROPERTY(bool filterNotMaximized READ filterNotMaximized WRITE setFilterNotMaximized NOTIFY filterNotMaximized) |
437 |
- |
438 |
- Q_PROPERTY(SortMode sortMode READ sortMode WRITE setSortMode NOTIFY sortModeChanged) |
439 |
- Q_PROPERTY(bool separateLaunchers READ separateLaunchers WRITE setSeparateLaunchers NOTIFY separateLaunchersChanged) |
440 |
-@@ -295,6 +296,23 @@ public: |
441 |
- **/ |
442 |
- void setFilterNotMinimized(bool filter); |
443 |
- |
444 |
-+ /** |
445 |
-+ * Whether non-maximized tasks should be filtered. Defaults to |
446 |
-+ * @c false. |
447 |
-+ * |
448 |
-+ * @see setFilterNotMaximized |
449 |
-+ * @returns @c true if non-maximized tasks should be filtered. |
450 |
-+ **/ |
451 |
-+ bool filterNotMaximized() const; |
452 |
-+ |
453 |
-+ /** |
454 |
-+ * Set whether non-maximized tasks should be filtered. |
455 |
-+ * |
456 |
-+ * @see filterNotMaximized |
457 |
-+ * @param filter Whether non-maximized tasks should be filtered. |
458 |
-+ **/ |
459 |
-+ void setFilterNotMaximized(bool filter); |
460 |
-+ |
461 |
- /** |
462 |
- * The sort mode used in sorting tasks. Defaults to SortAlpha. |
463 |
- * |
464 |
-@@ -848,6 +866,7 @@ Q_SIGNALS: |
465 |
- void filterByScreenChanged() const; |
466 |
- void filterByActivityChanged() const; |
467 |
- void filterNotMinimizedChanged() const; |
468 |
-+ void filterNotMaximizedChanged() const; |
469 |
- void sortModeChanged() const; |
470 |
- void separateLaunchersChanged() const; |
471 |
- void launchInPlaceChanged() const; |
472 |
-diff --git a/shell/panelconfigview.cpp b/shell/panelconfigview.cpp |
473 |
-index a331c0bb2..5637f3233 100644 |
474 |
---- a/shell/panelconfigview.cpp |
475 |
-+++ b/shell/panelconfigview.cpp |
476 |
-@@ -289,6 +289,17 @@ PanelView::VisibilityMode PanelConfigView::visibilityMode() const |
477 |
- return m_panelView->visibilityMode(); |
478 |
- } |
479 |
- |
480 |
-+void PanelConfigView::setOpacityMode(PanelView::OpacityMode mode) |
481 |
-+{ |
482 |
-+ m_panelView->setOpacityMode(mode); |
483 |
-+ emit opacityModeChanged(); |
484 |
-+} |
485 |
-+ |
486 |
-+PanelView::OpacityMode PanelConfigView::opacityMode() const |
487 |
-+{ |
488 |
-+ return m_panelView->opacityMode(); |
489 |
-+} |
490 |
-+ |
491 |
- Plasma::FrameSvg::EnabledBorders PanelConfigView::enabledBorders() const |
492 |
- { |
493 |
- return m_enabledBorders; |
494 |
-diff --git a/shell/panelconfigview.h b/shell/panelconfigview.h |
495 |
-index 8e0abd314..db2af6bf9 100644 |
496 |
---- a/shell/panelconfigview.h |
497 |
-+++ b/shell/panelconfigview.h |
498 |
-@@ -51,6 +51,7 @@ class PanelConfigView : public PlasmaQuick::ConfigView |
499 |
- { |
500 |
- Q_OBJECT |
501 |
- Q_PROPERTY(PanelView::VisibilityMode visibilityMode READ visibilityMode WRITE setVisibilityMode NOTIFY visibilityModeChanged) |
502 |
-+ Q_PROPERTY(PanelView::OpacityMode opacityMode READ opacityMode WRITE setOpacityMode NOTIFY opacityModeChanged) |
503 |
- Q_PROPERTY(Plasma::FrameSvg::EnabledBorders enabledBorders READ enabledBorders NOTIFY enabledBordersChanged) |
504 |
- |
505 |
- public: |
506 |
-@@ -62,6 +63,9 @@ public: |
507 |
- PanelView::VisibilityMode visibilityMode() const; |
508 |
- void setVisibilityMode(PanelView::VisibilityMode mode); |
509 |
- |
510 |
-+ PanelView::OpacityMode opacityMode() const; |
511 |
-+ void setOpacityMode(PanelView::OpacityMode mode); |
512 |
-+ |
513 |
- Plasma::FrameSvg::EnabledBorders enabledBorders() const; |
514 |
- |
515 |
- protected: |
516 |
-@@ -84,6 +88,7 @@ private Q_SLOTS: |
517 |
- |
518 |
- Q_SIGNALS: |
519 |
- void visibilityModeChanged(); |
520 |
-+ void opacityModeChanged(); |
521 |
- void enabledBordersChanged(); |
522 |
- |
523 |
- private: |
524 |
-diff --git a/shell/panelview.cpp b/shell/panelview.cpp |
525 |
-index 4654a7a72..a699cc84c 100644 |
526 |
---- a/shell/panelview.cpp |
527 |
-+++ b/shell/panelview.cpp |
528 |
-@@ -64,6 +64,7 @@ PanelView::PanelView(ShellCorona *corona, QScreen *targetScreen, QWindow *parent |
529 |
- , m_alignment(Qt::AlignLeft) |
530 |
- , m_corona(corona) |
531 |
- , m_visibilityMode(NormalPanel) |
532 |
-+ , m_opacityMode(Adaptive) |
533 |
- , m_backgroundHints(Plasma::Types::StandardBackground) |
534 |
- , m_shellSurface(nullptr) |
535 |
- { |
536 |
-@@ -76,8 +77,10 @@ PanelView::PanelView(ShellCorona *corona, QScreen *targetScreen, QWindow *parent |
537 |
- setClearBeforeRendering(true); |
538 |
- setColor(QColor(Qt::transparent)); |
539 |
- setFlags(Qt::FramelessWindowHint | Qt::WindowDoesNotAcceptFocus); |
540 |
-+ updateAdaptiveOpacityEnabled(); |
541 |
- |
542 |
- connect(&m_theme, &Plasma::Theme::themeChanged, this, &PanelView::updateMask); |
543 |
-+ connect(&m_theme, &Plasma::Theme::themeChanged, this, &PanelView::updateAdaptiveOpacityEnabled); |
544 |
- connect(this, &PanelView::backgroundHintsChanged, this, &PanelView::updateMask); |
545 |
- connect(this, &PanelView::backgroundHintsChanged, this, &PanelView::updateEnabledBorders); |
546 |
- // TODO: add finished/componentComplete signal to QuickViewSharedEngine, |
547 |
-@@ -405,6 +408,37 @@ PanelView::VisibilityMode PanelView::visibilityMode() const |
548 |
- return m_visibilityMode; |
549 |
- } |
550 |
- |
551 |
-+PanelView::OpacityMode PanelView::opacityMode() const |
552 |
-+{ |
553 |
-+ if (!m_theme.adaptiveTransparencyEnabled()) { |
554 |
-+ return PanelView::Translucent; |
555 |
-+ } |
556 |
-+ return m_opacityMode; |
557 |
-+} |
558 |
-+ |
559 |
-+bool PanelView::adaptiveOpacityEnabled() |
560 |
-+{ |
561 |
-+ return m_theme.adaptiveTransparencyEnabled(); |
562 |
-+} |
563 |
-+ |
564 |
-+void PanelView::setOpacityMode(PanelView::OpacityMode mode) |
565 |
-+{ |
566 |
-+ if (m_opacityMode != mode) { |
567 |
-+ m_opacityMode = mode; |
568 |
-+ if (config().isValid() && config().parent().isValid()) { |
569 |
-+ config().parent().writeEntry("panelOpacity", (int)mode); |
570 |
-+ m_corona->requestApplicationConfigSync(); |
571 |
-+ } |
572 |
-+ emit opacityModeChanged(); |
573 |
-+ } |
574 |
-+} |
575 |
-+ |
576 |
-+void PanelView::updateAdaptiveOpacityEnabled() |
577 |
-+{ |
578 |
-+ emit opacityModeChanged(); |
579 |
-+ emit adaptiveOpacityEnabledChanged(); |
580 |
-+} |
581 |
-+ |
582 |
- void PanelView::positionPanel() |
583 |
- { |
584 |
- if (!containment()) { |
585 |
-@@ -599,6 +633,7 @@ void PanelView::restore() |
586 |
- // the place for this config key is changed in Plasma 5.9 |
587 |
- // Do NOT use readConfigValueWithFallBack |
588 |
- setVisibilityMode((VisibilityMode)panelConfig.parent().readEntry<int>("panelVisibility", panelConfig.readEntry<int>("panelVisibility", (int)NormalPanel))); |
589 |
-+ setOpacityMode((OpacityMode)readConfigValueWithFallBack("panelOpacity", PanelView::OpacityMode::Adaptive)); |
590 |
- m_initCompleted = true; |
591 |
- resizePanel(); |
592 |
- positionPanel(); |
593 |
-diff --git a/shell/panelview.h b/shell/panelview.h |
594 |
-index 60e4d446e..c312d4907 100644 |
595 |
---- a/shell/panelview.h |
596 |
-+++ b/shell/panelview.h |
597 |
-@@ -100,6 +100,18 @@ class PanelView : public PlasmaQuick::ContainmentView |
598 |
- */ |
599 |
- Q_PROPERTY(VisibilityMode visibilityMode READ visibilityMode WRITE setVisibilityMode NOTIFY visibilityModeChanged) |
600 |
- |
601 |
-+ /** |
602 |
-+ * Property that determines how a panel's opacity behaves. |
603 |
-+ * |
604 |
-+ * @see OpacityMode |
605 |
-+ */ |
606 |
-+ Q_PROPERTY(OpacityMode opacityMode READ opacityMode WRITE setOpacityMode NOTIFY opacityModeChanged) |
607 |
-+ |
608 |
-+ /** |
609 |
-+ /* Property that determines whether adaptive opacity is used. |
610 |
-+ */ |
611 |
-+ Q_PROPERTY(bool adaptiveOpacityEnabled READ adaptiveOpacityEnabled NOTIFY adaptiveOpacityEnabledChanged) |
612 |
-+ |
613 |
- public: |
614 |
- enum VisibilityMode { |
615 |
- NormalPanel = 0, /** default, always visible panel, the windowmanager reserves a places for it */ |
616 |
-@@ -109,6 +121,14 @@ public: |
617 |
- }; |
618 |
- Q_ENUM(VisibilityMode) |
619 |
- |
620 |
-+ /** Enumeration of possible opacity modes. */ |
621 |
-+ enum OpacityMode { |
622 |
-+ Adaptive = 0, /** The panel will change opacity depending on the presence of a maximized window */ |
623 |
-+ Opaque, /** The panel will always be opaque */ |
624 |
-+ Translucent /** The panel will always be translucent */ |
625 |
-+ }; |
626 |
-+ Q_ENUM(OpacityMode) |
627 |
-+ |
628 |
- explicit PanelView(ShellCorona *corona, QScreen *targetScreen = nullptr, QWindow *parent = nullptr); |
629 |
- ~PanelView() override; |
630 |
- |
631 |
-@@ -147,6 +167,11 @@ public: |
632 |
- VisibilityMode visibilityMode() const; |
633 |
- void setVisibilityMode(PanelView::VisibilityMode mode); |
634 |
- |
635 |
-+ PanelView::OpacityMode opacityMode() const; |
636 |
-+ bool adaptiveOpacityEnabled(); |
637 |
-+ void setOpacityMode(PanelView::OpacityMode mode); |
638 |
-+ void updateAdaptiveOpacityEnabled(); |
639 |
-+ |
640 |
- /** |
641 |
- * @returns the geometry of the panel given a distance |
642 |
- */ |
643 |
-@@ -185,6 +210,8 @@ Q_SIGNALS: |
644 |
- // QWindow does not have a property for screen. Adding this property requires re-implementing the signal |
645 |
- void screenToFollowChanged(QScreen *screen); |
646 |
- void visibilityModeChanged(); |
647 |
-+ void opacityModeChanged(); |
648 |
-+ void adaptiveOpacityEnabledChanged(); |
649 |
- |
650 |
- protected Q_SLOTS: |
651 |
- /** |
652 |
-@@ -235,6 +262,7 @@ private: |
653 |
- ShellCorona *m_corona; |
654 |
- QTimer m_strutsTimer; |
655 |
- VisibilityMode m_visibilityMode; |
656 |
-+ OpacityMode m_opacityMode; |
657 |
- Plasma::Theme m_theme; |
658 |
- QTimer m_positionPaneltimer; |
659 |
- QTimer m_unhideTimer; |
660 |
--- |
661 |
-GitLab |
662 |
- |
663 |
|
664 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild |
665 |
deleted file mode 100644 |
666 |
index 22adfc762f4..00000000000 |
667 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild |
668 |
+++ /dev/null |
669 |
@@ -1,214 +0,0 @@ |
670 |
-# Copyright 1999-2021 Gentoo Authors |
671 |
-# Distributed under the terms of the GNU General Public License v2 |
672 |
- |
673 |
-EAPI=7 |
674 |
- |
675 |
-ECM_HANDBOOK="forceoptional" |
676 |
-ECM_TEST="forceoptional" |
677 |
-KFMIN=5.82.0 |
678 |
-PVCUT=$(ver_cut 1-3) |
679 |
-QTMIN=5.15.2 |
680 |
-VIRTUALX_REQUIRED="test" |
681 |
-inherit ecm kde.org |
682 |
- |
683 |
-DESCRIPTION="KDE Plasma workspace" |
684 |
- |
685 |
-LICENSE="GPL-2" # TODO: CHECK |
686 |
-SLOT="5" |
687 |
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" |
688 |
-IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast |
689 |
-+semantic-desktop systemd telemetry" |
690 |
- |
691 |
-REQUIRED_USE="gps? ( geolocation )" |
692 |
-RESTRICT+=" test" |
693 |
- |
694 |
-COMMON_DEPEND=" |
695 |
- >=dev-libs/wayland-1.15 |
696 |
- >=dev-qt/qtdbus-${QTMIN}:5 |
697 |
- >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] |
698 |
- >=dev-qt/qtgui-${QTMIN}:5=[jpeg] |
699 |
- >=dev-qt/qtnetwork-${QTMIN}:5 |
700 |
- >=dev-qt/qtsql-${QTMIN}:5 |
701 |
- >=dev-qt/qtsvg-${QTMIN}:5 |
702 |
- >=dev-qt/qtwayland-${QTMIN}:5 |
703 |
- >=dev-qt/qtwidgets-${QTMIN}:5 |
704 |
- >=dev-qt/qtx11extras-${QTMIN}:5 |
705 |
- >=dev-qt/qtxml-${QTMIN}:5 |
706 |
- >=kde-frameworks/kactivities-${KFMIN}:5 |
707 |
- >=kde-frameworks/kactivities-stats-${KFMIN}:5 |
708 |
- >=kde-frameworks/kauth-${KFMIN}:5 |
709 |
- >=kde-frameworks/kbookmarks-${KFMIN}:5 |
710 |
- >=kde-frameworks/kcompletion-${KFMIN}:5 |
711 |
- >=kde-frameworks/kconfig-${KFMIN}:5 |
712 |
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
713 |
- >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
714 |
- >=kde-frameworks/kcrash-${KFMIN}:5 |
715 |
- >=kde-frameworks/kdbusaddons-${KFMIN}:5 |
716 |
- >=kde-frameworks/kdeclarative-${KFMIN}:5 |
717 |
- >=kde-frameworks/kded-${KFMIN}:5 |
718 |
- >=kde-frameworks/kdelibs4support-${KFMIN}:5 |
719 |
- >=kde-frameworks/kglobalaccel-${KFMIN}:5 |
720 |
- >=kde-frameworks/kguiaddons-${KFMIN}:5 |
721 |
- >=kde-frameworks/ki18n-${KFMIN}:5 |
722 |
- >=kde-frameworks/kiconthemes-${KFMIN}:5 |
723 |
- >=kde-frameworks/kidletime-${KFMIN}:5 |
724 |
- >=kde-frameworks/kio-${KFMIN}:5 |
725 |
- >=kde-frameworks/kitemmodels-${KFMIN}:5 |
726 |
- >=kde-frameworks/kitemviews-${KFMIN}:5 |
727 |
- >=kde-frameworks/kjobwidgets-${KFMIN}:5 |
728 |
- >=kde-frameworks/knewstuff-${KFMIN}:5 |
729 |
- >=kde-frameworks/knotifications-${KFMIN}:5 |
730 |
- >=kde-frameworks/knotifyconfig-${KFMIN}:5 |
731 |
- >=kde-frameworks/kpackage-${KFMIN}:5 |
732 |
- >=kde-frameworks/kpeople-${KFMIN}:5 |
733 |
- >=kde-frameworks/krunner-${KFMIN}:5 |
734 |
- >=kde-frameworks/kservice-${KFMIN}:5 |
735 |
- >=kde-frameworks/ktexteditor-${KFMIN}:5 |
736 |
- >=kde-frameworks/ktextwidgets-${KFMIN}:5 |
737 |
- >=kde-frameworks/kwallet-${KFMIN}:5 |
738 |
- >=kde-frameworks/kwayland-${KFMIN}:5 |
739 |
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
740 |
- >=kde-frameworks/kwindowsystem-${KFMIN}:5 |
741 |
- >=kde-frameworks/kxmlgui-${KFMIN}:5 |
742 |
- >=kde-frameworks/plasma-${KFMIN}:5 |
743 |
- >=kde-frameworks/prison-${KFMIN}:5[qml] |
744 |
- >=kde-frameworks/solid-${KFMIN}:5 |
745 |
- >=kde-plasma/breeze-${PVCUT}:5 |
746 |
- >=kde-plasma/kscreenlocker-${PVCUT}:5 |
747 |
- >=kde-plasma/kwin-${PVCUT}:5 |
748 |
- >=kde-plasma/libkscreen-${PVCUT}:5 |
749 |
- >=kde-plasma/libksysguard-${PVCUT}:5 |
750 |
- >=kde-plasma/libkworkspace-${PVCUT}:5 |
751 |
- >=media-libs/phonon-4.11.0 |
752 |
- sys-libs/zlib |
753 |
- x11-libs/libICE |
754 |
- x11-libs/libSM |
755 |
- x11-libs/libX11 |
756 |
- x11-libs/libXau |
757 |
- x11-libs/libxcb |
758 |
- x11-libs/libXcursor |
759 |
- x11-libs/libXfixes |
760 |
- x11-libs/libXrender |
761 |
- x11-libs/libXtst |
762 |
- x11-libs/xcb-util |
763 |
- x11-libs/xcb-util-image |
764 |
- appstream? ( dev-libs/appstream[qt5] ) |
765 |
- calculator? ( sci-libs/libqalculate:= ) |
766 |
- calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) |
767 |
- fontconfig? ( |
768 |
- media-libs/fontconfig |
769 |
- media-libs/freetype |
770 |
- x11-libs/libXft |
771 |
- x11-libs/xcb-util-image |
772 |
- ) |
773 |
- geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) |
774 |
- gps? ( sci-geosciences/gpsd ) |
775 |
- screencast? ( |
776 |
- >=media-video/pipewire-0.3:= |
777 |
- x11-libs/libdrm |
778 |
- ) |
779 |
- semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) |
780 |
- telemetry? ( dev-libs/kuserfeedback:5 ) |
781 |
-" |
782 |
-DEPEND="${COMMON_DEPEND} |
783 |
- >=dev-libs/plasma-wayland-protocols-1.1.1 |
784 |
- >=dev-qt/qtconcurrent-${QTMIN}:5 |
785 |
- x11-base/xorg-proto |
786 |
- fontconfig? ( x11-libs/libXrender ) |
787 |
-" |
788 |
-RDEPEND="${COMMON_DEPEND} |
789 |
- app-text/iso-codes |
790 |
- >=dev-qt/qdbus-${QTMIN}:5 |
791 |
- >=dev-qt/qtgraphicaleffects-${QTMIN}:5 |
792 |
- >=dev-qt/qtpaths-${QTMIN}:5 |
793 |
- >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets] |
794 |
- >=dev-qt/qtquickcontrols2-${QTMIN}:5 |
795 |
- >=kde-apps/kio-extras-19.04.3:5 |
796 |
- >=kde-frameworks/kdesu-${KFMIN}:5 |
797 |
- >=kde-frameworks/kirigami-${KFMIN}:5 |
798 |
- >=kde-frameworks/kquickcharts-${KFMIN}:5 |
799 |
- >=kde-plasma/ksysguard-${PVCUT}:5 |
800 |
- >=kde-plasma/milou-${PVCUT}:5 |
801 |
- >=kde-plasma/plasma-integration-${PVCUT}:5 |
802 |
- x11-apps/xmessage |
803 |
- x11-apps/xprop |
804 |
- x11-apps/xrdb |
805 |
- x11-apps/xsetroot |
806 |
- systemd? ( sys-apps/dbus[user-session] ) |
807 |
- !systemd? ( sys-apps/dbus ) |
808 |
- !<kde-plasma/plasma-desktop-5.19.80:5 |
809 |
-" |
810 |
-BDEPEND="virtual/pkgconfig" |
811 |
-PDEPEND=" |
812 |
- >=kde-plasma/kde-cli-tools-${PVCUT}:5 |
813 |
-" |
814 |
- |
815 |
-PATCHES=( |
816 |
- "${FILESDIR}/${P}-split-libkworkspace.patch" # downstream patch |
817 |
- "${FILESDIR}/${P}-revert-activate-krunner.patch" # bug 767478 |
818 |
- "${FILESDIR}/${P}-transparency.patch" # KDE-bug 434202 |
819 |
- "${FILESDIR}/${P}-transparency-panelConfig.patch" # KDE-bug 434285 |
820 |
- "${FILESDIR}/${P}-dangerous-shortcuts.patch" # KDE-bug 435954 |
821 |
-) |
822 |
- |
823 |
-src_prepare() { |
824 |
- rm po/ta/kcm_autostart.po || die # spurious file |
825 |
- |
826 |
- ecm_src_prepare |
827 |
- |
828 |
- cmake_comment_add_subdirectory libkworkspace |
829 |
- # delete colliding libkworkspace translations |
830 |
- if [[ ${KDE_BUILD_TYPE} = release ]]; then |
831 |
- find po -type f -name "*po" -and -name "libkworkspace*" -delete || die |
832 |
- fi |
833 |
- |
834 |
- # TODO: try to get a build switch upstreamed |
835 |
- if ! use screencast; then |
836 |
- sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die |
837 |
- fi |
838 |
- |
839 |
- # KDE-bug: 433730 |
840 |
- use calculator || |
841 |
- cmake_run_in runners cmake_comment_add_subdirectory calculator |
842 |
- |
843 |
- cp "${FILESDIR}"/${P}-FindFontconfig.cmake cmake/FindFontconfig.cmake || die # bug 813041 |
844 |
-} |
845 |
- |
846 |
-src_configure() { |
847 |
- local mycmakeargs=( |
848 |
- -DBUILD_xembed-sni-proxy=OFF |
849 |
- $(cmake_use_find_package appstream AppStreamQt) |
850 |
- $(cmake_use_find_package calendar KF5Holidays) |
851 |
- $(cmake_use_find_package fontconfig Fontconfig) |
852 |
- $(cmake_use_find_package geolocation KF5NetworkManagerQt) |
853 |
- $(cmake_use_find_package semantic-desktop KF5Baloo) |
854 |
- $(cmake_use_find_package telemetry KUserFeedback) |
855 |
- ) |
856 |
- |
857 |
- use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) ) |
858 |
- |
859 |
- ecm_src_configure |
860 |
-} |
861 |
- |
862 |
-src_install() { |
863 |
- ecm_src_install |
864 |
- |
865 |
- # default startup and shutdown scripts |
866 |
- insinto /etc/xdg/plasma-workspace/env |
867 |
- doins "${FILESDIR}"/10-agent-startup.sh |
868 |
- |
869 |
- insinto /etc/xdg/plasma-workspace/shutdown |
870 |
- doins "${FILESDIR}"/10-agent-shutdown.sh |
871 |
- fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh |
872 |
-} |
873 |
- |
874 |
-pkg_postinst () { |
875 |
- ecm_pkg_postinst |
876 |
- |
877 |
- # Clean up pre-5.17.4 dirs |
878 |
- rmdir -v "${EROOT}"/etc/plasma{/startup,/shutdown,} 2> /dev/null |
879 |
- |
880 |
- elog "To enable gpg-agent and/or ssh-agent in Plasma sessions," |
881 |
- elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh" |
882 |
- elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh" |
883 |
-} |