Tue Apr 5 14:26:38 UTC 2011

3 files changed, 109 insertions, 0 deletions

diff --git a/extra/openbox/PKGBUILD b/extra/openbox/PKGBUILD
new file mode 100644
index 000000000..a71e0b16a
--- /dev/null
+++ b/extra/openbox/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 89725 2010-09-03 12:51:52Z remy $
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: tobias <tobias@archlinux.org>
+# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
+
+pkgname=openbox
+pkgver=3.4.11.2
+pkgrel=2
+pkgdesc="A window manager for the X11 windowing system"
+arch=('i686' 'x86_64')
+url="http://openbox.org"
+license=('GPL')
+depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr'
+	'libxcursor' 'pango')
+optdepends=('pyxdg: for the xdg-autostart script')
+groups=('lxde')
+install=${pkgname}.install
+options=('!libtool' 'force')
+backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml')
+source=(http://www.icculus.org/openbox/releases/${pkgname}-${pkgver}.tar.gz
+	'which-2.20.patch')
+md5sums=('30e669134fa81df810fe7d1dc59cd931'
+         'ec5e3d4d74779b0ca576a053ae54124d')
+
+build() {
+	cd ${srcdir}/${pkgname}-${pkgver}
+
+	# FS#11455
+	patch -Np1 -i ${srcdir}/which-2.20.patch || return 1
+        sed -i 's#python#python2#' tools/xdg-autostart/xdg-autostart
+	./configure --prefix=/usr \
+	    --with-x \
+	    --enable-startup-notification \
+	    --sysconfdir=/etc
+	make || return 1
+}
+
+package() {
+	cd ${srcdir}/${pkgname}-${pkgver}
+
+	make DESTDIR=${pkgdir} install
+
+	sed -i "s:startkde:/usr/bin/\0:" \
+	    ${pkgdir}/usr/share/xsessions/openbox-kde.desktop
+	sed -i "s:=gnome-session:=/usr/bin/gnome-session:" \
+	    ${pkgdir}/usr/share/xsessions/openbox-gnome.desktop
+}
diff --git a/extra/openbox/openbox.install b/extra/openbox/openbox.install
new file mode 100644
index 000000000..301c22127
--- /dev/null
+++ b/extra/openbox/openbox.install
@@ -0,0 +1,9 @@
+post_install() {
+    echo "Place menu.xml, rc.xml and autostart.sh in ~/.config/openbox"
+    echo "They can be found in /etc/xdg/openbox"
+}
+
+post_upgrade() {
+  post_install
+}
+
diff --git a/extra/openbox/which-2.20.patch b/extra/openbox/which-2.20.patch
new file mode 100644
index 000000000..7f663ae49
--- /dev/null
+++ b/extra/openbox/which-2.20.patch
@@ -0,0 +1,53 @@
+--- openbox-3.4.11.1/data/autostart.sh.in	2010-03-14 09:40:37.000000000 -0500
++++ openbox-3.4.11.1/data/autostart.sh.in	2010-03-26 14:44:36.000000000 -0500
+@@ -3,13 +3,13 @@
+ 
+ # Set a background color
+ BG=""
+-if which hsetroot >/dev/null; then
++if which hsetroot >/dev/null 2>&1; then
+     BG=hsetroot
+ else
+-    if which esetroot >/dev/null; then
++    if which esetroot >/dev/null 2>&1; then
+ 	BG=esetroot
+     else
+-	if which xsetroot >/dev/null; then
++	if which xsetroot >/dev/null 2>&1; then
+ 	    BG=xsetroot
+ 	fi
+     fi
+@@ -17,28 +17,28 @@
+ test -z $BG || $BG -solid "#303030"
+ 
+ # D-bus
+-if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
++if which dbus-launch >/dev/null 2>&1 && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+        eval `dbus-launch --sh-syntax --exit-with-session`
+ fi
+ 
+ # Make GTK apps look and behave how they were set up in the gnome config tools
+ if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then
+   @libexecdir@/gnome-settings-daemon &
+-elif which gnome-settings-daemon >/dev/null; then
++elif which gnome-settings-daemon >/dev/null 2>&1; then
+   gnome-settings-daemon &
+ # Make GTK apps look and behave how they were set up in the XFCE config tools
+-elif which xfce-mcs-manager >/dev/null; then
++elif which xfce-mcs-manager >/dev/null 2>&1; then
+   xfce-mcs-manager n &
+ fi
+ 
+ # Preload stuff for KDE apps
+-if which start_kdeinit >/dev/null; then
++if which start_kdeinit >/dev/null 2>&1; then
+   LD_BIND_NOW=true start_kdeinit --new-startup +kcminit_startup &
+ fi
+ 
+ # Run XDG autostart things.  By default don't run anything desktop-specific
+ # See xdg-autostart --help more info
+ DESKTOP_ENV="OPENBOX"
+-if which @secretbindir@/xdg-autostart >/dev/null; then
++if which @secretbindir@/xdg-autostart >/dev/null 2>&1; then
+   @secretbindir@/xdg-autostart $DESKTOP_ENV
+ fi