| 1 |
commit: 2e45a010d69af7cd6d7d686f60db7c1cedc1bb41 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 29 20:49:11 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 29 20:49:11 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2e45a010 |
| 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 |
...h => plasma-workspace-5.21.5-split-libkworkspace.patch} | 14 ++++++-------- |
| 14 |
.../plasma-workspace/plasma-workspace-5.21.90.ebuild | 2 +- |
| 15 |
.../plasma-workspace/plasma-workspace-5.22.49.9999.ebuild | 2 +- |
| 16 |
kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 2 +- |
| 17 |
4 files changed, 9 insertions(+), 11 deletions(-) |
| 18 |
|
| 19 |
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch |
| 20 |
similarity index 71% |
| 21 |
rename from kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch |
| 22 |
rename to kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch |
| 23 |
index f12d9f4daf..c96c0ba623 100644 |
| 24 |
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch |
| 25 |
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch |
| 26 |
@@ -8,19 +8,19 @@ Subject: [PATCH] libkworkspace: Allow standalone build |
| 27 |
1 file changed, 5 insertions(+), 1 deletions(-) |
| 28 |
|
| 29 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 30 |
-index e587a386..d1a63527 100644 |
| 31 |
+index 67f82cfb7..88a8c09b4 100644 |
| 32 |
--- a/CMakeLists.txt |
| 33 |
+++ b/CMakeLists.txt |
| 34 |
-@@ -46,6 +46,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching" |
| 35 |
+@@ -73,6 +73,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching" |
| 36 |
|
| 37 |
find_package(KF5TextEditor) |
| 38 |
find_package(KWinDBusInterface CONFIG REQUIRED) |
| 39 |
-+find_package(LibKWorkspace 5.14.1) |
| 40 |
++find_package(LibKWorkspace 5.21.5) |
| 41 |
|
| 42 |
+ find_package(KF5Screen CONFIG REQUIRED) |
| 43 |
find_package(KScreenLocker 5.13.80 REQUIRED) |
| 44 |
- find_package(ScreenSaverDBusInterface CONFIG REQUIRED) |
| 45 |
-@@ -135,7 +136,10 @@ endif() |
| 46 |
- add_definitions(-DQT_NO_URL_CAST_FROM_STRING) |
| 47 |
+@@ -214,7 +215,10 @@ query_qmake(QtBinariesDir QT_INSTALL_BINS) |
| 48 |
+ option(PLASMA_WAYLAND_DEFAULT_SESSION "Use Wayland session by default for Plasma" FALSE) |
| 49 |
|
| 50 |
add_subdirectory(doc) |
| 51 |
-add_subdirectory(libkworkspace) |
| 52 |
@@ -31,5 +31,3 @@ index e587a386..d1a63527 100644 |
| 53 |
add_subdirectory(libdbusmenuqt) |
| 54 |
add_subdirectory(appmenu) |
| 55 |
|
| 56 |
--- |
| 57 |
-2.19.1 |
| 58 |
|
| 59 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.21.90.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.21.90.ebuild |
| 60 |
index 56a8a45e5f..f3b2afd529 100644 |
| 61 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.21.90.ebuild |
| 62 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.21.90.ebuild |
| 63 |
@@ -148,7 +148,7 @@ PDEPEND=" |
| 64 |
>=kde-plasma/kde-cli-tools-${PVCUT}:5 |
| 65 |
" |
| 66 |
|
| 67 |
-PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" ) |
| 68 |
+PATCHES=( "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" ) # downstream |
| 69 |
|
| 70 |
src_prepare() { |
| 71 |
ecm_src_prepare |
| 72 |
|
| 73 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.22.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.22.49.9999.ebuild |
| 74 |
index 8f18aa1c0b..470072dbc5 100644 |
| 75 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.22.49.9999.ebuild |
| 76 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.22.49.9999.ebuild |
| 77 |
@@ -148,7 +148,7 @@ PDEPEND=" |
| 78 |
>=kde-plasma/kde-cli-tools-${PVCUT}:5 |
| 79 |
" |
| 80 |
|
| 81 |
-PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" ) |
| 82 |
+PATCHES=( "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" ) # downstream |
| 83 |
|
| 84 |
src_prepare() { |
| 85 |
ecm_src_prepare |
| 86 |
|
| 87 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
| 88 |
index 7114aa97f8..d7e27260c8 100644 |
| 89 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
| 90 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
| 91 |
@@ -148,7 +148,7 @@ PDEPEND=" |
| 92 |
>=kde-plasma/kde-cli-tools-${PVCUT}:5 |
| 93 |
" |
| 94 |
|
| 95 |
-PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" ) |
| 96 |
+PATCHES=( "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" ) # downstream |
| 97 |
|
| 98 |
src_prepare() { |
| 99 |
ecm_src_prepare |
Archives