Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/openbox/PKGBUILD
	community/powertop/PKGBUILD
	core/libusb-compat/PKGBUILD
	core/openssl/PKGBUILD
	extra/libvpx/PKGBUILD
	extra/php-apc/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/xfce4-genmon-plugin/PKGBUILD
	extra/xorg-server/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/lib32-cairo/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-libffi/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/lib32-llvm/PKGBUILD
	multilib/wine/PKGBUILD
	testing/mdadm/PKGBUILD
	testing/php/PKGBUILD
	testing/xorg-server/PKGBUILD
	testing/xorg-server/git-fixes.patch

3 files changed, 59 insertions, 23 deletions

diff --git a/community/openbox/PKGBUILD b/community/openbox/PKGBUILD
index 4659f948a..f5d92d960 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 70588 2012-05-12 09:12:54Z 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=7
+pkgdesc="A highly configurable and lightweight X11 window manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://openbox.org"
 license=('GPL')
@@ -18,34 +18,40 @@ 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
+        title-matching.patch)
 md5sums=('00441b53cf14c03566c8e82643544ff9'
-         '7ca3b5244bb092d46f5bcf1e2bdf4a18')
+         '7ca3b5244bb092d46f5bcf1e2bdf4a18'
+         'e09d77842aac9a0cd7eebe112df88383'
+         '6f99711eee0b1c413dca9fa691917b71')
 
 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
+    patch -Np0 -i "${srcdir}"/title-matching.patch  # FS#5277 on Openbox bugtracker
+
+    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 !
diff --git a/community/openbox/title-matching.patch b/community/openbox/title-matching.patch
new file mode 100644
index 000000000..88ed73546
--- /dev/null
+++ b/community/openbox/title-matching.patch
@@ -0,0 +1,11 @@
+--- openbox/client.c    2011-08-01 22:14:58.000000000 +0200
++++ 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;