1 |
commit: b216411002a45d0392987ccc4fe988e2b810f982 |
2 |
Author: José Pekkarinen <koalinux <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Aug 1 20:19:37 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 2 23:17:14 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2164110 |
7 |
|
8 |
kde-plasma/plasma-workspace: Gentoo FHS script support for Wayland session |
9 |
|
10 |
Gentoo-bug: 626746 |
11 |
|
12 |
Closes: https://github.com/gentoo/gentoo/pull/5270 |
13 |
|
14 |
...rkspace-5.10-startplasmacompositor-script.patch | 40 +++++ |
15 |
.../plasma-workspace-5.10.4-r2.ebuild | 170 +++++++++++++++++++++ |
16 |
2 files changed, 210 insertions(+) |
17 |
|
18 |
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..de56ffe236c |
21 |
--- /dev/null |
22 |
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch |
23 |
@@ -0,0 +1,40 @@ |
24 |
+From a9b685f0dab7f21dfa3ed55011c035bab1c972d9 Mon Sep 17 00:00:00 2001 |
25 |
+From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= <koalinux@×××××.com> |
26 |
+Date: Tue, 1 Aug 2017 23:09:24 +0300 |
27 |
+Subject: [PATCH] Source files in /etc/plasma/{startup,shutdown} |
28 |
+ |
29 |
+--- |
30 |
+ startkde/startplasmacompositor.cmake | 10 ++++++++++ |
31 |
+ 1 file changed, 10 insertions(+) |
32 |
+ |
33 |
+diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake |
34 |
+index 5bcf26a..e965f19 100644 |
35 |
+--- a/startkde/startplasmacompositor.cmake |
36 |
++++ b/startkde/startplasmacompositor.cmake |
37 |
+@@ -157,6 +157,11 @@ for prefix in `echo $scriptpath`; do |
38 |
+ done |
39 |
+ done |
40 |
+ |
41 |
++# Gentoo part for FHS installs |
42 |
++for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/startup/"*.sh; do |
43 |
++ test -r "${file}" && . "${file}" |
44 |
++done |
45 |
++ |
46 |
+ echo 'startplasmacompositor: Starting up...' 1>&2 |
47 |
+ |
48 |
+ # Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. |
49 |
+@@ -232,6 +237,11 @@ fi |
50 |
+ |
51 |
+ echo 'startplasmacompositor: Shutting down...' 1>&2 |
52 |
+ |
53 |
++# Gentoo part for FHS installs |
54 |
++for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/shutdown/"*.sh; do |
55 |
++ test -r "${file}" && . "${file}" |
56 |
++done |
57 |
++ |
58 |
+ unset KDE_FULL_SESSION |
59 |
+ xprop -root -remove KDE_FULL_SESSION |
60 |
+ unset KDE_SESSION_VERSION |
61 |
+-- |
62 |
+2.13.0 |
63 |
+ |
64 |
|
65 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.10.4-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.10.4-r2.ebuild |
66 |
new file mode 100644 |
67 |
index 00000000000..9f18cb3c6c8 |
68 |
--- /dev/null |
69 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.10.4-r2.ebuild |
70 |
@@ -0,0 +1,170 @@ |
71 |
+# Copyright 1999-2017 Gentoo Foundation |
72 |
+# Distributed under the terms of the GNU General Public License v2 |
73 |
+ |
74 |
+EAPI=6 |
75 |
+ |
76 |
+KDE_HANDBOOK="forceoptional" |
77 |
+KDE_TEST="forceoptional" |
78 |
+VIRTUALX_REQUIRED="test" |
79 |
+inherit kde5 qmake-utils |
80 |
+ |
81 |
+DESCRIPTION="KDE Plasma workspace" |
82 |
+KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
83 |
+IUSE="+calendar geolocation gps prison qalculate +semantic-desktop" |
84 |
+ |
85 |
+REQUIRED_USE="gps? ( geolocation )" |
86 |
+ |
87 |
+COMMON_DEPEND=" |
88 |
+ $(add_frameworks_dep kactivities) |
89 |
+ $(add_frameworks_dep kauth) |
90 |
+ $(add_frameworks_dep kbookmarks) |
91 |
+ $(add_frameworks_dep kcompletion) |
92 |
+ $(add_frameworks_dep kconfig) |
93 |
+ $(add_frameworks_dep kconfigwidgets) |
94 |
+ $(add_frameworks_dep kcoreaddons) |
95 |
+ $(add_frameworks_dep kcrash) |
96 |
+ $(add_frameworks_dep kdbusaddons) |
97 |
+ $(add_frameworks_dep kdeclarative) |
98 |
+ $(add_frameworks_dep kdelibs4support) |
99 |
+ $(add_frameworks_dep kglobalaccel) |
100 |
+ $(add_frameworks_dep kguiaddons) |
101 |
+ $(add_frameworks_dep ki18n) |
102 |
+ $(add_frameworks_dep kiconthemes) |
103 |
+ $(add_frameworks_dep kidletime) |
104 |
+ $(add_frameworks_dep kio) |
105 |
+ $(add_frameworks_dep kitemmodels) |
106 |
+ $(add_frameworks_dep kitemviews) |
107 |
+ $(add_frameworks_dep kjobwidgets) |
108 |
+ $(add_frameworks_dep kjs) |
109 |
+ $(add_frameworks_dep kjsembed) |
110 |
+ $(add_frameworks_dep knewstuff) |
111 |
+ $(add_frameworks_dep knotifications) |
112 |
+ $(add_frameworks_dep knotifyconfig) |
113 |
+ $(add_frameworks_dep kpackage) |
114 |
+ $(add_frameworks_dep krunner) |
115 |
+ $(add_frameworks_dep kservice) |
116 |
+ $(add_frameworks_dep ktexteditor) |
117 |
+ $(add_frameworks_dep ktextwidgets) |
118 |
+ $(add_frameworks_dep kwallet) |
119 |
+ $(add_frameworks_dep kwayland) |
120 |
+ $(add_frameworks_dep kwidgetsaddons) |
121 |
+ $(add_frameworks_dep kwindowsystem) |
122 |
+ $(add_frameworks_dep kxmlgui) |
123 |
+ $(add_frameworks_dep kxmlrpcclient) |
124 |
+ $(add_frameworks_dep plasma) |
125 |
+ $(add_frameworks_dep solid) |
126 |
+ $(add_plasma_dep kscreenlocker) |
127 |
+ $(add_plasma_dep kwin) |
128 |
+ $(add_plasma_dep libksysguard) |
129 |
+ $(add_qt_dep qtdbus) |
130 |
+ $(add_qt_dep qtdeclarative 'widgets') |
131 |
+ $(add_qt_dep qtgui 'jpeg') |
132 |
+ $(add_qt_dep qtnetwork) |
133 |
+ $(add_qt_dep qtscript) |
134 |
+ $(add_qt_dep qtsql) |
135 |
+ $(add_qt_dep qtwidgets) |
136 |
+ $(add_qt_dep qtx11extras) |
137 |
+ $(add_qt_dep qtxml) |
138 |
+ media-libs/phonon[qt5] |
139 |
+ sys-libs/zlib |
140 |
+ x11-libs/libICE |
141 |
+ x11-libs/libSM |
142 |
+ x11-libs/libX11 |
143 |
+ x11-libs/libXau |
144 |
+ x11-libs/libxcb |
145 |
+ x11-libs/libXfixes |
146 |
+ x11-libs/libXrender |
147 |
+ x11-libs/libXtst |
148 |
+ x11-libs/xcb-util |
149 |
+ x11-libs/xcb-util-image |
150 |
+ calendar? ( $(add_kdeapps_dep kholidays) ) |
151 |
+ geolocation? ( $(add_frameworks_dep networkmanager-qt) ) |
152 |
+ gps? ( sci-geosciences/gpsd ) |
153 |
+ prison? ( $(add_frameworks_dep prison) ) |
154 |
+ qalculate? ( sci-libs/libqalculate:= ) |
155 |
+ semantic-desktop? ( $(add_frameworks_dep baloo) ) |
156 |
+" |
157 |
+RDEPEND="${COMMON_DEPEND} |
158 |
+ $(add_frameworks_dep kded) |
159 |
+ $(add_frameworks_dep kdesu) |
160 |
+ $(add_kdeapps_dep kio-extras) |
161 |
+ $(add_plasma_dep kde-cli-tools) |
162 |
+ $(add_plasma_dep ksysguard) |
163 |
+ $(add_plasma_dep milou) |
164 |
+ $(add_plasma_dep plasma-integration) |
165 |
+ $(add_qt_dep qdbus) |
166 |
+ $(add_qt_dep qtgraphicaleffects) |
167 |
+ $(add_qt_dep qtpaths) |
168 |
+ $(add_qt_dep qtquickcontrols 'widgets') |
169 |
+ app-text/iso-codes |
170 |
+ x11-apps/mkfontdir |
171 |
+ x11-apps/xmessage |
172 |
+ x11-apps/xprop |
173 |
+ x11-apps/xrdb |
174 |
+ x11-apps/xset |
175 |
+ x11-apps/xsetroot |
176 |
+ !dev-libs/xembed-sni-proxy |
177 |
+ !kde-plasma/freespacenotifier:4 |
178 |
+ !kde-plasma/libtaskmanager:4 |
179 |
+ !kde-plasma/kcminit:4 |
180 |
+ !kde-plasma/kdebase-startkde:4 |
181 |
+ !kde-plasma/klipper:4 |
182 |
+ !kde-plasma/krunner:4 |
183 |
+ !kde-plasma/ksmserver:4 |
184 |
+ !kde-plasma/ksplash:4 |
185 |
+ !kde-plasma/plasma-workspace:4 |
186 |
+" |
187 |
+DEPEND="${COMMON_DEPEND} |
188 |
+ $(add_qt_dep qtconcurrent) |
189 |
+ x11-proto/xproto |
190 |
+" |
191 |
+ |
192 |
+PATCHES=( |
193 |
+ "${FILESDIR}/${PN}-5.4-startkde-script.patch" |
194 |
+ "${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch" |
195 |
+ "${FILESDIR}/${P}-unused-dep.patch" |
196 |
+) |
197 |
+ |
198 |
+RESTRICT+=" test" |
199 |
+ |
200 |
+src_prepare() { |
201 |
+ kde5_src_prepare |
202 |
+ |
203 |
+ sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \ |
204 |
+ -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die |
205 |
+} |
206 |
+ |
207 |
+src_configure() { |
208 |
+ local mycmakeargs=( |
209 |
+ $(cmake-utils_use_find_package calendar KF5Holidays) |
210 |
+ $(cmake-utils_use_find_package geolocation KF5NetworkManagerQt) |
211 |
+ $(cmake-utils_use_find_package prison KF5Prison) |
212 |
+ $(cmake-utils_use_find_package qalculate Qalculate) |
213 |
+ $(cmake-utils_use_find_package semantic-desktop KF5Baloo) |
214 |
+ ) |
215 |
+ |
216 |
+ use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) ) |
217 |
+ |
218 |
+ kde5_src_configure |
219 |
+} |
220 |
+ |
221 |
+src_install() { |
222 |
+ kde5_src_install |
223 |
+ |
224 |
+ # startup and shutdown scripts |
225 |
+ insinto /etc/plasma/startup |
226 |
+ doins "${FILESDIR}/10-agent-startup.sh" |
227 |
+ |
228 |
+ insinto /etc/plasma/shutdown |
229 |
+ doins "${FILESDIR}/10-agent-shutdown.sh" |
230 |
+} |
231 |
+ |
232 |
+pkg_postinst () { |
233 |
+ kde5_pkg_postinst |
234 |
+ |
235 |
+ echo |
236 |
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions," |
237 |
+ elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and" |
238 |
+ elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh" |
239 |
+ echo |
240 |
+} |