[arch-commits] Commit in libxcb/trunk (PKGBUILD reorder-configure.patch)

[Jan de Groot]

    Date: Tuesday, July 23, 2013 @ 13:11:38
  Author: jgc
Revision: 191293

upgpkg: libxcb 1.9.1-2

Rebuild with python, add patch to fix automake 1.14 issues (temporary fix for now)

Added:
  libxcb/trunk/reorder-configure.patch
Modified:
  libxcb/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   28 ++++++++++++++++++----------
 reorder-configure.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-23 10:42:57 UTC (rev 191292)
+++ PKGBUILD	2013-07-23 11:11:38 UTC (rev 191293)
@@ -4,24 +4,32 @@
 
 pkgname=libxcb
 pkgver=1.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 client-side library"
 arch=('i686' 'x86_64')
 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 @@
 }
 
 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"

Added: reorder-configure.patch
===================================================================
--- reorder-configure.patch	                        (rev 0)
+++ reorder-configure.patch	2013-07-23 11:11:38 UTC (rev 191293)
@@ -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 at 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])