Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/
Date: Wed, 07 Sep 2022 18:13:24
Message-Id: 1662574361.82dbfd4d0bb9cdc10d0ab29096628e4f1a9ea26a.asturm@gentoo
1 commit: 82dbfd4d0bb9cdc10d0ab29096628e4f1a9ea26a
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 6 19:29:28 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 7 18:12:41 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=82dbfd4d
7
8 kde-plasma/plasma-workspace: Drop unused patch
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 ...asma-workspace-5.21.5-split-libkworkspace.patch | 33 ----------------------
13 1 file changed, 33 deletions(-)
14
15 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
16 deleted file mode 100644
17 index c96c0ba623..0000000000
18 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch
19 +++ /dev/null
20 @@ -1,33 +0,0 @@
21 -From 4717089b68c386446be240f463f2f13e7024468b Mon Sep 17 00:00:00 2001
22 -From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
23 -Date: Mon, 22 Oct 2018 10:35:10 +0200
24 -Subject: [PATCH] libkworkspace: Allow standalone build
25 -
26 ----
27 - CMakeLists.txt | 6 +++-
28 - 1 file changed, 5 insertions(+), 1 deletions(-)
29 -
30 -diff --git a/CMakeLists.txt b/CMakeLists.txt
31 -index 67f82cfb7..88a8c09b4 100644
32 ---- a/CMakeLists.txt
33 -+++ b/CMakeLists.txt
34 -@@ -73,6 +73,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching"
35 -
36 - find_package(KF5TextEditor)
37 - find_package(KWinDBusInterface CONFIG REQUIRED)
38 -+find_package(LibKWorkspace 5.21.5)
39 -
40 - find_package(KF5Screen CONFIG REQUIRED)
41 - find_package(KScreenLocker 5.13.80 REQUIRED)
42 -@@ -214,7 +215,10 @@ query_qmake(QtBinariesDir QT_INSTALL_BINS)
43 - option(PLASMA_WAYLAND_DEFAULT_SESSION "Use Wayland session by default for Plasma" FALSE)
44 -
45 - add_subdirectory(doc)
46 --add_subdirectory(libkworkspace)
47 -+if(NOT LibKWorkspace_FOUND)
48 -+ message(STATUS "System LibKWorkspace not found, using bundled.")
49 -+ add_subdirectory(libkworkspace)
50 -+endif()
51 - add_subdirectory(libdbusmenuqt)
52 - add_subdirectory(appmenu)
53 -