add openbox as WindowManager

packages/virtual/Xorg/init.d/65_xorg

@@ -2,7 +2,7 @@
 #
 # configure X.Org video settings
 #
-# runlevels: openelec, debug, configure
+# runlevels: openelec, configure
 
 . /etc/sysconfig
 
@@ -14,6 +14,5 @@ mkdir -p /var/lib/xkb/
 if /usr/bin/test "${ELISA_DEBUG}" = "yes" ; then
   mount -o bind /storage /var/log
 fi
-#  mount -o bind /storage /var/tmp
 
 xinit $XINITRC -- $XSERVERRC

packages/virtual/Xorg/install

@@ -33,9 +33,11 @@ $SCRIPTS/install xf86-video-nv
 #$SCRIPTS/install read-edid
 $SCRIPTS/install xinit
 #+$SCRIPTS/install pciutils
-$SCRIPTS/install evilwm-ewmh
+#$SCRIPTS/install evilwm-ewmh
 #$SCRIPTS/install ratpoison
-#mkdir -p $INSTALL/usr/bin
+$SCRIPTS/install openbox
+
+mkdir -p $INSTALL/usr/bin
 #cp $PKG_DIR/scripts/oe_wrapper $INSTALL/usr/bin
 #cp $PKG_DIR/scripts/startx $INSTALL/usr/bin
 

packages/x11/app/xinit/scripts/xinitrc.d/20_windowmanager

@@ -8,12 +8,6 @@
 
 args=""
 
-if test -f /usr/bin/mrxvt; then
-    args="${args} -term /usr/bin/mrxvt"
-fi
-
 if /usr/bin/test "${OE_X_WM_ENABLED}" = "yes" ; then
-  /usr/bin/evilwm -fn ${WM_FONT} ${args}> /dev/null 2>&1 &
+  /usr/bin/openbox > /dev/null 2>&1 &
 fi
-
-#    /usr/bin/evilwm -fn ${WM_FONT} ${args}> /dev/null 2>&1 &

packages/x11/other/evilwm-ewmh/build

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-. config/options
-
-$SCRIPTS/build toolchain
-$SCRIPTS/build libX11
-$SCRIPTS/build libXext
-$SCRIPTS/build libXrandr
-
-cd $BUILD/$1*
-
-make CC=$TARGET_CC XROOT=$SYSROOT_PREFIX/usr
-
-$STRIP evilwm

packages/x11/other/evilwm-ewmh/install

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-. config/options
-$SCRIPTS/install libX11
-$SCRIPTS/install libXext
-$SCRIPTS/install libXrandr
-
-mkdir -p $INSTALL/usr/bin
-cp $BUILD/$1*/evilwm $INSTALL/usr/bin
-

packages/x11/other/evilwm-ewmh/unpack

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-. config/options
-
-$SCRIPTS/fixconfigtools $BUILD/$1*/support
-
-sed -i 's/^#define DEF_FONT.*/#define DEF_FONT "fixed"/' $BUILD/$1*/evilwm.h
-sed -i -e '/^CFLAGS/s/ -Os/ /' \
-       -e 's/install -s /install /' $BUILD/$1*/Makefile

packages/x11/other/evilwm-ewmh/url

@@ -1 +0,0 @@
-http://www.6809.org.uk/tmp/evilwm/evilwm-ewmh.tar.bz2

packages/x11/other/evilwm/build

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-. config/options
-
-$SCRIPTS/build toolchain
-$SCRIPTS/build libX11
-$SCRIPTS/build libXext
-$SCRIPTS/build libXrandr
-
-cd $BUILD/$1*
-
-make CC=$TARGET_CC XROOT=$SYSROOT_PREFIX/usr
-
-$STRIP $1

packages/x11/other/evilwm/install

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-. config/options
-$SCRIPTS/install libX11
-$SCRIPTS/install libXext
-$SCRIPTS/install libXrandr
-
-mkdir -p $INSTALL/usr/bin
-cp $BUILD/$1*/$1 $INSTALL/usr/bin
-

packages/x11/other/evilwm/url

@@ -1 +0,0 @@
-http://www.6809.org.uk/evilwm/evilwm-1.0.0.tar.gz

packages/x11/other/openbox/build

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+. config/options
+
+$SCRIPTS/build toolchain
+$SCRIPTS/build libX11
+
+cd $BUILD/$1*
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --disable-static \
+            --enable-shared \
+            --x-includes=$SYSROOT_PREFIX/usr/include \
+            --x-libraries=$SYSROOT_PREFIX/usr/lib \
+            --disable-nls \
+            --disable-startup-notification \
+            --disable-xcursor \
+            --disable-session-management \
+ 
+make
+
+$STRIP $1/.libs/$1
+
+$STRIP parser/.libs/*.so*
+$STRIP render/.libs/*.so*

packages/x11/other/openbox/install

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+. config/options
+$SCRIPTS/install libX11
+$SCRIPTS/install libXinerama
+
+mkdir -p $INSTALL/usr/bin
+cp $BUILD/$1*/$1/.libs/$1 $INSTALL/usr/bin
+
+mkdir -p $INSTALL/usr/lib
+cp $BUILD/$1*/parser/.libs/*.so* $INSTALL/usr/lib
+cp $BUILD/$1*/render/.libs/*.so* $INSTALL/usr/lib
+rm -rf $INSTALL/usr/lib/libobrender.*T
+
+mkdir -p $INSTALL/usr/share/themes
+cp -RP $BUILD/$1*/themes/Clearlooks $INSTALL/usr/share/themes

packages/x11/other/openbox/url

@@ -0,0 +1 @@
+http://icculus.org/openbox/releases/openbox-3.4.7.2.tar.gz