1 |
commit: 42269aed00323e50a4ea09a434b1f1cfddeab0c3 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 27 18:19:00 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 27 18:19:00 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=42269aed |
7 |
|
8 |
kde-plasma/plasma-workspace: Fix DEPENDs, fix cmake warning |
9 |
|
10 |
Upstream commits |
11 |
7df184afa19f148c1cd09ae9588645bb2b4556fc |
12 |
a2202472aa4d488da7562fe8b150c42dddc2d7f2 |
13 |
|
14 |
Reported-by: Michael Mair-Keimberger (iamnr3) <bu9zilla <AT> gmail.com> |
15 |
Gentoo-bug: 626040 |
16 |
|
17 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
18 |
|
19 |
.../files/plasma-workspace-5.10.4-unused-dep.patch | 19 +++++++++++++++++++ |
20 |
.../plasma-workspace-5.10.49.9999.ebuild | 16 +++++++++++----- |
21 |
.../plasma-workspace/plasma-workspace-9999.ebuild | 16 +++++++++++----- |
22 |
3 files changed, 41 insertions(+), 10 deletions(-) |
23 |
|
24 |
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-unused-dep.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-unused-dep.patch |
25 |
new file mode 100644 |
26 |
index 0000000000..fa0f385096 |
27 |
--- /dev/null |
28 |
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-unused-dep.patch |
29 |
@@ -0,0 +1,19 @@ |
30 |
+commit 5a7d251cfbed417a2617945a94427a93cdd2e82d |
31 |
+Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
32 |
+Date: Thu Jul 27 17:50:17 2017 +0200 |
33 |
+ |
34 |
+ Drop unused dependency |
35 |
+ |
36 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
37 |
+index ba61d1cc..ab5536ff 100644 |
38 |
+--- a/CMakeLists.txt |
39 |
++++ b/CMakeLists.txt |
40 |
+@@ -25,7 +25,7 @@ include(ECMQtDeclareLoggingCategory) |
41 |
+ include(KDEPackageAppTemplates) |
42 |
+ |
43 |
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS |
44 |
+- Plasma DocTools Runner JsEmbed NotifyConfig Su NewStuff Wallet KCMUtils |
45 |
++ Plasma DocTools Runner JsEmbed NotifyConfig Su NewStuff Wallet |
46 |
+ IdleTime Declarative TextWidgets KDELibs4Support Crash GlobalAccel |
47 |
+ DBusAddons Wayland) |
48 |
+ find_package(KF5NetworkManagerQt ${KF5_MIN_VERSION}) |
49 |
|
50 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.10.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.10.49.9999.ebuild |
51 |
index 239067e983..cbd22c5842 100644 |
52 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.10.49.9999.ebuild |
53 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.10.49.9999.ebuild |
54 |
@@ -12,11 +12,12 @@ DESCRIPTION="KDE Plasma workspace" |
55 |
KEYWORDS="" |
56 |
IUSE="+calendar geolocation gps prison qalculate +semantic-desktop" |
57 |
|
58 |
+REQUIRED_USE="gps? ( geolocation )" |
59 |
+ |
60 |
COMMON_DEPEND=" |
61 |
$(add_frameworks_dep kactivities) |
62 |
$(add_frameworks_dep kauth) |
63 |
$(add_frameworks_dep kbookmarks) |
64 |
- $(add_frameworks_dep kcmutils) |
65 |
$(add_frameworks_dep kcompletion) |
66 |
$(add_frameworks_dep kconfig) |
67 |
$(add_frameworks_dep kconfigwidgets) |
68 |
@@ -25,7 +26,6 @@ COMMON_DEPEND=" |
69 |
$(add_frameworks_dep kdbusaddons) |
70 |
$(add_frameworks_dep kdeclarative) |
71 |
$(add_frameworks_dep kdelibs4support) |
72 |
- $(add_frameworks_dep kdesu) |
73 |
$(add_frameworks_dep kglobalaccel) |
74 |
$(add_frameworks_dep kguiaddons) |
75 |
$(add_frameworks_dep ki18n) |
76 |
@@ -56,7 +56,6 @@ COMMON_DEPEND=" |
77 |
$(add_plasma_dep kscreenlocker) |
78 |
$(add_plasma_dep kwin) |
79 |
$(add_plasma_dep libksysguard) |
80 |
- $(add_qt_dep qtconcurrent) |
81 |
$(add_qt_dep qtdbus) |
82 |
$(add_qt_dep qtdeclarative 'widgets') |
83 |
$(add_qt_dep qtgui 'jpeg') |
84 |
@@ -75,6 +74,7 @@ COMMON_DEPEND=" |
85 |
x11-libs/libxcb |
86 |
x11-libs/libXfixes |
87 |
x11-libs/libXrender |
88 |
+ x11-libs/libXtst |
89 |
x11-libs/xcb-util |
90 |
x11-libs/xcb-util-image |
91 |
calendar? ( $(add_kdeapps_dep kholidays) ) |
92 |
@@ -86,6 +86,7 @@ COMMON_DEPEND=" |
93 |
" |
94 |
RDEPEND="${COMMON_DEPEND} |
95 |
$(add_frameworks_dep kded) |
96 |
+ $(add_frameworks_dep kdesu) |
97 |
$(add_kdeapps_dep kio-extras) |
98 |
$(add_plasma_dep kde-cli-tools) |
99 |
$(add_plasma_dep ksysguard) |
100 |
@@ -114,10 +115,14 @@ RDEPEND="${COMMON_DEPEND} |
101 |
!kde-plasma/plasma-workspace:4 |
102 |
" |
103 |
DEPEND="${COMMON_DEPEND} |
104 |
+ $(add_qt_dep qtconcurrent) |
105 |
x11-proto/xproto |
106 |
" |
107 |
|
108 |
-PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" ) |
109 |
+PATCHES=( |
110 |
+ "${FILESDIR}/${PN}-5.4-startkde-script.patch" |
111 |
+ "${FILESDIR}/${PN}-5.10.4-unused-dep.patch" |
112 |
+) |
113 |
|
114 |
RESTRICT+=" test" |
115 |
|
116 |
@@ -132,12 +137,13 @@ src_configure() { |
117 |
local mycmakeargs=( |
118 |
$(cmake-utils_use_find_package calendar KF5Holidays) |
119 |
$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt) |
120 |
- $(cmake-utils_use_find_package gps libgps) |
121 |
$(cmake-utils_use_find_package prison KF5Prison) |
122 |
$(cmake-utils_use_find_package qalculate Qalculate) |
123 |
$(cmake-utils_use_find_package semantic-desktop KF5Baloo) |
124 |
) |
125 |
|
126 |
+ use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) ) |
127 |
+ |
128 |
kde5_src_configure |
129 |
} |
130 |
|
131 |
|
132 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
133 |
index 239067e983..cbd22c5842 100644 |
134 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
135 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
136 |
@@ -12,11 +12,12 @@ DESCRIPTION="KDE Plasma workspace" |
137 |
KEYWORDS="" |
138 |
IUSE="+calendar geolocation gps prison qalculate +semantic-desktop" |
139 |
|
140 |
+REQUIRED_USE="gps? ( geolocation )" |
141 |
+ |
142 |
COMMON_DEPEND=" |
143 |
$(add_frameworks_dep kactivities) |
144 |
$(add_frameworks_dep kauth) |
145 |
$(add_frameworks_dep kbookmarks) |
146 |
- $(add_frameworks_dep kcmutils) |
147 |
$(add_frameworks_dep kcompletion) |
148 |
$(add_frameworks_dep kconfig) |
149 |
$(add_frameworks_dep kconfigwidgets) |
150 |
@@ -25,7 +26,6 @@ COMMON_DEPEND=" |
151 |
$(add_frameworks_dep kdbusaddons) |
152 |
$(add_frameworks_dep kdeclarative) |
153 |
$(add_frameworks_dep kdelibs4support) |
154 |
- $(add_frameworks_dep kdesu) |
155 |
$(add_frameworks_dep kglobalaccel) |
156 |
$(add_frameworks_dep kguiaddons) |
157 |
$(add_frameworks_dep ki18n) |
158 |
@@ -56,7 +56,6 @@ COMMON_DEPEND=" |
159 |
$(add_plasma_dep kscreenlocker) |
160 |
$(add_plasma_dep kwin) |
161 |
$(add_plasma_dep libksysguard) |
162 |
- $(add_qt_dep qtconcurrent) |
163 |
$(add_qt_dep qtdbus) |
164 |
$(add_qt_dep qtdeclarative 'widgets') |
165 |
$(add_qt_dep qtgui 'jpeg') |
166 |
@@ -75,6 +74,7 @@ COMMON_DEPEND=" |
167 |
x11-libs/libxcb |
168 |
x11-libs/libXfixes |
169 |
x11-libs/libXrender |
170 |
+ x11-libs/libXtst |
171 |
x11-libs/xcb-util |
172 |
x11-libs/xcb-util-image |
173 |
calendar? ( $(add_kdeapps_dep kholidays) ) |
174 |
@@ -86,6 +86,7 @@ COMMON_DEPEND=" |
175 |
" |
176 |
RDEPEND="${COMMON_DEPEND} |
177 |
$(add_frameworks_dep kded) |
178 |
+ $(add_frameworks_dep kdesu) |
179 |
$(add_kdeapps_dep kio-extras) |
180 |
$(add_plasma_dep kde-cli-tools) |
181 |
$(add_plasma_dep ksysguard) |
182 |
@@ -114,10 +115,14 @@ RDEPEND="${COMMON_DEPEND} |
183 |
!kde-plasma/plasma-workspace:4 |
184 |
" |
185 |
DEPEND="${COMMON_DEPEND} |
186 |
+ $(add_qt_dep qtconcurrent) |
187 |
x11-proto/xproto |
188 |
" |
189 |
|
190 |
-PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" ) |
191 |
+PATCHES=( |
192 |
+ "${FILESDIR}/${PN}-5.4-startkde-script.patch" |
193 |
+ "${FILESDIR}/${PN}-5.10.4-unused-dep.patch" |
194 |
+) |
195 |
|
196 |
RESTRICT+=" test" |
197 |
|
198 |
@@ -132,12 +137,13 @@ src_configure() { |
199 |
local mycmakeargs=( |
200 |
$(cmake-utils_use_find_package calendar KF5Holidays) |
201 |
$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt) |
202 |
- $(cmake-utils_use_find_package gps libgps) |
203 |
$(cmake-utils_use_find_package prison KF5Prison) |
204 |
$(cmake-utils_use_find_package qalculate Qalculate) |
205 |
$(cmake-utils_use_find_package semantic-desktop KF5Baloo) |
206 |
) |
207 |
|
208 |
+ use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) ) |
209 |
+ |
210 |
kde5_src_configure |
211 |
} |