| 1 |
commit: b916ce3bacc42ce97341912e678d919f45ffe9d4 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 21 11:33:39 2022 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 21 11:47:06 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b916ce3b |
| 7 |
|
| 8 |
kde-plasma/plasma-workspace: Rebase split-libkworkspace.patch |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/833532 |
| 11 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
...sma-workspace-5.24.80-split-libkworkspace.patch | 37 ++++++++++++++++++++++ |
| 15 |
.../plasma-workspace/plasma-workspace-9999.ebuild | 2 +- |
| 16 |
2 files changed, 38 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000000..e605473e35 |
| 21 |
--- /dev/null |
| 22 |
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch |
| 23 |
@@ -0,0 +1,37 @@ |
| 24 |
+From 19bbdcf391ea51c4798c770e87c7eada24f252b8 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Andreas Sturmlechner <asturm@g.o> |
| 26 |
+Date: Mon, 21 Feb 2022 12:24:56 +0100 |
| 27 |
+Subject: [PATCH] libkworkspace: Allow standalone build |
| 28 |
+ |
| 29 |
+Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
| 30 |
+--- |
| 31 |
+ CMakeLists.txt | 6 +++++- |
| 32 |
+ 1 file changed, 5 insertions(+), 1 deletion(-) |
| 33 |
+ |
| 34 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 35 |
+index 3ec5f0893..b022a20b3 100644 |
| 36 |
+--- a/CMakeLists.txt |
| 37 |
++++ b/CMakeLists.txt |
| 38 |
+@@ -78,6 +78,7 @@ set_package_properties(Qalculate PROPERTIES DESCRIPTION "Qalculate Library" |
| 39 |
+ ) |
| 40 |
+ |
| 41 |
+ find_package(KWinDBusInterface CONFIG REQUIRED) |
| 42 |
++find_package(LibKWorkspace 5.21.5) |
| 43 |
+ |
| 44 |
+ find_package(KF5Screen CONFIG REQUIRED) |
| 45 |
+ find_package(KScreenLocker 5.13.80 REQUIRED) |
| 46 |
+@@ -233,7 +234,10 @@ option(PLASMA_WAYLAND_DEFAULT_SESSION "Use Wayland session by default for Plasma |
| 47 |
+ if(KF5DocTools_FOUND) |
| 48 |
+ add_subdirectory(doc) |
| 49 |
+ endif() |
| 50 |
+-add_subdirectory(libkworkspace) |
| 51 |
++if(NOT LibKWorkspace_FOUND) |
| 52 |
++ message(STATUS "System LibKWorkspace not found, using bundled.") |
| 53 |
++ add_subdirectory(libkworkspace) |
| 54 |
++endif() |
| 55 |
+ add_subdirectory(libdbusmenuqt) |
| 56 |
+ add_subdirectory(appmenu) |
| 57 |
+ |
| 58 |
+-- |
| 59 |
+2.35.1 |
| 60 |
+ |
| 61 |
|
| 62 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
| 63 |
index 4d7868663b..3cf0eebb70 100644 |
| 64 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
| 65 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
| 66 |
@@ -150,7 +150,7 @@ BDEPEND="virtual/pkgconfig" |
| 67 |
PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5" |
| 68 |
|
| 69 |
PATCHES=( |
| 70 |
- "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream |
| 71 |
+ "${FILESDIR}/${PN}-5.24.80-split-libkworkspace.patch" # downstream |
| 72 |
"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478 |
| 73 |
) |
Archives