sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Arjan Bouter (f1724f4364b736f135cabb972333bbb4327d3990)
- From: Arjan Bouter <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (f1724f4364b736f135cabb972333bbb4327d3990)
- Date: Tue, 10 Jun 2008 09:48:24 -0500
GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:
ChangeLog | 3 +
windowmanagers/fluxbox/DETAILS | 2 -
windowmanagers/fluxbox/HISTORY | 3 +
windowmanagers/rox-session/BUILD | 1
windowmanagers/rox-session/DEPENDS | 3 +
windowmanagers/rox-session/DETAILS | 16 ++++++++++
windowmanagers/rox-session/HISTORY | 3 +
windowmanagers/rox-session/INSTALL | 3 +
windowmanagers/rox-session/rox-session | 50
+++++++++++++++++++++++++++++++++
windowmanagers/rox-session/rox.desktop | 7 ++++
10 files changed, 90 insertions(+), 1 deletion(-)
New commits:
commit f1724f4364b736f135cabb972333bbb4327d3990
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
rox-session: new spell, rox based X session
commit 03c6915b700c09c1042157d463217fad9f7ad1c3
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
fluxbox: fixed source dir for not-auto-updating-git version
diff --git a/ChangeLog b/ChangeLog
index fea6b61..3c2cbf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-06-10 Arjan Bouter <abouter AT sourcemage.org>
+ * windowmanagers/rox-session: new spell, rox based session
+
2008-06-09 Thomas Orgis <sobukus AT sourcemage.org>
* volatiles: added some (icon/mime) caches
diff --git a/windowmanagers/fluxbox/DETAILS b/windowmanagers/fluxbox/DETAILS
index d0d85a1..1347189 100755
--- a/windowmanagers/fluxbox/DETAILS
+++ b/windowmanagers/fluxbox/DETAILS
@@ -8,7 +8,7 @@ if [ "$FLUXBOX_SVN" == "y" ]; then
SOURCE=$SPELL-git.tar.bz2
SOURCE_URL[0]=git://git.fluxbox.org/fluxbox.git:fluxbox
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
SOURCE_IGNORE=volatile
else
VERSION=1.0.0
diff --git a/windowmanagers/fluxbox/HISTORY b/windowmanagers/fluxbox/HISTORY
index 741ac13..b5008f9 100644
--- a/windowmanagers/fluxbox/HISTORY
+++ b/windowmanagers/fluxbox/HISTORY
@@ -1,3 +1,6 @@
+2008-06-10 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: fixed source dir for not auto-updating svn version
+
2008-04-17 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: added gcc 4.3 patch
diff --git a/windowmanagers/rox-session/BUILD
b/windowmanagers/rox-session/BUILD
new file mode 100755
index 0000000..abef54c
--- /dev/null
+++ b/windowmanagers/rox-session/BUILD
@@ -0,0 +1 @@
+./AppRun --compile
diff --git a/windowmanagers/rox-session/DEPENDS
b/windowmanagers/rox-session/DEPENDS
new file mode 100755
index 0000000..d36704c
--- /dev/null
+++ b/windowmanagers/rox-session/DEPENDS
@@ -0,0 +1,3 @@
+depends rox &&
+depends dbus &&
+depends rox-lib2
diff --git a/windowmanagers/rox-session/DETAILS
b/windowmanagers/rox-session/DETAILS
new file mode 100755
index 0000000..94c2ec8
--- /dev/null
+++ b/windowmanagers/rox-session/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=rox-session
+ VERSION=0.40.0
+ SOURCE=rox-session-$VERSION.tar.gz
+ SOURCE_URL[1]=$SOURCEFORGE_URL/rox/$SOURCE
+
SOURCE_HASH=sha512:33c307763d6c89fc589512635933c2ded2832f8f1a7a36fe4d1374fde049cb552d3e0afab6d8278850d5b012608ee8669d62a714e28007d84eae66851f8be81c
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ROX-Session
+ WEB_SITE=http://rox.sourceforge.net/
+ ENTERED=20080610
+ LICENSE[0]=GPL
+ SHORT="ROX session manager"
+cat << EOF
+ROX-Session is a simple session manager. It loads, runs any programs you
asked it to,
+and then quits when you run it a second time (thus ending your session).
+It does not display any windows until you ask it to quit.
+ROX-Session will automatically run any programs in your AutoStart directory
when you log in.
+EOF
diff --git a/windowmanagers/rox-session/HISTORY
b/windowmanagers/rox-session/HISTORY
new file mode 100644
index 0000000..c45e662
--- /dev/null
+++ b/windowmanagers/rox-session/HISTORY
@@ -0,0 +1,3 @@
+2008-06-10 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS, DEPENDS, BUILD, INSTALL, HISTORY,
+ rox.desktop, rox-session: created spell
diff --git a/windowmanagers/rox-session/INSTALL
b/windowmanagers/rox-session/INSTALL
new file mode 100755
index 0000000..5b31cfb
--- /dev/null
+++ b/windowmanagers/rox-session/INSTALL
@@ -0,0 +1,3 @@
+cp -a $SOURCE_DIRECTORY $INSTALL_ROOT/usr/libexec/rox/ &&
+cp $SCRIPT_DIRECTORY/rox.desktop /usr/share/xsessions/ &&
+cp $SCRIPT_DIRECTORY/rox-session /usr/bin
diff --git a/windowmanagers/rox-session/rox-session
b/windowmanagers/rox-session/rox-session
new file mode 100755
index 0000000..3184f51
--- /dev/null
+++ b/windowmanagers/rox-session/rox-session
@@ -0,0 +1,50 @@
+#!/bin/sh
+# This file was created by ROX-Session and edited for Source Mage GNU/Linux
by Arjan Bouter.
+
+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 "`which 0launch`" ]; then
+ exec $DBUS_LAUNCH 0launch
http://rox.sourceforge.net/2005/interfaces/ROX-Session -w
+fi
+
+if [ -x "/usr/libexec/rox/ROX-Session/AppRun" ]; then
+ exec $DBUS_LAUNCH "/usr/libexec/rox/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/libexec/rox/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/windowmanagers/rox-session/rox.desktop
b/windowmanagers/rox-session/rox.desktop
new file mode 100644
index 0000000..3958d0b
--- /dev/null
+++ b/windowmanagers/rox-session/rox.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+
+Encoding=UTF-8
+Name=ROX
+Comment=This session logs you into the ROX desktop
+Exec=/usr/bin/rox-session
+Type=Application
- [SM-Commit] GIT changes to master grimoire by Arjan Bouter (f1724f4364b736f135cabb972333bbb4327d3990), Arjan Bouter, 06/10/2008
Archive powered by MHonArc 2.6.24.