[arch-commits] Commit in libxcb/trunk (3 files)

[Andreas Radke]

    Date: Saturday, November 9, 2013 @ 21:04:42
  Author: andyrtr
Revision: 199301

upgpkg: libxcb 1.9.3-1

upstream update 1.9.3; use python2 again - xcb-proto 1.9 build is broken currently with python3

Modified:
  libxcb/trunk/PKGBUILD
  libxcb/trunk/libxcb-1.1-no-pthread-stubs.patch
  libxcb/trunk/reorder-configure.patch

-----------------------------------+
 PKGBUILD                          |   25 ++++++++++++++++---------
 libxcb-1.1-no-pthread-stubs.patch |    4 ++--
 reorder-configure.patch           |    2 +-
 3 files changed, 19 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-09 19:36:41 UTC (rev 199300)
+++ PKGBUILD	2013-11-09 20:04:42 UTC (rev 199301)
@@ -3,30 +3,32 @@
 # Contributor: Alexander Baldeck <alexander at archlinux.org>
 
 pkgname=libxcb
-pkgver=1.9.1
-pkgrel=2
+pkgver=1.9.3
+pkgrel=1
 pkgdesc="X11 client-side library"
 arch=('i686' 'x86_64')
 url="http://xcb.freedesktop.org/"
-depends=('xcb-proto>=1.8-2' 'libxdmcp' 'libxau')
-makedepends=('pkgconfig' 'libxslt' 'python')
+depends=('xcb-proto>=1.9' 'libxdmcp' 'libxau')
+makedepends=('pkgconfig' 'libxslt' 'python2')
 license=('custom')
 source=($url/dist/$pkgname-$pkgver.tar.bz2
         libxcb-1.1-no-pthread-stubs.patch
         reorder-configure.patch)
-sha256sums=('d44a5ff4eb0b9569e6f7183b51fdaf6f58da90e7d6bfc36b612d7263f83e362f'
-            '1ec7a6e7dc8639baa6c3fbc61ca8556108fb824598bd6ab5ef1fa50d48d6d310'
-            '3e1adc51246e1f48545c1ab9703219c987685d241f1eab5d912b0840ce8a122a')
+sha256sums=('aad09d223fcb5bd345ce4d1737f178a557b6f2e201128e1ee3c83af46028018b'
+            'e071e9ef4ded0229d19e40ffee229ae6c3171bbebcc3322a2378a84cfb6a8678'
+            'a82e789d8b18134ce23ea1f7fd2e71a5386be6e63b1a7f8b774b61e8d032c336')
 
 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
+  #patch -Np1 -i ../reorder-configure.patch
+  #NOCONFIGURE=1 ./autogen.sh
+  autoreconf -vfi
 }
 
 build() {
+  export PYTHON=/usr/bin/python2 
   cd "$pkgname-$pkgver"
   ./configure --prefix=/usr \
     --enable-xinput \
@@ -35,6 +37,11 @@
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make -k check
+}
+
 package() {
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install

Modified: libxcb-1.1-no-pthread-stubs.patch
===================================================================
--- libxcb-1.1-no-pthread-stubs.patch	2013-11-09 19:36:41 UTC (rev 199300)
+++ libxcb-1.1-no-pthread-stubs.patch	2013-11-09 20:04:42 UTC (rev 199301)
@@ -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.9)
 -NEEDED="pthread-stubs xau >= 0.99.2"
 +NEEDED="xau >= 0.99.2"
  PKG_CHECK_MODULES(NEEDED, $NEEDED)

Modified: reorder-configure.patch
===================================================================
--- reorder-configure.patch	2013-11-09 19:36:41 UTC (rev 199300)
+++ reorder-configure.patch	2013-11-09 20:04:42 UTC (rev 199301)
@@ -6,7 +6,7 @@
  # Initialize Autoconf
 -AC_PREREQ(2.57)
  AC_INIT([libxcb],
-         1.9.1,
+         1.9.3,
          [xcb at lists.freedesktop.org])
 +AC_PREREQ(2.57)
 +