Fri Jul 19 01:09:18 PDT 2013

4 files changed, 110 insertions, 0 deletions

diff --git a/community/openbox/PKGBUILD b/community/openbox/PKGBUILD
new file mode 100644
index 000000000..a3b6fd69e
--- /dev/null
+++ b/community/openbox/PKGBUILD
@@ -0,0 +1,60 @@
+# $Id: PKGBUILD 93636 2013-07-08 07:28:15Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: Brad Fanella <bradfanella@archlinux.us>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: tobias <tobias@archlinux.org>
+
+pkgname=openbox
+pkgver=3.5.0
+pkgrel=9
+pkgdesc='Highly configurable and lightweight X11 window manager'
+arch=('i686' 'x86_64')
+url='http://openbox.org'
+license=('GPL')
+depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr'
+         'libxcursor' 'pango' 'imlib2')
+optdepends=('python2: for the xdg-autostart script')
+groups=('lxde')
+options=('!libtool')
+backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml'
+        'etc/xdg/openbox/autostart' 'etc/xdg/openbox/environment')
+source=(http://www.icculus.org/openbox/releases/$pkgname-$pkgver.tar.gz
+        openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch
+        openbox-3.5.0-title-matching.patch
+        openbox-3.5.0-which-2.20.patch)
+md5sums=('00441b53cf14c03566c8e82643544ff9'
+         'f2e5198a9dfc803c59fd42448a85f2da'
+         '0a11d7149da210a31ef88f8a9c717711'
+         '7ca3b5244bb092d46f5bcf1e2bdf4a18')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  patch -Np1 -i "$srcdir"/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch # FS#29812
+  patch -Np1 -i "$srcdir"/openbox-3.5.0-title-matching.patch  # OB#5277
+  patch -Np1 -i "$srcdir"/openbox-3.5.0-which-2.20.patch # FS#11455
+
+  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
+    data/autostart/openbox-xdg-autostart
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr \
+    --with-x \
+    --enable-startup-notification \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/openbox
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  rm "$pkgdir"/usr/bin/{gdm-control,gnome-panel-control}
+
+  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/community/openbox/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch b/community/openbox/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch
new file mode 100644
index 000000000..174482da4
--- /dev/null
+++ b/community/openbox/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch
@@ -0,0 +1,28 @@
+From 339c19d1b3a7a5139aed8b59bad755ddd0e518ff Mon Sep 17 00:00:00 2001
+From: Mikael Magnusson <mikachu@gmail.com>
+Date: Sun, 3 Jun 2012 20:18:48 +0200
+Subject: [PATCH] Fix crash on unexpected NET_WM_MOVERESIZE_CANCEL messages
+
+gtk+ 3.4 apparently sends these randomly when you select text in a
+GtkEntry. This also fixes bug #5460.
+---
+ openbox/event.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/openbox/event.c b/openbox/event.c
+index b9ec1c5..4d091bf 100644
+--- a/openbox/event.c
++++ b/openbox/event.c
+@@ -1495,7 +1495,8 @@ static void event_handle_client(ObClient *client, XEvent *e)
+             }
+             else if ((Atom)e->xclient.data.l[2] ==
+                      OBT_PROP_ATOM(NET_WM_MOVERESIZE_CANCEL))
+-                moveresize_end(TRUE);
++                if (moveresize_client)
++                    moveresize_end(TRUE);
+         } else if (msgtype == OBT_PROP_ATOM(NET_MOVERESIZE_WINDOW)) {
+             gint ograv, x, y, w, h;
+ 
+-- 
+1.7.10
+
diff --git a/community/openbox/openbox-3.5.0-title-matching.patch b/community/openbox/openbox-3.5.0-title-matching.patch
new file mode 100644
index 000000000..fdfe28af0
--- /dev/null
+++ b/community/openbox/openbox-3.5.0-title-matching.patch
@@ -0,0 +1,11 @@
+--- openbox-3.5.0/openbox/client.c    2011-08-01 22:14:58.000000000 +0200
++++ openbox-3.5.0/openbox/client.c    2011-10-22 14:59:56.000000000 +0200
+@@ -883,7 +883,7 @@
+                  !g_pattern_match(app->role,
+                                   strlen(self->role), self->role, NULL))
+             match = FALSE;
+-        else if (app->title &&
++        else if (app->title && self->title &&
+                  !g_pattern_match(app->title,
+                                   strlen(self->title), self->title, NULL))
+             match = FALSE;
diff --git a/community/openbox/openbox-3.5.0-which-2.20.patch b/community/openbox/openbox-3.5.0-which-2.20.patch
new file mode 100644
index 000000000..f947d6a98
--- /dev/null
+++ b/community/openbox/openbox-3.5.0-which-2.20.patch
@@ -0,0 +1,11 @@
+--- openbox-3.5.0/data/autostart/autostart.in~	2011-08-02 15:50:01.963531310 +0000
++++ openbox-3.5.0/data/autostart/autostart.in	2011-08-02 15:51:57.277879458 +0000
+@@ -8,7 +8,7 @@
+ #
+ #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 &
+ #fi
+