| 1 |
cryos 08/09/27 18:02:19 |
| 2 |
|
| 3 |
Added: kdebase-startkde-3.5-gentoo.patch |
| 4 |
Log: |
| 5 |
Tweak the PATH, ROOTHPATH and XDG_DATA_DIRS variables, thanks to Matthias Dahl <ua_bugz_gentoo@×××××××××××.de> in bug 237718. Also tweaked KDEDIRS to remove /usr as this was never used. |
| 6 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: kdebase-startkde-3.5-gentoo.patch |
| 15 |
=================================================================== |
| 16 |
--- startkde.orig 2008-08-19 21:56:42.000000000 +0200 |
| 17 |
+++ startkde 2008-09-15 14:39:53.000000000 +0200 |
| 18 |
@@ -7,6 +7,15 @@ |
| 19 |
# because we still need to do some cleanup. |
| 20 |
trap 'echo GOT SIGHUP' HUP |
| 21 |
|
| 22 |
+# Gentoo: setup environment, filter other slotted KDE installs from PATH |
| 23 |
+_KDEDIR=@REPLACE_PREFIX@ |
| 24 |
+export KDEDIRS=${_KDEDIR}:/usr/local |
| 25 |
+export PATH=${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g') |
| 26 |
+export ROOTPATH=${_KDEDIR}/sbin:${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g') |
| 27 |
+export LDPATH=@REPLACE_LIBS@:${LDPATH} |
| 28 |
+export XDG_DATA_DIRS=${_KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#/usr/kde/[^/]*/share/\?:##g;s/:$//g') |
| 29 |
+# Gentoo part ends |
| 30 |
+ |
| 31 |
# Check if a KDE session already is running |
| 32 |
if kcheckrunning >/dev/null 2>&1; then |
| 33 |
echo "KDE seems to be already running on this display." |
| 34 |
@@ -14,6 +23,20 @@ |
| 35 |
exit 1 |
| 36 |
fi |
| 37 |
|
| 38 |
+# Gentoo part: |
| 39 |
+# Scrapped old KDE 3.x -> 3.y update code, but keep symlink code |
| 40 |
+cd ${HOME} |
| 41 |
+if [ -L .kde -o ! -d .kde ]; then |
| 42 |
+ # handle ~/.kde* dirs - separate ones for separate KDEs |
| 43 |
+ rm -f .kde |
| 44 |
+ if [ ! -e .kde3.5 ]; then |
| 45 |
+ mkdir .kde3.5 |
| 46 |
+ cd ${HOME} |
| 47 |
+ fi |
| 48 |
+ ln -sf .kde3.5 .kde |
| 49 |
+fi |
| 50 |
+# Gentoo part ends |
| 51 |
+ |
| 52 |
# Set the background to plain grey. |
| 53 |
# The standard X background is nasty, causing moire effects and exploding |
| 54 |
# people's heads. We use colours from the standard KDE palette for those with |
| 55 |
@@ -180,6 +203,13 @@ |
| 56 |
done |
| 57 |
done |
| 58 |
|
| 59 |
+# Source scripts in /etc/X11/xinit/xinitrc.d/ for system-level defined stuff |
| 60 |
+if test -d "/etc/X11/xinit/xinitrc.d/"; then |
| 61 |
+ for file in "/etc/X11/xinit/xinitrc.d/"*; do |
| 62 |
+ test -x "$file" && . "$file" |
| 63 |
+ done |
| 64 |
+fi |
| 65 |
+ |
| 66 |
# Activate the kde font directories. |
| 67 |
# |
| 68 |
# There are 4 directories that may be used for supplying fonts for KDE. |
| 69 |
@@ -386,7 +416,7 @@ |
| 70 |
# Clean up |
| 71 |
kdeinit_shutdown |
| 72 |
dcopserver_shutdown --wait |
| 73 |
-artsshell -q terminate |
| 74 |
+if test -e ${_KDEDIR}/bin/artsshell ; then artsshell -q terminate ; fi |
| 75 |
# KDE4 support |
| 76 |
kde4 kdeinit4_shutdown 2>/dev/null |
Archives