Author: lmontel Date: Mon Feb 5 09:04:38 2007 New Revision: 116183 Added: packages/cooker/kdebase/current/SOURCES/kdebase-3.5.6-startkde.patch Removed: packages/cooker/kdebase/current/SOURCES/kdebase-3.4.92-startkde Modified: packages/cooker/kdebase/current/SPECS/kdebase.spec
Log: Readd startkde patch Added: packages/cooker/kdebase/current/SOURCES/kdebase-3.5.6-startkde.patch ============================================================================== --- (empty file) +++ packages/cooker/kdebase/current/SOURCES/kdebase-3.5.6-startkde.patch Mon Feb 5 09:04:38 2007 @@ -0,0 +1,81 @@ +--- kdebase-3.5.6/startkde-- 2007-02-05 08:59:43.000000000 +0100 ++++ kdebase-3.5.6/startkde 2007-02-05 09:01:30.000000000 +0100 +@@ -33,9 +33,9 @@ + # 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 + # palettised displays. +-if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then +- xsetroot -solid "#000000" +-fi ++#if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then ++# xsetroot -solid "#000000" ++#fi + + # we have to unset this for Darwin since it will screw up KDE's dynamic-loading + unset DYLD_FORCE_FLAT_NAMESPACE +@@ -271,6 +271,43 @@ + # + xsetroot -cursor_name left_ptr + ++[ ! -d $kdehome/share/config ] && mkdir -p $kdehome/share/config ++ ++if [ ! -e /dev/dsp ] && [ ! -e $kdehome/share/config/kcmartsrc ] ; then ++ echo "[Arts]" > $kdehome/share/config/kcmartsrc ++ echo "StartServer=false" >> $kdehome/share/config/kcmartsrc ++fi ++if [ "`whoami`" = root ] ; then ++ cd /usr/share/mdk/kde/root-interface/ ++ for i in *; do ++ if [ ! -e /root/.kde/share/config/$i ]; then ++ cp -fr $i /root/.kde/share/config/ ++ fi ++ done ++ cd - ++else ++ if [ $(grep "META_CLASS=desktop" /etc/sysconfig/system) ]; then ++ if [ ! -e $kdehome/Autostart/openkmenu.desktop ] && [ ! -e $kdehome/Autostart/.openkmenu ]; then ++ [ ! -d $kdehome/Autostart ] && mkdir -p $kdehome/Autostart ++ cp /usr/share/mdk/kde/openkmenu.desktop $kdehome/Autostart/ && touch $kdehome/Autostart/.openkmenu ++ else ++ rm -f $kdehome/Autostart/openkmenu.desktop ++ fi ++ elif [ -e $kdehome/Autostart/openkmenu.desktop ]; then ++ rm -f $kdehome/Autostart/openkmenu.desktop ++ fi ++ ++fi ++ ++export DESKTOP="kde" ++ ++machine_type=$(uname -m) ++if [ $machine_type != "ppc" ] && [ $machine_type != "sparc" ] && [ $machine_type != "alpha" ] ; then ++ /usr/bin/test-windows-key ++fi ++ ++ ++ + # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap + if test -n "$GS_LIB" ; then + GS_LIB=$usr_fdir:$GS_LIB +@@ -297,21 +334,6 @@ + + echo 'startkde: Starting up...' 1>&2 + +-# run KPersonalizer before the session, if this is the first login +-if test "$kpersonalizerrc_general_firstlogin" = "true"; then +- # start only dcopserver, don't start whole kdeinit (takes too long) +- echo 'startkde: Running kpersonalizer...' 1>&2 +- dcopserver +- kwin --lock & +- kpersonalizer --before-session +- # handle kpersonalizer restarts (language change) +- while test $? -eq 1; do +- kpersonalizer --r --before-session +- done +- dcopquit kwin +- dcopserver_shutdown --wait +-fi +- + if test -z "$dl"; then + # the splashscreen and progress indicator + case "$ksplashrc_ksplash_theme" in Modified: packages/cooker/kdebase/current/SPECS/kdebase.spec ============================================================================== --- packages/cooker/kdebase/current/SPECS/kdebase.spec (original) +++ packages/cooker/kdebase/current/SPECS/kdebase.spec Mon Feb 5 09:04:38 2007 @@ -181,8 +181,6 @@ Patch1: kdebase-3.2-fix-kcontrol-global.patch Patch2: kdebase-3.5.2-move-xdg_menu_dir.patch Patch3: kdebase-3.5.4-ksplashscreen-mdk.patch -# startkde without kpersonalizer -Patch7: kdebase-3.4.92-startkde # Default Mandriva startpage Patch14: kdebase-3.0.3-fix-index-html.patch # Fix paste local url in konsole : file:/mtc... @@ -249,6 +247,7 @@ Patch158: kdebase-3.5.4-fix-screensaver-onlyshowin-kde.patch Patch159: kdebase-3.4.2-npapi-64bit-fixes.patch +Patch160: kdebase-3.5.6-startkde.patch BuildConflicts: lm_utils @@ -1574,7 +1573,6 @@ %patch2 -p1 -b .xdg %endif %patch3 -p1 -b .splash -#%patch7 -p1 -b .startkde_mdk %patch14 -p1 -b .konqueror_default_profile_webbrowsing %patch16 -p1 -b .fix_konsole_paste_action %if %mdkversion <= 200600 @@ -1646,6 +1644,7 @@ #%patch156 -p1 -b .fix_kdeeject %patch158 -p1 -b .fix_kscreensaver_only_show_in_kde %patch159 -p1 -b .fix_nsplugins_x86_64 +%patch160 -p1 -b .fix_startkde_mdk %build # This is here just because patch 93. Too
