Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/
Date: Wed, 19 Jul 2017 18:54:14
Message-Id: 1500490430.3ee9d86e27337f3581bf52cc693adbf77c25f517.asturm@gentoo
1 commit: 3ee9d86e27337f3581bf52cc693adbf77c25f517
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 19 18:49:47 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 19 18:53:50 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ee9d86e
7
8 kde-plasma/plasma-workspace: Drop obsolete patch
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.1
11
12 .../plasma-workspace-5.7.90-baloo-optional.patch | 41 ----------------------
13 1 file changed, 41 deletions(-)
14
15 diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.7.90-baloo-optional.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.7.90-baloo-optional.patch
16 deleted file mode 100644
17 index 34f7142dfdf..00000000000
18 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.7.90-baloo-optional.patch
19 +++ /dev/null
20 @@ -1,41 +0,0 @@
21 -commit 7ea5034dda3d7a497be8c8d1adea08897c165916
22 -Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
23 -Date: Thu Sep 15 00:22:38 2016 +0200
24 -
25 - Make KF5Baloo optional
26 -
27 - https://mail.kde.org/pipermail/kde-frameworks-devel/2016-September/037734.html
28 -
29 -diff --git a/CMakeLists.txt b/CMakeLists.txt
30 -index e57cb73..49584d9 100644
31 ---- a/CMakeLists.txt
32 -+++ b/CMakeLists.txt
33 -@@ -26,8 +26,13 @@ find_package(KF5XmlRpcClient REQUIRED)
34 - find_package(KF5 REQUIRED COMPONENTS PlasmaQuick)
35 - find_package(KF5 REQUIRED COMPONENTS SysGuard)
36 - find_package(KF5 REQUIRED COMPONENTS Package)
37 --# Baloo has a different version scheme than KF5 for now
38 --find_package(KF5 5.1 REQUIRED COMPONENTS Baloo)
39 -+
40 -+find_package(KF5Baloo)
41 -+set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching"
42 -+ TYPE OPTIONAL
43 -+ PURPOSE "Needed for the File Search runner."
44 -+ )
45 -+
46 - find_package(KF5TextEditor)
47 - find_package(KWinDBusInterface CONFIG REQUIRED)
48 -
49 -diff --git a/runners/CMakeLists.txt b/runners/CMakeLists.txt
50 -index 48cc379..d7656c8 100644
51 ---- a/runners/CMakeLists.txt
52 -+++ b/runners/CMakeLists.txt
53 -@@ -1,5 +1,7 @@
54 - add_subdirectory(activities)
55 --add_subdirectory(baloo)
56 -+if(KF5Baloo_FOUND)
57 -+ add_subdirectory(baloo)
58 -+endif()
59 - add_subdirectory(bookmarks)
60 - add_subdirectory(calculator)
61 - add_subdirectory(locations)