Fri Dec 27 23:54:04 UTC 2013

3 files changed, 16 insertions, 43 deletions

diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD
index d51c00b6f..523084ba5 100644
--- a/extra/libxcb/PKGBUILD
+++ b/extra/libxcb/PKGBUILD
@@ -1,29 +1,26 @@
-# $Id: PKGBUILD 198271 2013-10-30 13:51:13Z allan $
+# $Id: PKGBUILD 202710 2013-12-25 21:25:44Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=libxcb
-pkgver=1.9.1
-pkgrel=2
+pkgver=1.10
+pkgrel=1
 pkgdesc="X11 client-side library"
 arch=('i686' 'x86_64')
 url="http://xcb.freedesktop.org/"
-depends=('xcb-proto>=1.8-2' 'libxdmcp' 'libxau')
+depends=('xcb-proto>=1.10' 'libxdmcp' 'libxau')
 makedepends=('pkgconfig' 'libxslt' 'python')
 license=('custom')
 source=($url/dist/$pkgname-$pkgver.tar.bz2
-        libxcb-1.1-no-pthread-stubs.patch
-        reorder-configure.patch)
-sha256sums=('d44a5ff4eb0b9569e6f7183b51fdaf6f58da90e7d6bfc36b612d7263f83e362f'
-            '1ec7a6e7dc8639baa6c3fbc61ca8556108fb824598bd6ab5ef1fa50d48d6d310'
-            '3e1adc51246e1f48545c1ab9703219c987685d241f1eab5d912b0840ce8a122a')
+        libxcb-1.1-no-pthread-stubs.patch)
+sha256sums=('98d9ab05b636dd088603b64229dd1ab2d2cc02ab807892e107d674f9c3f2d5b5'
+            '748ed83af60468a0eb6785222e4a5ca589d28f20b9bfc60d5936ec93b8eef356')
 
 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
+  autoreconf -vfi
 }
 
 build() {
@@ -35,6 +32,11 @@ build() {
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make -k check
+}
+
 package() {
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
diff --git a/extra/libxcb/libxcb-1.1-no-pthread-stubs.patch b/extra/libxcb/libxcb-1.1-no-pthread-stubs.patch
index 8e8162f0a..52c22ab7e 100644
--- a/extra/libxcb/libxcb-1.1-no-pthread-stubs.patch
+++ b/extra/libxcb/libxcb-1.1-no-pthread-stubs.patch
@@ -1,9 +1,9 @@
 --- libxcb-1.8.1/configure.ac	2012-03-09 15:38:38.000000000 +0100
 +++ libxcb-1.8.1/configure.ac.new	2012-03-09 16:50:40.107109896 +0100
-@@ -35,7 +35,7 @@
+@@ -43,7 +43,7 @@
  
  # Checks for pkg-config packages
- PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.7)
+ PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.10)
 -NEEDED="pthread-stubs xau >= 0.99.2"
 +NEEDED="xau >= 0.99.2"
  PKG_CHECK_MODULES(NEEDED, $NEEDED)
diff --git a/extra/libxcb/reorder-configure.patch b/extra/libxcb/reorder-configure.patch
deleted file mode 100644
index afeeffe7e..000000000
--- a/extra/libxcb/reorder-configure.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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])