diff -Naur kde-workspace-4.10.5.orig/startkde.cmake kde-workspace-4.10.5/startkde.cmake --- kde-workspace-4.10.5.orig/startkde.cmake 2013-06-28 19:10:45.208379900 +0200 +++ kde-workspace-4.10.5/startkde.cmake 2013-07-05 23:11:32.761946149 +0200 @@ -9,10 +9,29 @@ export KWIN_COMPOSE KDE_FAILSAFE fi +#make the output better +export KDE_COLOR_DEBUG=1 +export QTEST_COLORED=1 + # 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 +if [ "$MGA_MENU_STYLE" = "upstream" ]; then + if [ -z "$XDG_CONFIG_DIRS" ]; then + export XDG_CONFIG_DIRS="/etc/xdg/kde4:/etc/xdg" + else + export XDG_CONFIG_DIRS="/etc/xdg/kde4:$XDG_CONFIG_DIRS" + fi +else + if [ -z "$XDG_CONFIG_DIRS" ]; then + export XDG_CONFIG_DIRS="/etc/xdg:/etc/xdg/kde4" + else + export XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:/etc/xdg/kde4" + fi + export XDG_MENU_PREFIX="kde-" +fi + # we have to unset this for Darwin since it will screw up KDE's dynamic-loading unset DYLD_FORCE_FLAT_NAMESPACE @@ -61,7 +80,7 @@ # The user's personal KDE directory is usually ~/.kde, but this setting # may be overridden by setting KDEHOME. -kdehome=$HOME/@KDE_DEFAULT_HOME@ +kdehome=$HOME/.kde4 test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"` # see kstartupconfig source for usage @@ -108,7 +127,7 @@ fi fi -. krandrstartup +KRANDRSTARTUP=`which krandrstartup 2>/dev/null` && . $KRANDRSTARTUP if test "$kcmfonts_general_forcefontdpi" -ne 0; then xrdb -quiet -merge -nocpp <<EOF @@ -159,8 +178,9 @@ # better use the Autostart folder. libpath=`kde4-config --path lib | tr : '\n'` +servicepath=`kde4-config --path services | tr : '\n'` -for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do +for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'` `echo "$servicepath" | sed -n -e 's,/service.*,/env/,p'`; do for file in "$prefix"*.sh; do test -r "$file" && . "$file" done