1 |
commit: 94f86d4d9e93668733123cad4cf43cea6f837e19 |
2 |
Author: José Pekkarinen <koalinux <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Aug 2 22:13:02 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 2 23:08:34 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=94f86d4d |
7 |
|
8 |
kde-plasma/plasma-workspace: Gentoo FHS script support for Wayland session |
9 |
|
10 |
Gentoo-bug: 626746 |
11 |
|
12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
13 |
|
14 |
...rkspace-5.10-startplasmacompositor-script.patch | 40 ++++++++++++++++++++++ |
15 |
.../plasma-workspace-5.10.49.9999.ebuild | 1 + |
16 |
.../plasma-workspace/plasma-workspace-9999.ebuild | 1 + |
17 |
3 files changed, 42 insertions(+) |
18 |
|
19 |
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 |
20 |
new file mode 100644 |
21 |
index 0000000000..de56ffe236 |
22 |
--- /dev/null |
23 |
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch |
24 |
@@ -0,0 +1,40 @@ |
25 |
+From a9b685f0dab7f21dfa3ed55011c035bab1c972d9 Mon Sep 17 00:00:00 2001 |
26 |
+From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= <koalinux@×××××.com> |
27 |
+Date: Tue, 1 Aug 2017 23:09:24 +0300 |
28 |
+Subject: [PATCH] Source files in /etc/plasma/{startup,shutdown} |
29 |
+ |
30 |
+--- |
31 |
+ startkde/startplasmacompositor.cmake | 10 ++++++++++ |
32 |
+ 1 file changed, 10 insertions(+) |
33 |
+ |
34 |
+diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake |
35 |
+index 5bcf26a..e965f19 100644 |
36 |
+--- a/startkde/startplasmacompositor.cmake |
37 |
++++ b/startkde/startplasmacompositor.cmake |
38 |
+@@ -157,6 +157,11 @@ for prefix in `echo $scriptpath`; do |
39 |
+ done |
40 |
+ done |
41 |
+ |
42 |
++# Gentoo part for FHS installs |
43 |
++for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/startup/"*.sh; do |
44 |
++ test -r "${file}" && . "${file}" |
45 |
++done |
46 |
++ |
47 |
+ echo 'startplasmacompositor: Starting up...' 1>&2 |
48 |
+ |
49 |
+ # Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. |
50 |
+@@ -232,6 +237,11 @@ fi |
51 |
+ |
52 |
+ echo 'startplasmacompositor: Shutting down...' 1>&2 |
53 |
+ |
54 |
++# Gentoo part for FHS installs |
55 |
++for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/shutdown/"*.sh; do |
56 |
++ test -r "${file}" && . "${file}" |
57 |
++done |
58 |
++ |
59 |
+ unset KDE_FULL_SESSION |
60 |
+ xprop -root -remove KDE_FULL_SESSION |
61 |
+ unset KDE_SESSION_VERSION |
62 |
+-- |
63 |
+2.13.0 |
64 |
+ |
65 |
|
66 |
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 |
67 |
index cbd22c5842..ae70767907 100644 |
68 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.10.49.9999.ebuild |
69 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.10.49.9999.ebuild |
70 |
@@ -121,6 +121,7 @@ DEPEND="${COMMON_DEPEND} |
71 |
|
72 |
PATCHES=( |
73 |
"${FILESDIR}/${PN}-5.4-startkde-script.patch" |
74 |
+ "${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch" |
75 |
"${FILESDIR}/${PN}-5.10.4-unused-dep.patch" |
76 |
) |
77 |
|
78 |
|
79 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
80 |
index cbd22c5842..ae70767907 100644 |
81 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
82 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
83 |
@@ -121,6 +121,7 @@ DEPEND="${COMMON_DEPEND} |
84 |
|
85 |
PATCHES=( |
86 |
"${FILESDIR}/${PN}-5.4-startkde-script.patch" |
87 |
+ "${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch" |
88 |
"${FILESDIR}/${PN}-5.10.4-unused-dep.patch" |
89 |
) |