Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=a121003b784b75c77aeb1a560272ab60468bf952
commit a121003b784b75c77aeb1a560272ab60468bf952
Author: James Buren <[EMAIL PROTECTED]>
Date: Sat Jun 21 13:19:29 2008 -0500
rox-session-0.40.0-1-i686
* added oroborox to depends
* added a desktop/launcher for rox-session (for DM login via system)
* tweaked source to fallback to oroborox if it can't find anything
* else?
diff --git a/source/rox-extra/rox-session/FrugalBuild
b/source/rox-extra/rox-session/FrugalBuild
index f8b7a96..976b441 100644
--- a/source/rox-extra/rox-session/FrugalBuild
+++ b/source/rox-extra/rox-session/FrugalBuild
@@ -8,10 +8,22 @@ pkgdesc="Session manager for ROX desktop."
_F_rox_name=ROX-Session
options=('scriptlet')
Finclude rox
-rodepends=('rox-filer' 'dbus-python' 'dbus-x11')
+rodepends=('rox-filer' 'dbus-python' 'dbus-x11' 'oroborox')
depends=('gtk+2' 'glibc' 'freetype2' 'libxau' 'libxdmcp' 'dbus-glib' 'libxtst'
'libxxf86vm' 'libxdamage')
groups=([EMAIL PROTECTED] 'rox-core')
archs=('i686')
-sha1sums=('c41010c0364c8e9fcac02e7e4cfda6684e798460')
+source=([EMAIL PROTECTED] rox-session rox.desktop)
+sha1sums=('c41010c0364c8e9fcac02e7e4cfda6684e798460' \
+ '769b67010f80fde67bd1de8217f53c04a09ebdc5' \
+ 'bd6da8ce95ab78023f283e732d90888d66ed2ca9')
+build()
+{
+ # tweak source code to use oroborox if nothing else is available
+ # very essential to first launch for a new user, at least
+ sed -i 's|twm|oroborox|' $_F_rox_name/src/wm.c || Fdie
+ Fbuild_rox
+ Fexe /usr/bin/rox-session
+ Ffile /etc/X11/sessions/rox.desktop
+}
# optimization OK
diff --git a/source/rox-extra/rox-session/rox-session
b/source/rox-extra/rox-session/rox-session
new file mode 100644
index 0000000..2da84d4
--- /dev/null
+++ b/source/rox-extra/rox-session/rox-session
@@ -0,0 +1,46 @@
+#!/bin/sh
+# This file was created by ROX-Session.
+
+if [ -d ${HOME}/bin ] && echo $PATH | grep -qv ${HOME}/bin ; then
+ PATH="${HOME}/bin:${PATH}"
+fi
+
+# Step 1: Try to run ROX-Session. If it works, stop right here.
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] ; then
+ DBUS_LAUNCH="dbus-launch --exit-with-session"
+else
+ DBUS_LAUNCH=
+fi
+
+if [ -x "/usr/share/Apps/ROX-Session/AppRun" ]; then
+ exec $DBUS_LAUNCH "/usr/share/Apps/ROX-Session/AppRun" -w
+fi
+
+# Step 2: It didn't work. Try to provide a failsafe login so the user
+# can fix things.
+
+# Load a window manager. Keep trying until we find one that works!
+
+for wm in openbox xfwm4 sawfish enlightenment wmaker icewm blackbox fluxbox \
+ metacity kwin kwm fvwm2 fvwm 4Dwm twm; do
+ if [ -x "`which $wm`" ]; then break; fi;
+done
+
+"$wm" &
+
+xmessage -file - << END
+.xsession: failed to run /usr/share/Apps/ROX-Session/AppRun - maybe you moved
or deleted it?
+
+I'll try to give you an xterm and a filer window instead - try to find
+and run ROX-Session to fix the problem. Close the xterm to logout.
+
+If all else fails, delete your .xsession and .xinitrc files to get the
+system defaults.
+
+Report any problems to:
+http://rox.sourceforge.net/phpwiki/index.php/MailingLists
+
+Good luck!
+END
+rox &
+exec xterm
diff --git a/source/rox-extra/rox-session/rox.desktop
b/source/rox-extra/rox-session/rox.desktop
new file mode 100644
index 0000000..eebcc34
--- /dev/null
+++ b/source/rox-extra/rox-session/rox.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=rox
+Comment=A desktop environment which tries to bring features of RISC OS to UNIX.
+Exec=rox-session
+Icon=
+Type=Application
+
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
