From e8aea505d7f36277edd02ef965bc3f8e1c81ee5d Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 13 May 2012 00:05:25 +0000
Subject: Sun May 13 00:05:24 UTC 2012

---
 community/openbox/PKGBUILD       | 49 +++++++++++++++++++++-------------------
 community/openbox/movesize.patch | 19 ++++++++++++++++
 2 files changed, 45 insertions(+), 23 deletions(-)
 create mode 100644 community/openbox/movesize.patch

(limited to 'community/openbox')

diff --git a/community/openbox/PKGBUILD b/community/openbox/PKGBUILD
index 7c990c9fa..518ab71af 100644
--- a/community/openbox/PKGBUILD
+++ b/community/openbox/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64899 2012-02-18 19:57:32Z bpiotrowski $
+# $Id: PKGBUILD 70562 2012-05-11 14:02:30Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,8 +6,8 @@
 
 pkgname=openbox
 pkgver=3.5.0
-pkgrel=5
-pkgdesc="A window manager for the X11 windowing system"
+pkgrel=6
+pkgdesc="A highly configurable and lightweight X11 window manager"
 arch=('i686' 'x86_64')
 url="http://openbox.org"
 license=('GPL')
@@ -18,34 +18,37 @@ groups=('lxde')
 install=${pkgname}.install
 options=('!libtool')
 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')
+source=(http://www.icculus.org/openbox/releases/${pkgname}-${pkgver}.tar.gz
+        which-2.20.patch
+        movesize.patch)
 md5sums=('00441b53cf14c03566c8e82643544ff9'
-         '7ca3b5244bb092d46f5bcf1e2bdf4a18')
+         '7ca3b5244bb092d46f5bcf1e2bdf4a18'
+         'e09d77842aac9a0cd7eebe112df88383')
 
 build() {
-  	cd "${srcdir}"/${pkgname}-${pkgver}
+    cd "${srcdir}"/${pkgname}-${pkgver}
 
-  	# FS#11455
-  	patch -p1 -i "${srcdir}"/which-2.20.patch
-  	sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
-  		data/autostart/openbox-xdg-autostart
+    patch -Np1 -i "${srcdir}"/which-2.20.patch  # FS#11455
+    patch -Np1 -i "${srcdir}"/movesize.patch    # FS#29812
+
+    sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
+            data/autostart/openbox-xdg-autostart
   
-	./configure --prefix=/usr \
-    		--with-x \
-    		--enable-startup-notification \
-    		--sysconfdir=/etc \
-		    --libexecdir=/usr/lib/openbox
+    ./configure --prefix=/usr \
+                --with-x \
+                --enable-startup-notification \
+                --sysconfdir=/etc \
+                --libexecdir=/usr/lib/openbox
   
-	make
+    make
 }
 
 package() {
-  	cd "${srcdir}"/${pkgname}-${pkgver}
-  	make DESTDIR="${pkgdir}" install
+    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
+    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/movesize.patch b/community/openbox/movesize.patch
new file mode 100644
index 000000000..4f0e8595e
--- /dev/null
+++ b/community/openbox/movesize.patch
@@ -0,0 +1,19 @@
+--- openbox-3.5.0/openbox/moveresize.c.orig	2011-08-01 21:14:58.000000000 +0100
++++ openbox-3.5.0/openbox/moveresize.c	2012-03-28 20:04:36.100459920 +0100
+@@ -326,6 +326,16 @@ void moveresize_end(gboolean cancel)
+ #endif
+     }
+ 
++    if (!moveresize_client) {
++        ob_debug("moveresize_end: moveresize_client is NULL!");
++        return;
++    }
++
++    if (!moveresize_in_progress) {
++        ob_debug("moveresize_end: moveresize_in_progress is FALSE!");
++        return;
++    }
++
+     /* don't use client_move() here, use the same width/height as
+        we've been using during the move, otherwise we get different results
+        when moving maximized windows between monitors of different sizes !
-- 
cgit v1.2.3-54-g00ecf