merging trunk

packages/debug/install

@@ -5,3 +5,6 @@
 $SCRIPTS/install strace
 $SCRIPTS/install gdb
 $SCRIPTS/install bootchart
+
+$SCRIPTS/install mrxvt
+$SCRIPTS/install evilwm

packages/devel/glib/build

@@ -4,6 +4,7 @@
 
 $SCRIPTS/build toolchain
 $SCRIPTS/build libiconv
+$SCRIPTS/build zlib
 $SCRIPTS/build glib-host
 
 cd $PKG_BUILD

packages/devel/glib/install

@@ -2,8 +2,10 @@
 
 . config/options
 
+$SCRIPTS/install zlib
 $SCRIPTS/install libiconv
+$SCRIPTS/install zlib
 
 mkdir -p $INSTALL/usr/lib
-  cp -PR `find $PKG_BUILD/.build-target/g{lib,module,object,thread,io} -name *.so*` $INSTALL/usr/lib
-  rm -rf $INSTALL/usr/lib/libg{lib,module,object,thread,io}*.so*T
+  cp -P `find $PKG_BUILD/.build-target/g{lib,module,object,thread,io} -name *.so*` $INSTALL/usr/lib
+  rm -rf $INSTALL/usr/lib/libg{lib,module,object,thread,io}*.so*T

packages/mediacenter/xbmc/scripts/xbmc-session

@@ -13,7 +13,9 @@ fi
 
 while true; do
 
-  [ "$START_WM" = "yes" ] && $WINDOWMANAGER &
+  if [ "$START_WM" = "yes" ]; then
+    $WINDOWMANAGER &
+  fi
 
   $IONICE $XBMC_BIN $XBMC_ARGS $@ > /dev/null 2>&1
   RET=$?

packages/network/connman/init.d/40_connman

@@ -6,4 +6,6 @@ progress "Starting Connection Manager"
 
   $IONICE mkdir -p /var/run
   $IONICE touch /var/run/resolv.conf
+
   connmand
+  udhcpc  > /dev/null 2>&1 &

packages/network/connman/install

@@ -15,13 +15,13 @@ add_user system x 430 430 "service" "/var/run/connman" "/bin/sh"
 add_group system 430
 
 mkdir -p $INSTALL/usr/sbin
-  cp -PR $PKG_BUILD/src/connmand $INSTALL/usr/sbin
+  cp -P $PKG_BUILD/src/connmand $INSTALL/usr/sbin
 
 mkdir -p $INSTALL/usr/lib/connman/plugins
-  cp -PR $PKG_BUILD/plugins/.libs/*.so $INSTALL/usr/lib/connman/plugins
+  cp -P $PKG_BUILD/plugins/.libs/*.so $INSTALL/usr/lib/connman/plugins
 
 mkdir -p $INSTALL/usr/lib/connman/scripts
-  cp -PR $PKG_BUILD/scripts/udhcpc-script $INSTALL/usr/lib/connman/scripts
+  cp -P $PKG_BUILD/scripts/udhcpc-script $INSTALL/usr/lib/connman/scripts
 
 mkdir -p $INSTALL/etc/dbus-1/system.d
-  cp -PR $PKG_BUILD/src/connman-dbus.conf $INSTALL/etc/dbus-1/system.d
+  cp -P $PKG_BUILD/src/connman-dbus.conf $INSTALL/etc/dbus-1/system.d

packages/x11/other/evilwm/build

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+. config/options
+
+$SCRIPTS/build toolchain
+$SCRIPTS/build libX11
+$SCRIPTS/build libXrandr
+$SCRIPTS/build libXext
+
+cd $PKG_BUILD
+
+make CC=$TARGET_CC
+

packages/x11/other/evilwm/install

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+. config/options
+
+$SCRIPTS/install libX11
+$SCRIPTS/install libXrandr
+$SCRIPTS/install libXext
+
+PKG_DIR=`find $PACKAGES -type d -name $1`
+
+mkdir -p $INSTALL/usr/bin
+  cp -PR $PKG_BUILD/$1 $INSTALL/usr/bin
+
+# other usefull packages
+$SCRIPTS/install xwd

packages/x11/other/evilwm/profile.d/evilwm.conf

@@ -0,0 +1,24 @@
+################################################################################
+# Windowmanager environment variables.
+#
+# This file contains non-OpenELEC evironment variables as well as OpenELEC
+# evironment variables that are not user defined.
+################################################################################
+
+# [-display display] [-term termprog] [-fn fontname]
+# [-fg foreground] [-fc fixed] [-bg background] [-bw borderwidth]
+# [-mask1 modifiers] [-mask2 modifiers] [-altmask modifiers]
+# [-snap num] [-app name/class] [-g geometry] [-dock]
+# [-v vdesk] [-s] [-nosoliddrag] [-V]
+
+if [ "$DEBUG" = "yes" ]; then
+  EVILWM_ARG="$EVILWM_ARG -fg red -bw 3"
+else
+  EVILWM_ARG="$EVILWM_ARG -fg black -bw 0"
+fi
+
+EVILWM_ARG="-fn fixed $EVILWM_ARG"
+
+WINDOWMANAGER="evilwm $EVILWM_ARG"
+
+export WINDOWMANAGER

packages/x11/other/evilwm/url

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

packages/x11/other/mrxvt/scripts/mrxvt-session

@@ -2,6 +2,8 @@
 
 . /etc/profile
 
-[ $START_WM="yes" ] && $WINDOWMANAGER &
+# start Windowmanager by default
+  $WINDOWMANAGER -term mrxvt &
 
-mrxvt
+# start terminal
+  mrxvt

packages/x11/other/uxlaunch/init.d/60_uxlaunch

@@ -9,7 +9,7 @@ progress "starting uxlaunch"
   XORG_CONF="/etc/X11/xorg.conf"
   XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf"
 
-  if [ "$START_MRXVT" = "yes" ]; then
+  if [ "$START_MRXVT" = "yes" -a -f /usr/bin/mrxvt-session ]; then
     UX_SESSION="/usr/bin/mrxvt-session"
   else
     UX_SESSION="/usr/bin/xbmc-session"

packages/x11/xserver/xorg-server/install

@@ -83,7 +83,3 @@ mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor/
   $SCRIPTS/install pciutils
   $SCRIPTS/install uxlaunch
 
-  if [ "$DEVTOOLS" = yes ]; then
-    $SCRIPTS/install ratpoison
-    $SCRIPTS/install mrxvt
-  fi