diff options
Diffstat (limited to 'kde-base/kdebase-startkde/files/gentoo-startkde4.patch')
| -rw-r--r-- | kde-base/kdebase-startkde/files/gentoo-startkde4.patch | 36 |
1 files changed, 32 insertions, 4 deletions
diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4.patch b/kde-base/kdebase-startkde/files/gentoo-startkde4.patch index 244e1f28d3b..7526e39160b 100644 --- a/kde-base/kdebase-startkde/files/gentoo-startkde4.patch +++ b/kde-base/kdebase-startkde/files/gentoo-startkde4.patch @@ -1,15 +1,13 @@ --- startkde.cmake 2008-07-15 15:49:02.000000000 -0400 -+++ startkde.cmake.cryos 2008-09-01 16:42:04.000000000 -0400 ++++ startkde.cmake.cryos 2008-09-27 14:44:01.000000000 -0400 @@ -7,6 +7,33 @@ # because we still need to do some cleanup. trap 'echo GOT SIGHUP' HUP -+# Gentoo: setup environment, filter other slotted KDE installs from PATH +export KDEDIR=@REPLACE_PREFIX@ -+export KDEDIRS=/usr:/usr/local:${KDEDIR} +export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g') +export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g') -+export LDPATH=@REPLACE_LIBS@:${LDPATH} ++@REPLACE_LDPATH@ +export STRIGI_PLUGIN_PATH="${KDEDIR}/@REPLACE_LIBDIR@/strigi:${STRIGI_PLUGIN_PATH}" +export XDG_DATA_DIRS=${KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#/usr/kde/[^/]*/share/\?:##g;s/:$//g') + @@ -19,6 +17,8 @@ +fi + +# Gentoo: handle the possible home directory layout for config directory ++# Note that we change the default KDEHOME in kdelibs to .kde4 or .kde${SLOT} ++# for -kdeprefix and +kdeprefix respectively. +if [ "${KDEDIR}" == "/usr" ]; then + # If the directory doesn't exist make it + [ -e "${HOME}/.kde4" ] || mkdir "$HOME/.kde4" @@ -34,3 +34,31 @@ # Check if a KDE session already is running and whether it's possible to connect to X kcheckrunning kcheckrunning_result=$? +@@ -209,6 +236,13 @@ + done + done + ++# Gentoo part for FHS installs ++if [ "${KDEDIR}" == "/usr" ]; then ++ for file in "/etc/kde/startup/"*.sh; do ++ test -r "${file}" && . "${file}" ++ done ++fi ++ + # Set the path for Qt plugins provided by KDE + if test -n "$QT_PLUGIN_PATH"; then + QT_PLUGIN_PATH="$QT_PLUGIN_PATH:`kde4-config --path qtplugins`" +@@ -420,6 +454,13 @@ + done + done + ++# Gentoo part for FHS installs ++if [ "${KDEDIR}" == "/usr" ]; then ++ for file in "/etc/kde/shutdown/"*.sh; do ++ test -r "${file}" && . "${file}" ++ done ++fi ++ + unset KDE_FULL_SESSION + xprop -root -remove KDE_FULL_SESSION + unset KDE_SESSION_VERSION |