Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
Date: Sat, 08 Oct 2016 15:52:05
Message-Id: 1475941909.7c8a67d234b1226a90c295d1ef5c7b0cc31c1684.kensington@gentoo
1 commit: 7c8a67d234b1226a90c295d1ef5c7b0cc31c1684
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Wed Sep 14 22:34:21 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 8 15:51:49 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7c8a67d2
7
8 kde-plasma/plasma-workspace: Make kde-frameworks/baloo optional
9
10 'baloo is the most dysfunctional part of whole kde frameworks'
11
12 Package-Manager: portage-2.3.0
13
14 .../plasma-workspace-5.7.90-baloo-optional.patch | 41 ++++++++++++++++++++++
15 .../plasma-workspace-5.8.49.9999.ebuild | 10 ++++--
16 .../plasma-workspace/plasma-workspace-9999.ebuild | 10 ++++--
17 3 files changed, 55 insertions(+), 6 deletions(-)
18
19 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
20 new file mode 100644
21 index 0000000..34f7142
22 --- /dev/null
23 +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.7.90-baloo-optional.patch
24 @@ -0,0 +1,41 @@
25 +commit 7ea5034dda3d7a497be8c8d1adea08897c165916
26 +Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
27 +Date: Thu Sep 15 00:22:38 2016 +0200
28 +
29 + Make KF5Baloo optional
30 +
31 + https://mail.kde.org/pipermail/kde-frameworks-devel/2016-September/037734.html
32 +
33 +diff --git a/CMakeLists.txt b/CMakeLists.txt
34 +index e57cb73..49584d9 100644
35 +--- a/CMakeLists.txt
36 ++++ b/CMakeLists.txt
37 +@@ -26,8 +26,13 @@ find_package(KF5XmlRpcClient REQUIRED)
38 + find_package(KF5 REQUIRED COMPONENTS PlasmaQuick)
39 + find_package(KF5 REQUIRED COMPONENTS SysGuard)
40 + find_package(KF5 REQUIRED COMPONENTS Package)
41 +-# Baloo has a different version scheme than KF5 for now
42 +-find_package(KF5 5.1 REQUIRED COMPONENTS Baloo)
43 ++
44 ++find_package(KF5Baloo)
45 ++set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching"
46 ++ TYPE OPTIONAL
47 ++ PURPOSE "Needed for the File Search runner."
48 ++ )
49 ++
50 + find_package(KF5TextEditor)
51 + find_package(KWinDBusInterface CONFIG REQUIRED)
52 +
53 +diff --git a/runners/CMakeLists.txt b/runners/CMakeLists.txt
54 +index 48cc379..d7656c8 100644
55 +--- a/runners/CMakeLists.txt
56 ++++ b/runners/CMakeLists.txt
57 +@@ -1,5 +1,7 @@
58 + add_subdirectory(activities)
59 +-add_subdirectory(baloo)
60 ++if(KF5Baloo_FOUND)
61 ++ add_subdirectory(baloo)
62 ++endif()
63 + add_subdirectory(bookmarks)
64 + add_subdirectory(calculator)
65 + add_subdirectory(locations)
66
67 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.49.9999.ebuild
68 index 7f856fa..b7ad9ce 100644
69 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.49.9999.ebuild
70 +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.49.9999.ebuild
71 @@ -11,11 +11,10 @@ inherit kde5 multilib qmake-utils
72
73 DESCRIPTION="KDE Plasma workspace"
74 KEYWORDS=""
75 -IUSE="+calendar geolocation gps prison qalculate"
76 +IUSE="+calendar geolocation gps prison qalculate +semantic-desktop"
77
78 # drop kde-frameworks/plasma subslot operator when FRAMEWORKS_MINIMAL >= 5.24.0
79 COMMON_DEPEND="
80 - $(add_frameworks_dep baloo)
81 $(add_frameworks_dep kactivities)
82 $(add_frameworks_dep kauth)
83 $(add_frameworks_dep kbookmarks)
84 @@ -86,6 +85,7 @@ COMMON_DEPEND="
85 gps? ( sci-geosciences/gpsd )
86 prison? ( media-libs/prison:5 )
87 qalculate? ( sci-libs/libqalculate )
88 + semantic-desktop? ( $(add_frameworks_dep baloo) )
89 "
90 RDEPEND="${COMMON_DEPEND}
91 $(add_frameworks_dep kded)
92 @@ -120,7 +120,10 @@ DEPEND="${COMMON_DEPEND}
93 x11-proto/xproto
94 "
95
96 -PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" )
97 +PATCHES=(
98 + "${FILESDIR}/${PN}-5.4-startkde-script.patch"
99 + "${FILESDIR}/${PN}-5.7.90-baloo-optional.patch"
100 +)
101
102 RESTRICT+=" test"
103
104 @@ -138,6 +141,7 @@ src_configure() {
105 $(cmake-utils_use_find_package gps libgps)
106 $(cmake-utils_use_find_package prison KF5Prison)
107 $(cmake-utils_use_find_package qalculate Qalculate)
108 + $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
109 )
110
111 kde5_src_configure
112
113 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
114 index 7f856fa..b7ad9ce 100644
115 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
116 +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
117 @@ -11,11 +11,10 @@ inherit kde5 multilib qmake-utils
118
119 DESCRIPTION="KDE Plasma workspace"
120 KEYWORDS=""
121 -IUSE="+calendar geolocation gps prison qalculate"
122 +IUSE="+calendar geolocation gps prison qalculate +semantic-desktop"
123
124 # drop kde-frameworks/plasma subslot operator when FRAMEWORKS_MINIMAL >= 5.24.0
125 COMMON_DEPEND="
126 - $(add_frameworks_dep baloo)
127 $(add_frameworks_dep kactivities)
128 $(add_frameworks_dep kauth)
129 $(add_frameworks_dep kbookmarks)
130 @@ -86,6 +85,7 @@ COMMON_DEPEND="
131 gps? ( sci-geosciences/gpsd )
132 prison? ( media-libs/prison:5 )
133 qalculate? ( sci-libs/libqalculate )
134 + semantic-desktop? ( $(add_frameworks_dep baloo) )
135 "
136 RDEPEND="${COMMON_DEPEND}
137 $(add_frameworks_dep kded)
138 @@ -120,7 +120,10 @@ DEPEND="${COMMON_DEPEND}
139 x11-proto/xproto
140 "
141
142 -PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" )
143 +PATCHES=(
144 + "${FILESDIR}/${PN}-5.4-startkde-script.patch"
145 + "${FILESDIR}/${PN}-5.7.90-baloo-optional.patch"
146 +)
147
148 RESTRICT+=" test"
149
150 @@ -138,6 +141,7 @@ src_configure() {
151 $(cmake-utils_use_find_package gps libgps)
152 $(cmake-utils_use_find_package prison KF5Prison)
153 $(cmake-utils_use_find_package qalculate Qalculate)
154 + $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
155 )
156
157 kde5_src_configure
Report Message
Find on MARC Find on Google Groups