diff options
author | Marcus D. Hanwell <cryos@gentoo.org> | 2008-09-27 18:02:18 +0000 |
---|---|---|
committer | Marcus D. Hanwell <cryos@gentoo.org> | 2008-09-27 18:02:18 +0000 |
commit | 259e4bb554b3eab26400e76148b4157da5831c3e (patch) | |
tree | 0519105e30ee2bdbb8d1888232da8012dedc7541 /kde-base/kdebase-startkde/files | |
parent | amd64 stable, bug #238608 (diff) | |
download | historical-259e4bb554b3eab26400e76148b4157da5831c3e.tar.gz historical-259e4bb554b3eab26400e76148b4157da5831c3e.tar.bz2 historical-259e4bb554b3eab26400e76148b4157da5831c3e.zip |
Tweak the PATH, ROOTHPATH and XDG_DATA_DIRS variables, thanks to Matthias Dahl <ua_bugz_gentoo@mortal-soul.de> in bug 237718. Also tweaked KDEDIRS to remove /usr as this was never used.
Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64
Diffstat (limited to 'kde-base/kdebase-startkde/files')
-rw-r--r-- | kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch b/kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch new file mode 100644 index 000000000000..21d5f90b09a8 --- /dev/null +++ b/kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch @@ -0,0 +1,62 @@ +--- startkde.orig 2008-08-19 21:56:42.000000000 +0200 ++++ startkde 2008-09-15 14:39:53.000000000 +0200 +@@ -7,6 +7,15 @@ + # because we still need to do some cleanup. + trap 'echo GOT SIGHUP' HUP + ++# Gentoo: setup environment, filter other slotted KDE installs from PATH ++_KDEDIR=@REPLACE_PREFIX@ ++export KDEDIRS=${_KDEDIR}:/usr/local ++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} ++export XDG_DATA_DIRS=${_KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#/usr/kde/[^/]*/share/\?:##g;s/:$//g') ++# Gentoo part ends ++ + # 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." +@@ -14,6 +23,20 @@ + exit 1 + fi + ++# Gentoo part: ++# Scrapped old KDE 3.x -> 3.y update code, but keep symlink code ++cd ${HOME} ++if [ -L .kde -o ! -d .kde ]; then ++ # handle ~/.kde* dirs - separate ones for separate KDEs ++ rm -f .kde ++ if [ ! -e .kde3.5 ]; then ++ mkdir .kde3.5 ++ cd ${HOME} ++ fi ++ ln -sf .kde3.5 .kde ++fi ++# Gentoo part ends ++ + # Set the background to plain grey. + # The standard X background is nasty, causing moire effects and exploding + # people's heads. We use colours from the standard KDE palette for those with +@@ -180,6 +203,13 @@ + done + done + ++# Source scripts in /etc/X11/xinit/xinitrc.d/ for system-level defined stuff ++if test -d "/etc/X11/xinit/xinitrc.d/"; then ++ for file in "/etc/X11/xinit/xinitrc.d/"*; do ++ test -x "$file" && . "$file" ++ done ++fi ++ + # Activate the kde font directories. + # + # There are 4 directories that may be used for supplying fonts for KDE. +@@ -386,7 +416,7 @@ + # Clean up + kdeinit_shutdown + dcopserver_shutdown --wait +-artsshell -q terminate ++if test -e ${_KDEDIR}/bin/artsshell ; then artsshell -q terminate ; fi + # KDE4 support + kde4 kdeinit4_shutdown 2>/dev/null + |