| 1 |
cryos 08/10/04 21:41:19 |
| 2 |
|
| 3 |
Modified: gentoo-startkde4.patch |
| 4 |
Log: |
| 5 |
Fixed some problems in the startkde script and removed KDEDIR from it - |
| 6 |
no longer required. |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 kde-base/kdebase-startkde/files/gentoo-startkde4.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/files/gentoo-startkde4.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/files/gentoo-startkde4.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/files/gentoo-startkde4.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: gentoo-startkde4.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/files/gentoo-startkde4.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- gentoo-startkde4.patch 2 Oct 2008 12:10:26 -0000 1.1 |
| 22 |
+++ gentoo-startkde4.patch 4 Oct 2008 21:41:18 -0000 1.2 |
| 23 |
@@ -4,12 +4,12 @@ |
| 24 |
# because we still need to do some cleanup. |
| 25 |
trap 'echo GOT SIGHUP' HUP |
| 26 |
|
| 27 |
-+export KDEDIR=@REPLACE_PREFIX@ |
| 28 |
-+export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g') |
| 29 |
-+export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g') |
| 30 |
++_KDEDIR=@REPLACE_PREFIX@ |
| 31 |
++export PATH=${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g') |
| 32 |
++export ROOTPATH=${_KDEDIR}/sbin:${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g') |
| 33 |
+@REPLACE_LDPATH@ |
| 34 |
-+export STRIGI_PLUGIN_PATH="${KDEDIR}/@REPLACE_LIBDIR@/strigi:${STRIGI_PLUGIN_PATH}" |
| 35 |
-+export XDG_DATA_DIRS=${KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#/usr/kde/[^/]*/share/\?:##g;s/:$//g') |
| 36 |
++export STRIGI_PLUGIN_PATH="${_KDEDIR}/@REPLACE_LIBDIR@/strigi:${STRIGI_PLUGIN_PATH}" |
| 37 |
++export XDG_DATA_DIRS=${_KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#/usr/kde/[^/]*/share/\?:##g;s/:$//g') |
| 38 |
+ |
| 39 |
+if [ -z "$HOME" ]; then |
| 40 |
+ xmessage "HOME is unset. Your user config seems to be broken. Aborting." |
| 41 |
@@ -19,14 +19,14 @@ |
| 42 |
+# Gentoo: handle the possible home directory layout for config directory |
| 43 |
+# Note that we change the default KDEHOME in kdelibs to .kde4 or .kde${SLOT} |
| 44 |
+# for -kdeprefix and +kdeprefix respectively. |
| 45 |
-+if [ "${KDEDIR}" == "/usr" ]; then |
| 46 |
++if [ "${_KDEDIR}" == "/usr" ]; then |
| 47 |
+ # If the directory doesn't exist make it |
| 48 |
+ [ -e "${HOME}/.kde4" ] || mkdir "$HOME/.kde4" |
| 49 |
+else |
| 50 |
+ # Use multiple directories based upon the KDE directory |
| 51 |
-+ [ -e "$HOME/.kde$(basename $KDEDIR)" ] || mkdir "$HOME/.kde$(basename $KDEDIR)" |
| 52 |
-+ if [ ! -d "$HOME/.kde$(basename $KDEDIR)" ]; then |
| 53 |
-+ xmessage "$HOME/.kde$(basename $KDEDIR) exists but is not a dir. Aborting." |
| 54 |
++ [ -e "$HOME/.kde$(basename $_KDEDIR)" ] || mkdir "$HOME/.kde$(basename $_KDEDIR)" |
| 55 |
++ if [ ! -d "$HOME/.kde$(basename $_KDEDIR)" ]; then |
| 56 |
++ xmessage "$HOME/.kde$(basename $_KDEDIR) exists but is not a dir. Aborting." |
| 57 |
+ exit 1 |
| 58 |
+ fi |
| 59 |
+fi |
| 60 |
@@ -39,7 +39,7 @@ |
| 61 |
done |
| 62 |
|
| 63 |
+# Gentoo part for FHS installs |
| 64 |
-+if [ "${KDEDIR}" == "/usr" ]; then |
| 65 |
++if [ "${_KDEDIR}" == "/usr" ]; then |
| 66 |
+ for file in "/etc/kde/startup/"*.sh; do |
| 67 |
+ test -r "${file}" && . "${file}" |
| 68 |
+ done |
| 69 |
@@ -53,7 +53,7 @@ |
| 70 |
done |
| 71 |
|
| 72 |
+# Gentoo part for FHS installs |
| 73 |
-+if [ "${KDEDIR}" == "/usr" ]; then |
| 74 |
++if [ "${_KDEDIR}" == "/usr" ]; then |
| 75 |
+ for file in "/etc/kde/shutdown/"*.sh; do |
| 76 |
+ test -r "${file}" && . "${file}" |
| 77 |
+ done |
Archives