diff options
| author |   Wulf Krueger <philantrop@gentoo.org> | 2008-01-18 00:12:51 +0000 |
|---|---|---|
| committer | Wulf Krueger <philantrop@gentoo.org> | 2008-01-18 00:12:51 +0000 |
| commit | 19dc1708e49d6ede9abc539da285f44c6b51e39b (patch) | |
| tree | fe5787b8066f88ee24e3690a72bae29127a836a0 /kde-base/kdebase-startkde/files | |
| parent | Added KDE 4.0.0's konsole. (diff) | |
| download | gentoo-2-19dc1708e49d6ede9abc539da285f44c6b51e39b.tar.gz gentoo-2-19dc1708e49d6ede9abc539da285f44c6b51e39b.tar.bz2 gentoo-2-19dc1708e49d6ede9abc539da285f44c6b51e39b.zip | |
Added patches.
(Portage version: 2.1.4)
Diffstat (limited to 'kde-base/kdebase-startkde/files')
| -rw-r--r-- | kde-base/kdebase-startkde/files/gentoo-startkde.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde.patch b/kde-base/kdebase-startkde/files/gentoo-startkde.patch new file mode 100644 index 000000000000..e2f73172127e --- /dev/null +++ b/kde-base/kdebase-startkde/files/gentoo-startkde.patch @@ -0,0 +1,50 @@ +diff --git a/startkde.cmake b/startkde.cmake +index ea2f4f2..7be9831 100755 +--- a/startkde.cmake ++++ b/startkde.cmake +@@ -2,11 +2,45 @@ + # + # DEFAULT KDE STARTUP SCRIPT ( @KDE_VERSION_STRING@ ) + # ++# vim: set filetype=sh : + + # When the X server dies we get a HUP signal from xinit. We must ignore it + # 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#/usr/kde/[^/]*/s\?bin:##g') ++export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed 's#/usr/kde/[^/]*/s\?bin:##g') ++export LDPATH=@REPLACE_LIBS@:${LDPATH} ++ ++# Gentoo: Handle the ~/.kde symlink to ~/.kde$(version) ++# This is needed to sanely mix multiple slotted KDE versions, ++# without hosing settings of an older KDE version. ++[ -e "$HOME/.kde$(basename $KDEDIR)" ] || mkdir "$HOME/.kde$(basename $KDEDIR)" ++if [ -z "$HOME" ]; then ++ xmessage "HOME is unset. Your user config seems to be broken. Aborting." ++ exit 1 ++elif [ ! -d "$HOME/.kde$(basename $KDEDIR)" ]; then ++ xmessage "$HOME/.kde$(basename $KDEDIR) exists but is not a dir. Aborting." ++ exit 1 ++elif [ -n "$KDEHOME" ]; then ++ xmessage "You've set $KDEHOME manually. This script currently does not support a non-standard location for $KDEHOME. Please unset it and use the standard." > /dev/null 2>/dev/null ++ exit 1 ++elif [ -L "$HOME/.kde" ]; then ++ rm "$HOME/.kde" ++ ln -sf ".kde$(basename $KDEDIR)" "$HOME/.kde" ++elif [ ! -e "$HOME/.kde" ]; then ++ ln -s ".kde$(basename $KDEDIR)" "$HOME/.kde" ++elif [ -d "$HOME/.kde" ]; then ++ xmessage "~/.kde is not a symlink. Please move ~/.kde to ~/.kde3.5 (if appropriate) and symlink ~/.kde to it." > /dev/null 2>/dev/null ++ exit 1 ++else ++ xmessage "~/.kde is not a symlink or a dir. Make it a symlink to .kde$(basename $KDEDIR) or remove it." > /dev/null 2>/dev/null ++ exit 1 ++fi ++ + # Check if a KDE session already is running + if kcheckrunning >/dev/null 2>&1; then + echo "KDE seems to be already running on this display." |