Ok, here's the first one. This is an updated
kdebase-3.0-startkde-8.2-ix86.patch and I've renamed
it kdebase-3.1-startkde-9.1-ix86.patch
--- David Walser <[EMAIL PROTECTED]> wrote:
> Thanks Danny. He probably hasn't applied it because
> I'm not exactly making it easy for him. He can't
> just
> apply my patch to something and be on his way,
> giving
> he creates his startkde with a patch to the stock
> one.
> SO, I'm gonna save Laurent some work, and submit 3
> patches. One is an updated version of his
> kdebase-3.0-startkde-8.2-ix86.patch that's in CVS,
> one
> is an updated
> kdebase-3.0-startkde-8.2-non-ix86.patch,
> and finally the last is a patch he can apply to his
> kdebase.spec so that my patches will work (as I've
> renamed the patches I upgraded and they are -p0 and
> not -p1 patches). I will submit them in 3 replies
> to
> this mail.
__________________________________________________
Do you Yahoo!?
HotJobs - Search new jobs daily now
http://hotjobs.yahoo.com/
--- startkde.orig 2002-11-02 12:24:12.000000000 -0500
+++ startkde 2002-11-02 12:30:19.000000000 -0500
@@ -25,20 +25,93 @@
# especially necessary on slow machines, where starting KDE takes one or two
# minutes until anything appears on the screen.
#
-# Set the background to plain grey.
+# Set the background to standard Mandrake Linux colors
# 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.
-test "$XDM_MANAGED" || bkg="-solid #C0C0C0"
-xsetroot -cursor_name left_ptr $bkg
-
# The user's personal KDE directory is usually ~/.kde, but this setting
# may be overridden by setting KDEHOME.
kdehome=$HOME/.kde
test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^\~/,$HOME/,"`
+#test "$XDM_MANAGED" || bkg="-solid #C0C0C0"
+#xsetroot -cursor_name left_ptr $bkg
+if [ ! -d $kdehome/share/config ] ; then
+ mkdir -p $kdehome/share/config
+fi
+
+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
+ #xsetroot -cursor_name left_ptr -solid '#B20003'
+
+ if [ ! -e /root/.kde/share/config/kdesktoprc ] ; then
+ cp /usr/share/mdk/kde/root-interface/kdesktoprc /root/.kde/share/config/kdesktoprc
+ fi
+
+ if [ ! -e /root/.kde/share/config/kdeglobals ] ; then
+ cp /usr/share/mdk/kde/root-interface/kdeglobals /root/.kde/share/config/kdeglobals
+ fi
+
+ if [ ! -e /root/.kde/share/config/kickerrc ] ; then
+ cp /usr/share/mdk/kde/root-interface/kickerrc /root/.kde/share/config/kickerrc
+ fi
+
+ if [ ! -d /root/.kde/share/autostart/ ] ; then
+ mkdir -p /root/.kde/share/autostart/
+ cp /usr/share/mdk/kde/root-interface/klipper.desktop /root/.kde/share/autostart/
+ fi
+
+ if [ ! -d /root/.kde/share/apps/kdisplay/color-schemes/ ] ; then
+ mkdir -p /root/.kde/share/apps/kdisplay/color-schemes/
+ cp /usr/share/mdk/kde/root-interface/Root_interface.kcsrc /root/.kde/share/apps/kdisplay/color-schemes/
+ fi
+
+else
+ #xsetroot -cursor_name left_ptr -solid '#21449C';
+
+ if [ ! -d ~/Desktop ] ; then
+ mkdir -p ~/Desktop/ ;
+ fi
+
+ if [ ! -d $kdehome/Autostart/ ] ; then
+ mkdir -p $kdehome/Autostart/ ;
+ fi
+
+ if [ -e ~/.drakfw ] && [ "$(cat $kdehome/share/apps/konqueror/bookmarks.xml | wc -l | awk '{print $1}')" = "1" ] ; then
+ cp -f /usr/share/mdk/kde/bookmarks.xml $kdehome/share/apps/konqueror/
+ perl -pi -e "/\[KonqMainWindow Toolbar bookmarkToolBar\]/ .. /^\s*$/ and s/Hidden=true/Hidden=false/" $kdehome/share/config/konquerorrc
+ fi
+
+ if [ ! -d $kdehome/share/apps/konqueror ] ; then
+ mkdir -p $kdehome/share/apps/konqueror/ && cp /usr/share/mdk/kde/bookmarks.xml $kdehome/share/apps/konqueror/
+ fi
+
+ if [ ! -e ~/Desktop/.ArrangeIcons ] ; then
+ cp /usr/share/mdk/kde/ArangeIcons.desktop $kdehome/Autostart/ && touch ~/Desktop/.ArrangeIcons
+ else rm -f $kdehome/Autostart/ArangeIcons.desktop
+ fi
+
+ #/usr/bin/kdesktop-links > /dev/null 2>&1
+fi
+
+export HELP_BROWSER="kfmclient openProfile webbrowsing"
+export BROWSER="kfmclient openProfile webbrowsing"
+
+# Dadou - 2.1.1-4mdk - To be able to use the Windows key to open the K menu
+# laurent kde 2.2-22mdk test windows-key
+/usr/bin/test-windows-key
+
+## Laurent kde2.2-30mdk scan-nsplugins
+#if [ -x /usr/bin/nspluginscan ]; then
+# /usr/bin/nspluginscan
+#fi
+
# Activate the kde font directories.
#
# There are 4 directories that may be used for supplying fonts for KDE.
@@ -117,24 +190,15 @@
# In case of dcop sockets left by a previous session, cleanup
dcopserver_shutdown
-# run KPersonalizer before the session, if this is the first login
-grep 'FirstLogin=false' $kdehome/share/config/kpersonalizerrc >/dev/null 2>/dev/null
-if test $? -ne 0; then
- # start only dcopserver, don't start whole kdeinit (takes too long)
- dcopserver
- kwin &
- kpersonalizer --before-session
- # handle kpersonalizer restarts (language change)
- while test $? -eq 1; do
- kpersonalizer --r --before-session
- done
- dcopserver_shutdown
- # shutdown will also make kwin quit, give it time to do so
- sleep 1
-fi
# the splashscreen and progress indicator
-ksplash
+
+# Laurent kdebase-2.2.2-7mdk fix conflict with ksplashml
+if [ -e /usr/bin/ksplashml ]; then
+ ksplashml
+else
+ ksplash
+fi
# We set LD_BIND_NOW to increase the efficiency of kdeinit.
# kdeinit unsets this variable before loading applications.
