johu 15/05/31 22:06:16 Added: agent-shutdown.sh plasma-workspace-startkde-script.patch plasma-workspace-tests-optional.patch agent-startup.sh Log: 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. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xF3CFD2BD)
Revision Changes Path 1.1 kde-plasma/plasma-workspace/files/agent-shutdown.sh file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-plasma/plasma-workspace/files/agent-shutdown.sh?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-plasma/plasma-workspace/files/agent-shutdown.sh?rev=1.1&content-type=text/plain Index: agent-shutdown.sh =================================================================== #!/bin/sh # # This file is executed at plasma shutdown. # Uncomment the following lines to kill the agents # that were started at session startup. #if [ -n "${GPG_AGENT_INFO}" ]; then # kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1 #fi #if [ -n "${SSH_AGENT_PID}" ]; then # eval "$(ssh-agent -s -k)" #fi 1.1 kde-plasma/plasma-workspace/files/plasma-workspace-startkde-script.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-plasma/plasma-workspace/files/plasma-workspace-startkde-script.patch?rev=1.1&view=markup 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 Index: plasma-workspace-startkde-script.patch =================================================================== >From 6c3f73efc0619020a0c17219b1f7e1e3cd49478f Mon Sep 17 00:00:00 2001 From: Johannes Huber <j...@gentoo.org> Date: Wed, 28 May 2014 16:00:41 +0200 Subject: [PATCH] [startkde] Gentoo FHS script support --- startkde/startkde.cmake | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake index f073b93..1c41364 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake @@ -206,6 +206,11 @@ for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do done done +# Gentoo part for FHS installs +for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/startup/"*.sh; do + test -r "${file}" && . "${file}" +done + # Set the path for Qt plugins provided by KDE QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir` # TODO: Do we really need this? @@ -411,6 +416,11 @@ for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'`; do done done +# Gentoo part for FHS installs +for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/shutdown/"*.sh; do + test -r "${file}" && . "${file}" +done + unset KDE_FULL_SESSION xprop -root -remove KDE_FULL_SESSION unset KDE_SESSION_VERSION -- 1.9.3 1.1 kde-plasma/plasma-workspace/files/plasma-workspace-tests-optional.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-plasma/plasma-workspace/files/plasma-workspace-tests-optional.patch?rev=1.1&view=markup 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 Index: plasma-workspace-tests-optional.patch =================================================================== --- a/CMakeLists.txt 2015-01-21 00:23:54.096323752 +0100 +++ b/CMakeLists.txt 2015-01-21 00:24:36.304654204 +0100 @@ -7,7 +7,7 @@ set(QT_MIN_VERSION "5.4.0") set(KF5_MIN_VERSION "5.8.0") set(INSTALL_SDDM_THEME TRUE) -find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick QuickWidgets Concurrent Test Script Network) +find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick QuickWidgets Concurrent Script Network) find_package(ECM 1.8.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) 1.1 kde-plasma/plasma-workspace/files/agent-startup.sh file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-plasma/plasma-workspace/files/agent-startup.sh?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-plasma/plasma-workspace/files/agent-startup.sh?rev=1.1&content-type=text/plain Index: agent-startup.sh =================================================================== # Agents startup file # # This file is sourced at plasma startup, so that # the environment variables set here are available # throughout the session. # Uncomment the following lines to start gpg-agent # and/or ssh-agent at plasma startup. # If you do so, do not forget to uncomment the respective # lines in PLASMADIR/shutdown/agent-shutdown.sh to # properly kill the agents when the session ends. #if [ -x /usr/bin/gpg-agent ]; then # eval "$(/usr/bin/gpg-agent --daemon)" #fi #if [ -x /usr/bin/ssh-agent ]; then # eval "$(/usr/bin/ssh-agent -s)" #fi # Uncomment the following lines to start rxvt-unicode which has the ability to # run multiple terminals in one single process, thus starting up faster and # saving resources. # The --opendisplay ensures that the daemon quits when the X server terminates, # therefore we don't need matching lines in agent-shutdown.sh. #if [ -x /usr/bin/urxvtd ]; then # /usr/bin/urxvtd --opendisplay --fork --quiet #fi