| 1 |
tampakrap 09/09/01 15:06:45 |
| 2 |
|
| 3 |
Added: gentoo-startkde4-1.patch |
| 4 |
Log: |
| 5 |
Version bump KDE 4.3.1 |
| 6 |
(Portage version: 2.2_rc38/cvs/Linux x86_64, RepoMan options: --force) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 kde-base/kdebase-startkde/files/gentoo-startkde4-1.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/files/gentoo-startkde4-1.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/files/gentoo-startkde4-1.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: gentoo-startkde4-1.patch |
| 15 |
=================================================================== |
| 16 |
diff -Naur kdebase-startkde-4.2.0-orig/startkde.cmake kdebase-startkde-4.2.0/startkde.cmake |
| 17 |
--- kdebase-startkde-4.2.0-orig/startkde.cmake 2009-01-17 05:00:28.000000000 -0600 |
| 18 |
+++ kdebase-startkde-4.2.0/startkde.cmake 2009-02-21 12:52:02.000000000 -0600 |
| 19 |
@@ -7,6 +7,35 @@ |
| 20 |
# because we still need to do some cleanup. |
| 21 |
trap 'echo GOT SIGHUP' HUP |
| 22 |
|
| 23 |
+_KDEDIR=@REPLACE_PREFIX@ |
| 24 |
+if [ "$_KDEDIR" != "/usr" ]; then |
| 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 |
+fi |
| 28 |
+@REPLACE_LDPATH@ |
| 29 |
+export STRIGI_PLUGIN_PATH="${_KDEDIR}/@REPLACE_LIBDIR@/strigi:${STRIGI_PLUGIN_PATH}" |
| 30 |
+export XDG_DATA_DIRS=${_KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#/usr/kde/[^/]*/share/\?:##g;s/:$//g') |
| 31 |
+ |
| 32 |
+if [ -z "$HOME" ]; then |
| 33 |
+ xmessage "HOME is unset. Your user config seems to be broken. Aborting." |
| 34 |
+ exit 1 |
| 35 |
+fi |
| 36 |
+ |
| 37 |
+# Gentoo: handle the possible home directory layout for config directory |
| 38 |
+# Note that we change the default KDEHOME in kdelibs to .kde4 or .kde${SLOT} |
| 39 |
+# for -kdeprefix and +kdeprefix respectively. |
| 40 |
+if [ "${_KDEDIR}" = "/usr" ]; then |
| 41 |
+ # If the directory doesn't exist make it |
| 42 |
+ [ -e "${HOME}/.kde4" ] || mkdir "$HOME/.kde4" |
| 43 |
+else |
| 44 |
+ # Use multiple directories based upon the KDE directory |
| 45 |
+ [ -e "$HOME/.kde$(basename $_KDEDIR)" ] || mkdir "$HOME/.kde$(basename $_KDEDIR)" |
| 46 |
+ if [ ! -d "$HOME/.kde$(basename $_KDEDIR)" ]; then |
| 47 |
+ xmessage "$HOME/.kde$(basename $_KDEDIR) exists but is not a dir. Aborting." |
| 48 |
+ exit 1 |
| 49 |
+ fi |
| 50 |
+fi |
| 51 |
+ |
| 52 |
# Check if a KDE session already is running and whether it's possible to connect to X |
| 53 |
kcheckrunning |
| 54 |
kcheckrunning_result=$? |
| 55 |
@@ -214,6 +243,13 @@ |
| 56 |
done |
| 57 |
done |
| 58 |
|
| 59 |
+# Gentoo part for FHS installs |
| 60 |
+if [ "${_KDEDIR}" = "/usr" ]; then |
| 61 |
+ for file in "/etc/kde/startup/"*.sh; do |
| 62 |
+ test -r "${file}" && . "${file}" |
| 63 |
+ done |
| 64 |
+fi |
| 65 |
+ |
| 66 |
# Set the path for Qt plugins provided by KDE |
| 67 |
if test -n "$QT_PLUGIN_PATH"; then |
| 68 |
QT_PLUGIN_PATH="$QT_PLUGIN_PATH:`kde4-config --path qtplugins`" |
| 69 |
@@ -427,6 +463,13 @@ |
| 70 |
done |
| 71 |
done |
| 72 |
|
| 73 |
+# Gentoo part for FHS installs |
| 74 |
+if [ "${_KDEDIR}" = "/usr" ]; then |
| 75 |
+ for file in "/etc/kde/shutdown/"*.sh; do |
| 76 |
+ test -r "${file}" && . "${file}" |
| 77 |
+ done |
| 78 |
+fi |
| 79 |
+ |
| 80 |
unset KDE_FULL_SESSION |
| 81 |
xprop -root -remove KDE_FULL_SESSION |
| 82 |
unset KDE_SESSION_VERSION |
Archives