1 |
commit: 479b6c9e6c960ed177190ad107c8b4aab98e6c48 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 27 16:10:41 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 27 16:24:33 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=479b6c9e |
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.4-r1.ebuild | 169 +++++++++++++++++++++ |
21 |
2 files changed, 188 insertions(+) |
22 |
|
23 |
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 |
24 |
new file mode 100644 |
25 |
index 00000000000..fa0f3850965 |
26 |
--- /dev/null |
27 |
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-unused-dep.patch |
28 |
@@ -0,0 +1,19 @@ |
29 |
+commit 5a7d251cfbed417a2617945a94427a93cdd2e82d |
30 |
+Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
31 |
+Date: Thu Jul 27 17:50:17 2017 +0200 |
32 |
+ |
33 |
+ Drop unused dependency |
34 |
+ |
35 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
36 |
+index ba61d1cc..ab5536ff 100644 |
37 |
+--- a/CMakeLists.txt |
38 |
++++ b/CMakeLists.txt |
39 |
+@@ -25,7 +25,7 @@ include(ECMQtDeclareLoggingCategory) |
40 |
+ include(KDEPackageAppTemplates) |
41 |
+ |
42 |
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS |
43 |
+- Plasma DocTools Runner JsEmbed NotifyConfig Su NewStuff Wallet KCMUtils |
44 |
++ Plasma DocTools Runner JsEmbed NotifyConfig Su NewStuff Wallet |
45 |
+ IdleTime Declarative TextWidgets KDELibs4Support Crash GlobalAccel |
46 |
+ DBusAddons Wayland) |
47 |
+ find_package(KF5NetworkManagerQt ${KF5_MIN_VERSION}) |
48 |
|
49 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.10.4-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.10.4-r1.ebuild |
50 |
new file mode 100644 |
51 |
index 00000000000..aff99b2e38b |
52 |
--- /dev/null |
53 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.10.4-r1.ebuild |
54 |
@@ -0,0 +1,169 @@ |
55 |
+# Copyright 1999-2017 Gentoo Foundation |
56 |
+# Distributed under the terms of the GNU General Public License v2 |
57 |
+ |
58 |
+EAPI=6 |
59 |
+ |
60 |
+KDE_HANDBOOK="forceoptional" |
61 |
+KDE_TEST="forceoptional" |
62 |
+VIRTUALX_REQUIRED="test" |
63 |
+inherit kde5 qmake-utils |
64 |
+ |
65 |
+DESCRIPTION="KDE Plasma workspace" |
66 |
+KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
67 |
+IUSE="+calendar geolocation gps prison qalculate +semantic-desktop" |
68 |
+ |
69 |
+REQUIRED_USE="gps? ( geolocation )" |
70 |
+ |
71 |
+COMMON_DEPEND=" |
72 |
+ $(add_frameworks_dep kactivities) |
73 |
+ $(add_frameworks_dep kauth) |
74 |
+ $(add_frameworks_dep kbookmarks) |
75 |
+ $(add_frameworks_dep kcompletion) |
76 |
+ $(add_frameworks_dep kconfig) |
77 |
+ $(add_frameworks_dep kconfigwidgets) |
78 |
+ $(add_frameworks_dep kcoreaddons) |
79 |
+ $(add_frameworks_dep kcrash) |
80 |
+ $(add_frameworks_dep kdbusaddons) |
81 |
+ $(add_frameworks_dep kdeclarative) |
82 |
+ $(add_frameworks_dep kdelibs4support) |
83 |
+ $(add_frameworks_dep kglobalaccel) |
84 |
+ $(add_frameworks_dep kguiaddons) |
85 |
+ $(add_frameworks_dep ki18n) |
86 |
+ $(add_frameworks_dep kiconthemes) |
87 |
+ $(add_frameworks_dep kidletime) |
88 |
+ $(add_frameworks_dep kio) |
89 |
+ $(add_frameworks_dep kitemmodels) |
90 |
+ $(add_frameworks_dep kitemviews) |
91 |
+ $(add_frameworks_dep kjobwidgets) |
92 |
+ $(add_frameworks_dep kjs) |
93 |
+ $(add_frameworks_dep kjsembed) |
94 |
+ $(add_frameworks_dep knewstuff) |
95 |
+ $(add_frameworks_dep knotifications) |
96 |
+ $(add_frameworks_dep knotifyconfig) |
97 |
+ $(add_frameworks_dep kpackage) |
98 |
+ $(add_frameworks_dep krunner) |
99 |
+ $(add_frameworks_dep kservice) |
100 |
+ $(add_frameworks_dep ktexteditor) |
101 |
+ $(add_frameworks_dep ktextwidgets) |
102 |
+ $(add_frameworks_dep kwallet) |
103 |
+ $(add_frameworks_dep kwayland) |
104 |
+ $(add_frameworks_dep kwidgetsaddons) |
105 |
+ $(add_frameworks_dep kwindowsystem) |
106 |
+ $(add_frameworks_dep kxmlgui) |
107 |
+ $(add_frameworks_dep kxmlrpcclient) |
108 |
+ $(add_frameworks_dep plasma) |
109 |
+ $(add_frameworks_dep solid) |
110 |
+ $(add_plasma_dep kscreenlocker) |
111 |
+ $(add_plasma_dep kwin) |
112 |
+ $(add_plasma_dep libksysguard) |
113 |
+ $(add_qt_dep qtdbus) |
114 |
+ $(add_qt_dep qtdeclarative 'widgets') |
115 |
+ $(add_qt_dep qtgui 'jpeg') |
116 |
+ $(add_qt_dep qtnetwork) |
117 |
+ $(add_qt_dep qtscript) |
118 |
+ $(add_qt_dep qtsql) |
119 |
+ $(add_qt_dep qtwidgets) |
120 |
+ $(add_qt_dep qtx11extras) |
121 |
+ $(add_qt_dep qtxml) |
122 |
+ media-libs/phonon[qt5] |
123 |
+ sys-libs/zlib |
124 |
+ x11-libs/libICE |
125 |
+ x11-libs/libSM |
126 |
+ x11-libs/libX11 |
127 |
+ x11-libs/libXau |
128 |
+ x11-libs/libxcb |
129 |
+ x11-libs/libXfixes |
130 |
+ x11-libs/libXrender |
131 |
+ x11-libs/libXtst |
132 |
+ x11-libs/xcb-util |
133 |
+ x11-libs/xcb-util-image |
134 |
+ calendar? ( $(add_kdeapps_dep kholidays) ) |
135 |
+ geolocation? ( $(add_frameworks_dep networkmanager-qt) ) |
136 |
+ gps? ( sci-geosciences/gpsd ) |
137 |
+ prison? ( $(add_frameworks_dep prison) ) |
138 |
+ qalculate? ( sci-libs/libqalculate:= ) |
139 |
+ semantic-desktop? ( $(add_frameworks_dep baloo) ) |
140 |
+" |
141 |
+RDEPEND="${COMMON_DEPEND} |
142 |
+ $(add_frameworks_dep kded) |
143 |
+ $(add_frameworks_dep kdesu) |
144 |
+ $(add_kdeapps_dep kio-extras) |
145 |
+ $(add_plasma_dep kde-cli-tools) |
146 |
+ $(add_plasma_dep ksysguard) |
147 |
+ $(add_plasma_dep milou) |
148 |
+ $(add_plasma_dep plasma-integration) |
149 |
+ $(add_qt_dep qdbus) |
150 |
+ $(add_qt_dep qtgraphicaleffects) |
151 |
+ $(add_qt_dep qtpaths) |
152 |
+ $(add_qt_dep qtquickcontrols 'widgets') |
153 |
+ app-text/iso-codes |
154 |
+ x11-apps/mkfontdir |
155 |
+ x11-apps/xmessage |
156 |
+ x11-apps/xprop |
157 |
+ x11-apps/xrdb |
158 |
+ x11-apps/xset |
159 |
+ x11-apps/xsetroot |
160 |
+ !dev-libs/xembed-sni-proxy |
161 |
+ !kde-plasma/freespacenotifier:4 |
162 |
+ !kde-plasma/libtaskmanager:4 |
163 |
+ !kde-plasma/kcminit:4 |
164 |
+ !kde-plasma/kdebase-startkde:4 |
165 |
+ !kde-plasma/klipper:4 |
166 |
+ !kde-plasma/krunner:4 |
167 |
+ !kde-plasma/ksmserver:4 |
168 |
+ !kde-plasma/ksplash:4 |
169 |
+ !kde-plasma/plasma-workspace:4 |
170 |
+" |
171 |
+DEPEND="${COMMON_DEPEND} |
172 |
+ $(add_qt_dep qtconcurrent) |
173 |
+ x11-proto/xproto |
174 |
+" |
175 |
+ |
176 |
+PATCHES=( |
177 |
+ "${FILESDIR}/${PN}-5.4-startkde-script.patch" |
178 |
+ "${FILESDIR}/${P}-unused-dep.patch" |
179 |
+) |
180 |
+ |
181 |
+RESTRICT+=" test" |
182 |
+ |
183 |
+src_prepare() { |
184 |
+ kde5_src_prepare |
185 |
+ |
186 |
+ sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \ |
187 |
+ -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die |
188 |
+} |
189 |
+ |
190 |
+src_configure() { |
191 |
+ local mycmakeargs=( |
192 |
+ $(cmake-utils_use_find_package calendar KF5Holidays) |
193 |
+ $(cmake-utils_use_find_package geolocation KF5NetworkManagerQt) |
194 |
+ $(cmake-utils_use_find_package prison KF5Prison) |
195 |
+ $(cmake-utils_use_find_package qalculate Qalculate) |
196 |
+ $(cmake-utils_use_find_package semantic-desktop KF5Baloo) |
197 |
+ ) |
198 |
+ |
199 |
+ use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) ) |
200 |
+ |
201 |
+ kde5_src_configure |
202 |
+} |
203 |
+ |
204 |
+src_install() { |
205 |
+ kde5_src_install |
206 |
+ |
207 |
+ # startup and shutdown scripts |
208 |
+ insinto /etc/plasma/startup |
209 |
+ doins "${FILESDIR}/10-agent-startup.sh" |
210 |
+ |
211 |
+ insinto /etc/plasma/shutdown |
212 |
+ doins "${FILESDIR}/10-agent-shutdown.sh" |
213 |
+} |
214 |
+ |
215 |
+pkg_postinst () { |
216 |
+ kde5_pkg_postinst |
217 |
+ |
218 |
+ echo |
219 |
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions," |
220 |
+ elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and" |
221 |
+ elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh" |
222 |
+ echo |
223 |
+} |