Gentoo Archives: gentoo-commits

From: "Johannes Huber (johu)" <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-plasma/plasma-workspace/files: agent-shutdown.sh plasma-workspace-startkde-script.patch plasma-workspace-tests-optional.patch agent-startup.sh
Date: Sun, 31 May 2015 22:06:21
Message-Id: 20150531220616.7E61AA1C@oystercatcher.gentoo.org
1 johu 15/05/31 22:06:16
2
3 Added: agent-shutdown.sh
4 plasma-workspace-startkde-script.patch
5 plasma-workspace-tests-optional.patch
6 agent-startup.sh
7 Log:
8 Initial commit for KDE Plasma 5. Imported from kde overlay. Ebuilds written by several people. Thank you all who worked on it in the overlay.
9
10 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xF3CFD2BD)
11
12 Revision Changes Path
13 1.1 kde-plasma/plasma-workspace/files/agent-shutdown.sh
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-plasma/plasma-workspace/files/agent-shutdown.sh?rev=1.1&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-plasma/plasma-workspace/files/agent-shutdown.sh?rev=1.1&content-type=text/plain
17
18 Index: agent-shutdown.sh
19 ===================================================================
20 #!/bin/sh
21 #
22 # This file is executed at plasma shutdown.
23 # Uncomment the following lines to kill the agents
24 # that were started at session startup.
25
26 #if [ -n "${GPG_AGENT_INFO}" ]; then
27 # kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1
28 #fi
29
30 #if [ -n "${SSH_AGENT_PID}" ]; then
31 # eval "$(ssh-agent -s -k)"
32 #fi
33
34
35
36 1.1 kde-plasma/plasma-workspace/files/plasma-workspace-startkde-script.patch
37
38 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-plasma/plasma-workspace/files/plasma-workspace-startkde-script.patch?rev=1.1&view=markup
39 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-plasma/plasma-workspace/files/plasma-workspace-startkde-script.patch?rev=1.1&content-type=text/plain
40
41 Index: plasma-workspace-startkde-script.patch
42 ===================================================================
43 From 6c3f73efc0619020a0c17219b1f7e1e3cd49478f Mon Sep 17 00:00:00 2001
44 From: Johannes Huber <johu@g.o>
45 Date: Wed, 28 May 2014 16:00:41 +0200
46 Subject: [PATCH] [startkde] Gentoo FHS script support
47
48 ---
49 startkde/startkde.cmake | 10 ++++++++++
50 1 file changed, 10 insertions(+)
51
52 diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
53 index f073b93..1c41364 100644
54 --- a/startkde/startkde.cmake
55 +++ b/startkde/startkde.cmake
56 @@ -206,6 +206,11 @@ for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
57 done
58 done
59
60 +# Gentoo part for FHS installs
61 +for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/startup/"*.sh; do
62 + test -r "${file}" && . "${file}"
63 +done
64 +
65 # Set the path for Qt plugins provided by KDE
66 QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir`
67 # TODO: Do we really need this?
68 @@ -411,6 +416,11 @@ for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'`; do
69 done
70 done
71
72 +# Gentoo part for FHS installs
73 +for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/shutdown/"*.sh; do
74 + test -r "${file}" && . "${file}"
75 +done
76 +
77 unset KDE_FULL_SESSION
78 xprop -root -remove KDE_FULL_SESSION
79 unset KDE_SESSION_VERSION
80 --
81 1.9.3
82
83
84
85
86 1.1 kde-plasma/plasma-workspace/files/plasma-workspace-tests-optional.patch
87
88 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-plasma/plasma-workspace/files/plasma-workspace-tests-optional.patch?rev=1.1&view=markup
89 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-plasma/plasma-workspace/files/plasma-workspace-tests-optional.patch?rev=1.1&content-type=text/plain
90
91 Index: plasma-workspace-tests-optional.patch
92 ===================================================================
93 --- a/CMakeLists.txt 2015-01-21 00:23:54.096323752 +0100
94 +++ b/CMakeLists.txt 2015-01-21 00:24:36.304654204 +0100
95 @@ -7,7 +7,7 @@
96 set(QT_MIN_VERSION "5.4.0")
97 set(KF5_MIN_VERSION "5.8.0")
98 set(INSTALL_SDDM_THEME TRUE)
99 -find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick QuickWidgets Concurrent Test Script Network)
100 +find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick QuickWidgets Concurrent Script Network)
101 find_package(ECM 1.8.0 REQUIRED NO_MODULE)
102 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
103
104
105
106
107 1.1 kde-plasma/plasma-workspace/files/agent-startup.sh
108
109 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-plasma/plasma-workspace/files/agent-startup.sh?rev=1.1&view=markup
110 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-plasma/plasma-workspace/files/agent-startup.sh?rev=1.1&content-type=text/plain
111
112 Index: agent-startup.sh
113 ===================================================================
114 # Agents startup file
115 #
116 # This file is sourced at plasma startup, so that
117 # the environment variables set here are available
118 # throughout the session.
119
120 # Uncomment the following lines to start gpg-agent
121 # and/or ssh-agent at plasma startup.
122 # If you do so, do not forget to uncomment the respective
123 # lines in PLASMADIR/shutdown/agent-shutdown.sh to
124 # properly kill the agents when the session ends.
125
126 #if [ -x /usr/bin/gpg-agent ]; then
127 # eval "$(/usr/bin/gpg-agent --daemon)"
128 #fi
129
130 #if [ -x /usr/bin/ssh-agent ]; then
131 # eval "$(/usr/bin/ssh-agent -s)"
132 #fi
133
134 # Uncomment the following lines to start rxvt-unicode which has the ability to
135 # run multiple terminals in one single process, thus starting up faster and
136 # saving resources.
137 # The --opendisplay ensures that the daemon quits when the X server terminates,
138 # therefore we don't need matching lines in agent-shutdown.sh.
139
140 #if [ -x /usr/bin/urxvtd ]; then
141 # /usr/bin/urxvtd --opendisplay --fork --quiet
142 #fi