| 1 |
commit: 1a411a00178fe8cc700103aa860003d099acc14c |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 29 20:49:39 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 29 21:16:21 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a411a00 |
| 7 |
|
| 8 |
kde-plasma/plasma-workspace: Rebase split-libkworkspace.patch |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.19, Repoman-3.0.3 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
...asma-workspace-5.21.5-split-libkworkspace.patch | 33 ++++++++++++++++++++++ |
| 14 |
.../plasma-workspace-5.21.5.ebuild | 2 +- |
| 15 |
2 files changed, 34 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..c96c0ba623d |
| 20 |
--- /dev/null |
| 21 |
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch |
| 22 |
@@ -0,0 +1,33 @@ |
| 23 |
+From 4717089b68c386446be240f463f2f13e7024468b Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
| 25 |
+Date: Mon, 22 Oct 2018 10:35:10 +0200 |
| 26 |
+Subject: [PATCH] libkworkspace: Allow standalone build |
| 27 |
+ |
| 28 |
+--- |
| 29 |
+ CMakeLists.txt | 6 +++- |
| 30 |
+ 1 file changed, 5 insertions(+), 1 deletions(-) |
| 31 |
+ |
| 32 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 33 |
+index 67f82cfb7..88a8c09b4 100644 |
| 34 |
+--- a/CMakeLists.txt |
| 35 |
++++ b/CMakeLists.txt |
| 36 |
+@@ -73,6 +73,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching" |
| 37 |
+ |
| 38 |
+ find_package(KF5TextEditor) |
| 39 |
+ find_package(KWinDBusInterface CONFIG REQUIRED) |
| 40 |
++find_package(LibKWorkspace 5.21.5) |
| 41 |
+ |
| 42 |
+ find_package(KF5Screen CONFIG REQUIRED) |
| 43 |
+ find_package(KScreenLocker 5.13.80 REQUIRED) |
| 44 |
+@@ -214,7 +215,10 @@ query_qmake(QtBinariesDir QT_INSTALL_BINS) |
| 45 |
+ option(PLASMA_WAYLAND_DEFAULT_SESSION "Use Wayland session by default for Plasma" FALSE) |
| 46 |
+ |
| 47 |
+ add_subdirectory(doc) |
| 48 |
+-add_subdirectory(libkworkspace) |
| 49 |
++if(NOT LibKWorkspace_FOUND) |
| 50 |
++ message(STATUS "System LibKWorkspace not found, using bundled.") |
| 51 |
++ add_subdirectory(libkworkspace) |
| 52 |
++endif() |
| 53 |
+ add_subdirectory(libdbusmenuqt) |
| 54 |
+ add_subdirectory(appmenu) |
| 55 |
+ |
| 56 |
|
| 57 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild |
| 58 |
index 35b280c763a..6e92371027f 100644 |
| 59 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild |
| 60 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild |
| 61 |
@@ -144,7 +144,7 @@ PDEPEND=" |
| 62 |
" |
| 63 |
|
| 64 |
PATCHES=( |
| 65 |
- "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" |
| 66 |
+ "${FILESDIR}/${P}-split-libkworkspace.patch" # downstream patch |
| 67 |
"${FILESDIR}/${P}-revert-activate-krunner.patch" # bug 767478 |
| 68 |
"${FILESDIR}/${P}-transparency.patch" # KDE-bug 434202 |
| 69 |
"${FILESDIR}/${P}-transparency-panelConfig.patch" # KDE-bug 434285 |
Archives