package/xorg/xdm/startwm.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../xdm/startwm.patch
   5 # Copyright (C) 2004 - 2009 The T2 SDE Project
   6 # Copyright (C) 1998 - 2004 ROCK Linux Project
   7 #
   8 # More information can be found in the files COPYING and README.
   9 #
  10 # This patch file is dual-licensed. It is available under the license the
  11 # patched project is licensed under, as long as it is an OpenSource license
  12 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  13 # of the GNU General Public License as published by the Free Software
  14 # Foundation; either version 2 of the License, or (at your option) any later
  15 # version.
  16 # --- T2-COPYRIGHT-NOTE-END ---
  17
  18 More flexible root application startup.
  19
  20 --- xdm-1.1.9/config/Xsetup_0.vanilla   2009-09-19 12:44:22.000000000 +0200
  21 +++ xdm-1.1.9/config/Xsetup_0   2009-09-19 12:44:26.000000000 +0200
  22 @@ -1,2 +1,3 @@
  23  #!/bin/sh
  24  xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail
  25 +xsetroot -solid black
  26 --- xdm-0.99.3/config/Xsession.cpp.orig 2005-11-28 00:19:46.944477270 +0100
  27 +++ xdm-0.99.3/config/Xsession.cpp      2005-11-28 00:23:55.249879534 +0100
  28 @@ -38,23 +38,13 @@
  29         if [ -r "$resources" ]; then
  30                 BINDIR/xrdb -load "$resources"
  31         fi
  32 -#if defined(__SCO__) || defined(__UNIXWARE__)
  33 -        [ -r /etc/default/xdesktops ] && {
  34 -                . /etc/default/xdesktops
  35 -        }
  36
  37 -        [ -r /etc/default/xdm ] && {
  38 -                . /etc/default/xdm
  39 -        }
  40 +       [ -f /etc/profile ] && . /etc/profile
  41
  42 -        XCOMM Allow the user to over-ride the system default desktop
  43 -        [ -r $HOME/.xdmdesktop ] && {
  44 -                . $HOME/.xdmdesktop
  45 -        }
  46 +       [ "$WINDOWMANAGER" =  "gnome" ] && WINDOWMANAGER="gnome-session"
  47 +       [ "$WINDOWMANAGER" =  "kde"   ] && WINDOWMANAGER="startkde"
  48 +       [ "$WINDOWMANAGER" != "twm"   ] && exec $WINDOWMANAGER
  49 +       xsetroot -solid darkcyan ; exec twm ; exec xterm
  50
  51 -        [ -n "$XDESKTOP" ] && {
  52 -                exec `eval $XDESKTOP`
  53 -        }
  54 -#endif
  55         exec BINDIR/xsm
  56  fi