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

Conflicts:
	community/arm-elf-binutils/PKGBUILD
	community/bird/PKGBUILD
	community/cantata/PKGBUILD
	community/dbmail/PKGBUILD
	community/ekg2/PKGBUILD
	community/ffmpeg-compat/PKGBUILD
	community/gigedit/PKGBUILD
	community/gimp-refocus/PKGBUILD
	community/gmime24/PKGBUILD
	community/gmpc/PKGBUILD
	community/gnash/PKGBUILD
	community/id3lib-rcc/PKGBUILD
	community/linuxsampler/PKGBUILD
	community/lwm/PKGBUILD
	community/midori/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mtpaint/PKGBUILD
	community/nestopia/PKGBUILD
	community/preload/PKGBUILD
	community/projectm/PKGBUILD
	community/rusxmms/PKGBUILD
	community/taglib-rcc/PKGBUILD
	community/the_silver_searcher/PKGBUILD
	community/xnee/PKGBUILD
	core/libgcrypt/PKGBUILD
	core/libusbx/PKGBUILD
	core/mkinitcpio-busybox/PKGBUILD
	extra/a2ps/PKGBUILD
	extra/a52dec/PKGBUILD
	extra/abook/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/cln/PKGBUILD
	extra/exempi/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/fluxter/PKGBUILD
	extra/fontforge/PKGBUILD
	extra/glib/PKGBUILD
	extra/gnet/PKGBUILD
	extra/gnome-vfs/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk/PKGBUILD
	extra/idnkit/PKGBUILD
	extra/ilmbase/PKGBUILD
	extra/imake/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/libdatrie/PKGBUILD
	extra/libmbim/PKGBUILD
	extra/libmp3splt/PKGBUILD
	extra/libqmi/PKGBUILD
	extra/libtxc_dxtn/PKGBUILD
	extra/libxfont/PKGBUILD
	extra/mesa/PKGBUILD
	extra/modemmanager/PKGBUILD
	extra/nedit/PKGBUILD
	extra/nmap/PKGBUILD
	extra/openexr/PKGBUILD
	extra/purple-plugin-pack/PKGBUILD
	extra/qemu/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/subversion/PKGBUILD
	extra/transmission/PKGBUILD
	extra/truecrypt/PKGBUILD
	extra/vigra/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/wxmaxima/PKGBUILD
	extra/x264/PKGBUILD
	extra/xorg-iceauth/PKGBUILD
	extra/xorg-mkfontscale/PKGBUILD
	extra/xorg-xfd/PKGBUILD
	libre/abuse-libre/PKGBUILD
	libre/clementine-libre/PKGBUILD
	libre/linux-libre/PKGBUILD

2 files changed, 48 insertions, 11 deletions

diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD
index f2e695ec7..1742a636e 100644
--- a/extra/libxcb/PKGBUILD
+++ b/extra/libxcb/PKGBUILD
@@ -1,27 +1,35 @@
-# $Id: PKGBUILD 186724 2013-05-30 19:02:49Z andyrtr $
+# $Id: PKGBUILD 191295 2013-07-23 11:13:07Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=libxcb
 pkgver=1.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 client-side library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xcb.freedesktop.org/"
-depends=('xcb-proto>=1.7' 'libxdmcp' 'libxau')
-makedepends=('pkgconfig' 'libxslt' 'python2')
+depends=('xcb-proto>=1.8-2' 'libxdmcp' 'libxau')
+makedepends=('pkgconfig' 'libxslt' 'python')
 options=('!libtool')
 license=('custom')
 source=($url/dist/$pkgname-$pkgver.tar.bz2
-        libxcb-1.1-no-pthread-stubs.patch)
+        libxcb-1.1-no-pthread-stubs.patch
+        reorder-configure.patch)
 sha256sums=('d44a5ff4eb0b9569e6f7183b51fdaf6f58da90e7d6bfc36b612d7263f83e362f'
-            '1ec7a6e7dc8639baa6c3fbc61ca8556108fb824598bd6ab5ef1fa50d48d6d310')
+            '1ec7a6e7dc8639baa6c3fbc61ca8556108fb824598bd6ab5ef1fa50d48d6d310'
+            '3e1adc51246e1f48545c1ab9703219c987685d241f1eab5d912b0840ce8a122a')
+
+prepare() {
+  cd "$pkgname-$pkgver"
+  patch -Np1 -i ../libxcb-1.1-no-pthread-stubs.patch
+  # https://bugs.freedesktop.org/show_bug.cgi?id=66413
+  patch -Np1 -i ../reorder-configure.patch
+  NOCONFIGURE=1 ./autogen.sh
+}
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch"
-  export PYTHON=/usr/bin/python2 
-  ./autogen.sh --prefix=/usr \
+  cd "$pkgname-$pkgver"
+  ./configure --prefix=/usr \
     --enable-xinput \
     --enable-xkb \
     --disable-static
@@ -29,7 +37,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
   install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
   install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname"
diff --git a/extra/libxcb/reorder-configure.patch b/extra/libxcb/reorder-configure.patch
new file mode 100644
index 000000000..afeeffe7e
--- /dev/null
+++ b/extra/libxcb/reorder-configure.patch
@@ -0,0 +1,29 @@
+--- libxcb-1.9.1/configure.ac	2013-05-30 17:38:01.000000000 +0200
++++ libxcb-1.9.1/configure.ac.new	2013-06-30 21:01:30.134153288 +0200
+@@ -2,20 +2,21 @@
+ # Process this file with autoconf to produce a configure script.
+ 
+ # Initialize Autoconf
+-AC_PREREQ(2.57)
+ AC_INIT([libxcb],
+         1.9.1,
+         [xcb@lists.freedesktop.org])
++AC_PREREQ(2.57)
++
++# Initialize Automake
++AM_INIT_AUTOMAKE([foreign dist-bzip2])
++m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
++
+ AC_CONFIG_SRCDIR([xcb.pc.in])
+ # Set common system defines for POSIX extensions, such as _GNU_SOURCE
+ # Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL)
+ # to avoid autoconf errors.
+ AC_USE_SYSTEM_EXTENSIONS
+ 
+-# Initialize Automake
+-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+-
+ AM_PATH_PYTHON([2.6])
+ 
+ PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no])