1 files changed, 42 insertions, 51 deletions
diff --git a/packages/e17/entrance/config-db.patch b/packages/e17/entrance/config-db.patch
index c909201882..83ed3acf84 100644
--- a/packages/e17/entrance/config-db.patch
+++ b/packages/e17/entrance/config-db.patch
@@ -1,52 +1,43 @@
-diff -Nur entrance~/data/config/build_config.sh.in entrance/data/config/build_config.sh.in
---- entrance~/data/config/build_config.sh.in	2005-09-29 14:58:41.000000000 -0700
-+++ entrance/data/config/build_config.sh.in	2005-09-29 15:01:04.000000000 -0700
-@@ -3,7 +3,7 @@
- rm -f $DB
+--- entrance/data/config/build_config.sh.in.~1.18.~	2006-01-11 18:46:48.000000000 -0800
++++ entrance/data/config/build_config.sh.in	2006-01-11 21:52:54.000000000 -0800
+@@ -18,29 +18,14 @@
+ #ecore_config -c $DB -k /entrance/fonts/0/-s -s "/usr/share/fonts/truetype/"
+ #ecore_config -c $DB -k /entrance/fonts/1/-s -s "/usr/X11R6/lib/X11/fonts/Truetype/"
+ ecore_config -c $DB -k /entrance/greeting/before -s "Welcome to"
+-ecore_config -c $DB -k /entrance/greeting/after -s ""
+-ecore_config -c $DB -k /entrance/session/count -i 7
+-ecore_config -c $DB -k /entrance/session/0/session -s "default"
++ecore_config -c $DB -k /entrance/greeting/after -s " e17/OE"
++ecore_config -c $DB -k /entrance/session/count -i 2
++ecore_config -c $DB -k /entrance/session/0/session -s "/etc/X11/Sessions/Enlightenment"
+ ecore_config -c $DB -k /entrance/session/0/title -s "Default"
+ ecore_config -c $DB -k /entrance/session/0/icon -s "default.png"
+ ecore_config -c $DB -k /entrance/session/1/icon -s "enlightenment.png"
+ ecore_config -c $DB -k /entrance/session/1/title -s "E17"
+-ecore_config -c $DB -k /entrance/session/1/session -s "@prefix@/bin/enlightenment"
+-ecore_config -c $DB -k /entrance/session/2/session -s "kde"
+-ecore_config -c $DB -k /entrance/session/2/title -s "KDE"
+-ecore_config -c $DB -k /entrance/session/2/icon -s "kde.png"
+-ecore_config -c $DB -k /entrance/session/3/session -s "gnome"
+-ecore_config -c $DB -k /entrance/session/3/title -s "Gnome"
+-ecore_config -c $DB -k /entrance/session/3/icon -s "gnome.png"
+-ecore_config -c $DB -k /entrance/session/4/session -s "Enlightenment"
+-ecore_config -c $DB -k /entrance/session/4/title -s "E16"
+-ecore_config -c $DB -k /entrance/session/4/icon -s "enlightenment.png"
+-ecore_config -c $DB -k /entrance/session/5/session -s "xfce"
+-ecore_config -c $DB -k /entrance/session/5/title -s "XFce"
+-ecore_config -c $DB -k /entrance/session/5/icon -s "xfce.png"
+-ecore_config -c $DB -k /entrance/session/6/session -s "failsafe"
+-ecore_config -c $DB -k /entrance/session/6/title -s "Failsafe"
+-ecore_config -c $DB -k /entrance/session/6/icon -s "failsafe.png"
++ecore_config -c $DB -k /entrance/session/1/session -s "/etc/X11/Sessions/Enlightenment"
+ ecore_config -c $DB -k /entrance/system/reboot -i 1
+ ecore_config -c $DB -k /entrance/system/halt -i 1
+ ecore_config -c $DB -k /entrance/user/remember -i 1
+@@ -50,5 +35,5 @@
+ ecore_config -c $DB -k /entrance/presel/mode -i 1
  
- # set auth to 1 for pam, 2 for shadow
--ecore_config $DB set /entrance/auth int @auth_mode@
-+ecore_config $DB set /entrance/auth int 0
- 
- # uncomment the below to enable experimental OpenGL hardware acceleration
- #ecore_config $DB set /entrance/engine int 1
-@@ -18,32 +18,17 @@
- #ecore_config $DB set /entrance/fonts/0/str str "/usr/share/fonts/truetype/"
- #ecore_config $DB set /entrance/fonts/1/str str "/usr/X11R6/lib/X11/fonts/Truetype/"
- ecore_config $DB set /entrance/greeting/before str "Welcome to"
--ecore_config $DB set /entrance/greeting/after str ""
--ecore_config $DB set /entrance/session/count int 8
--ecore_config $DB set /entrance/session/0/session str "default"
-+ecore_config $DB set /entrance/greeting/after str " e17/OE"
-+ecore_config $DB set /entrance/session/count int 3
-+ecore_config $DB set /entrance/session/0/session str "/etc/X11/Sessions/Enlightenment"
- ecore_config $DB set /entrance/session/0/title str "Default"
- ecore_config $DB set /entrance/session/0/icon str "default.png"
- ecore_config $DB set /entrance/session/1/icon str "enlightenment.png"
- ecore_config $DB set /entrance/session/1/title str "Enlightenment"
--ecore_config $DB set /entrance/session/1/session str "Enlightenment"
--ecore_config $DB set /entrance/session/2/session str "kde"
--ecore_config $DB set /entrance/session/2/title str "KDE"
--ecore_config $DB set /entrance/session/2/icon str "kde.png"
--ecore_config $DB set /entrance/session/3/session str "gnome"
--ecore_config $DB set /entrance/session/3/title str "Gnome"
--ecore_config $DB set /entrance/session/3/icon str "gnome.png"
--ecore_config $DB set /entrance/session/4/session str "blackbox"
--ecore_config $DB set /entrance/session/4/title str "Blackbox"
--ecore_config $DB set /entrance/session/4/icon str "blackbox.png"
--ecore_config $DB set /entrance/session/5/session str "sawfish"
--ecore_config $DB set /entrance/session/5/title str "Sawfish"
--ecore_config $DB set /entrance/session/5/icon str "default.png"
--ecore_config $DB set /entrance/session/6/session str "xfce"
--ecore_config $DB set /entrance/session/6/title str "XFce"
--ecore_config $DB set /entrance/session/6/icon str "xfce.png"
--ecore_config $DB set /entrance/session/7/session str "failsafe"
--ecore_config $DB set /entrance/session/7/title str "Failsafe"
--ecore_config $DB set /entrance/session/7/icon str "failsafe.png"
-+ecore_config $DB set /entrance/session/1/session str "/etc/X11/Sessions/Enlightenment"
-+ecore_config $DB set /entrance/session/2/session str "/etc/X11/Sessions/Failsafe"
-+ecore_config $DB set /entrance/session/2/title str "Failsafe"
-+ecore_config $DB set /entrance/session/2/icon str "failsafe.png"
- ecore_config $DB set /entrance/system/reboot int 1
- ecore_config $DB set /entrance/system/halt int 1
- ecore_config $DB set /entrance/user/remember int 1
+ # for Entranced
+-ecore_config -c $DB -k /entranced/xserver -s "/usr/X11R6/bin/X -quiet -nolisten tcp"
++ecore_config -c $DB -k /entranced/xserver -s "/etc/X11/Xserver"
+ ecore_config -c $DB -k /entranced/attempts -i 5