|
|
|
@ -2,6 +2,7 @@ |
|
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
|
|
#
|
|
|
|
#
|
|
|
|
# Filename: package/.../xdm/startwm.patch
|
|
|
|
# Filename: package/.../xdm/startwm.patch
|
|
|
|
|
|
|
|
# Copyright (C) 2010 The OpenSDE Project
|
|
|
|
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
|
|
|
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
|
|
|
# Copyright (C) 1998 - 2004 Clifford Wolf
|
|
|
|
# Copyright (C) 1998 - 2004 Clifford Wolf
|
|
|
|
#
|
|
|
|
#
|
|
|
|
@ -17,16 +18,17 @@ |
|
|
|
|
|
|
|
|
|
|
|
More flexible root application startup.
|
|
|
|
More flexible root application startup.
|
|
|
|
|
|
|
|
|
|
|
|
--- xdm/config/Xsetup_0.orig Wed Apr 27 09:20:03 1994
|
|
|
|
diff -ruN xdm-1.1.9-orig/config/Xsetup_0 xdm-1.1.9/config/Xsetup_0
|
|
|
|
+++ xdm/config/Xsetup_0 Thu Dec 28 15:23:15 2000
|
|
|
|
--- xdm-1.1.9-orig/config/Xsetup_0 2009-09-18 04:24:37.000000000 +0200
|
|
|
|
@@ -1,3 +1,4 @@
|
|
|
|
+++ xdm-1.1.9/config/Xsetup_0 2010-07-23 15:37:43.568753394 +0200
|
|
|
|
|
|
|
|
@@ -1,2 +1,3 @@
|
|
|
|
#!/bin/sh
|
|
|
|
#!/bin/sh
|
|
|
|
# $XConsortium: Xsetup_0,v 1.3 93/09/28 14:30:31 gildea Exp $
|
|
|
|
|
|
|
|
xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail
|
|
|
|
xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail
|
|
|
|
+xsetroot -solid black
|
|
|
|
+xsetroot -solid black
|
|
|
|
--- xdm-0.99.3/config/Xsession.cpp.orig 2005-11-28 00:19:46.944477270 +0100
|
|
|
|
diff -ruN xdm-1.1.9-orig/config/Xsession.cpp xdm-1.1.9/config/Xsession.cpp
|
|
|
|
+++ xdm-0.99.3/config/Xsession.cpp 2005-11-28 00:23:55.249879534 +0100
|
|
|
|
--- xdm-1.1.9-orig/config/Xsession.cpp 2009-09-18 04:24:37.000000000 +0200
|
|
|
|
@@ -38,23 +38,15 @@
|
|
|
|
+++ xdm-1.1.9/config/Xsession.cpp 2010-07-23 15:37:43.568753394 +0200
|
|
|
|
|
|
|
|
@@ -62,23 +62,13 @@
|
|
|
|
if [ -r "$resources" ]; then
|
|
|
|
if [ -r "$resources" ]; then
|
|
|
|
BINDIR/xrdb -load "$resources"
|
|
|
|
BINDIR/xrdb -load "$resources"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
@ -38,14 +40,12 @@ More flexible root application startup. |
|
|
|
- [ -r /etc/default/xdm ] && {
|
|
|
|
- [ -r /etc/default/xdm ] && {
|
|
|
|
- . /etc/default/xdm
|
|
|
|
- . /etc/default/xdm
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
+ # we need at least the PATH /opt/*/bin expansion ...
|
|
|
|
|
|
|
|
+ [ -f /etc/profile ] && . /etc/profile
|
|
|
|
+ [ -f /etc/profile ] && . /etc/profile
|
|
|
|
|
|
|
|
|
|
|
|
- XCOMM Allow the user to over-ride the system default desktop
|
|
|
|
- XCOMM Allow the user to over-ride the system default desktop
|
|
|
|
- [ -r $HOME/.xdmdesktop ] && {
|
|
|
|
- [ -r $HOME/.xdmdesktop ] && {
|
|
|
|
- . $HOME/.xdmdesktop
|
|
|
|
- . $HOME/.xdmdesktop
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
+ WINDOWMANAGER="${WINDOWMANAGER:-startkde}"
|
|
|
|
|
|
|
|
+ [ "$WINDOWMANAGER" = "gnome" ] && WINDOWMANAGER="gnome-session"
|
|
|
|
+ [ "$WINDOWMANAGER" = "gnome" ] && WINDOWMANAGER="gnome-session"
|
|
|
|
+ [ "$WINDOWMANAGER" = "kde" ] && WINDOWMANAGER="startkde"
|
|
|
|
+ [ "$WINDOWMANAGER" = "kde" ] && WINDOWMANAGER="startkde"
|
|
|
|
+ [ "$WINDOWMANAGER" != "twm" ] && exec $WINDOWMANAGER
|
|
|
|
+ [ "$WINDOWMANAGER" != "twm" ] && exec $WINDOWMANAGER
|
|
|
|
|
Christian Wiese
15 years ago