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

[Jan de Groot]

    Date: Tuesday, August 5, 2008 @ 14:11:40
  Author: jgc
Revision: 8004

upgpkg: libxcb 1.1.90.1-1
    Drop dependency on pthread-stubs, allow sloppy locking by default, no environment variable needed anymore

Added:
  libxcb/trunk/libxcb-1.1-no-pthread-stubs.patch
  libxcb/trunk/libxcb-1.1-sloppy-lock.patch
Modified:
  libxcb/trunk/PKGBUILD
Deleted:
  libxcb/trunk/xcb_xlib-no-assert-on-lock.patch

-----------------------------------+
 PKGBUILD                          |   35 ++++++++++++++++++++---------------
 libxcb-1.1-no-pthread-stubs.patch |   12 ++++++++++++
 libxcb-1.1-sloppy-lock.patch      |   12 ++++++++++++
 xcb_xlib-no-assert-on-lock.patch  |   30 ------------------------------
 4 files changed, 44 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-08-05 18:06:07 UTC (rev 8003)
+++ PKGBUILD	2008-08-05 18:11:40 UTC (rev 8004)
@@ -2,28 +2,33 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=libxcb
-pkgver=1.1
+pkgver=1.1.90.1
 pkgrel=1
 pkgdesc="X11 client-side library"
 arch=(i686 x86_64)
 url="http://xcb.freedesktop.org/"
-depends=('xcb-proto>=1.1' 'libxdmcp' 'libxau')
-makedepends=('pkgconfig' 'libxslt' 'libpthread-stubs')
+depends=('xcb-proto>=1.2' 'libxdmcp' 'libxau')
+makedepends=('pkgconfig' 'libxslt' 'python')
 options=('!libtool')
 license=('custom')
-source=(${url}/dist/${pkgname}-${pkgver}.tar.bz2)
+source=(${url}/dist/${pkgname}-${pkgver}.tar.bz2
+	libxcb-1.1-no-pthread-stubs.patch
+	libxcb-1.1-sloppy-lock.patch)
+md5sums=('c4b67c5576ed58e2fd4a2855c0b21aa6'
+         'a53f09ab3ec5cbfc1b0848bd137c535a'
+         '4b3fbedc471d7ab336a18f1d0f853ddd')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-              --build=${CHOST} --host=${CHOST}
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/libxcb-1.1-no-pthread-stubs.patch || return 1
+  patch -Np1 -i ${srcdir}/libxcb-1.1-sloppy-lock.patch || return 1
+  libtoolize --force --copy || return 1
+  aclocal || return 1
+  autoconf || return 1
+  automake --add-missing || return 1
+  ./configure --prefix=/usr --enable-xinput || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-  # Remove pthread-stubs dependency from pc files,
-  # the stubs package doesn't provide any libs since our libc is complete.
-  sed -i -e 's/pthread-stubs//' ${startdir}/pkg/usr/lib/pkgconfig/*.pc
-
-  install -m644 -D ${startdir}/src/${pkgname}-${pkgver}/COPYING \
-                   ${startdir}/pkg/usr/share/licenses/${pkgname}/COPYING
+  make DESTDIR=${pkgdir} install || return 1
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
 }
-md5sums=('9310b02433273d75d42f10da3c7455aa')

Added: libxcb-1.1-no-pthread-stubs.patch
===================================================================
--- libxcb-1.1-no-pthread-stubs.patch	                        (rev 0)
+++ libxcb-1.1-no-pthread-stubs.patch	2008-08-05 18:11:40 UTC (rev 8004)
@@ -0,0 +1,12 @@
+diff -up libxcb-1.1/configure.ac.pthread-stubs libxcb-1.1/configure.ac
+--- libxcb-1.1/configure.ac.pthread-stubs	2007-11-04 18:17:11.000000000 -0500
++++ libxcb-1.1/configure.ac	2007-11-12 10:27:06.000000000 -0500
+@@ -31,7 +31,7 @@ AC_SUBST(HTML_CHECK_RESULT)
+ 
+ # Checks for pkg-config packages
+ PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.1)
+-NEEDED="pthread-stubs xau >= 0.99.2"
++NEEDED="xau >= 0.99.2"
+ PKG_CHECK_MODULES(NEEDED, $NEEDED)
+ 
+ have_xdmcp="no"

Added: libxcb-1.1-sloppy-lock.patch
===================================================================
--- libxcb-1.1-sloppy-lock.patch	                        (rev 0)
+++ libxcb-1.1-sloppy-lock.patch	2008-08-05 18:11:40 UTC (rev 8004)
@@ -0,0 +1,12 @@
+diff -up libxcb-1.1/src/xcb_conn.c.jx libxcb-1.1/src/xcb_conn.c
+--- libxcb-1.1/src/xcb_conn.c.jx	2007-10-28 16:11:18.000000000 -0400
++++ libxcb-1.1/src/xcb_conn.c	2008-04-22 11:58:05.000000000 -0400
+@@ -63,7 +63,7 @@ static int _xcb_xlib_init(_xcb_xlib *xli
+ {
+     xlib->lock = 0;
+ #ifndef NDEBUG
+-    xlib->sloppy_lock = (getenv("LIBXCB_ALLOW_SLOPPY_LOCK") != 0);
++    xlib->sloppy_lock = 1;
+ #endif
+     pthread_cond_init(&xlib->cond, 0);
+     return 1;

Deleted: xcb_xlib-no-assert-on-lock.patch
===================================================================
--- xcb_xlib-no-assert-on-lock.patch	2008-08-05 18:06:07 UTC (rev 8003)
+++ xcb_xlib-no-assert-on-lock.patch	2008-08-05 18:11:40 UTC (rev 8004)
@@ -1,30 +0,0 @@
---- src/xcb_xlib.c.orig	2006-11-25 22:03:30.000000000 +0000
-+++ src/xcb_xlib.c	2006-11-25 22:19:28.000000000 +0000
-@@ -38,18 +38,20 @@
- void xcb_xlib_lock(xcb_connection_t *c)
- {
-     _xcb_lock_io(c);
--    assert(!c->xlib.lock);
--    c->xlib.lock = 1;
--    c->xlib.thread = pthread_self();
-+    if (!c->xlib.lock) {
-+        c->xlib.lock = 1;
-+        c->xlib.thread = pthread_self();
-+    }
-     _xcb_unlock_io(c);
- }
- 
- void xcb_xlib_unlock(xcb_connection_t *c)
- {
-     _xcb_lock_io(c);
--    assert(c->xlib.lock);
--    assert(pthread_equal(c->xlib.thread, pthread_self()));
--    c->xlib.lock = 0;
--    pthread_cond_broadcast(&c->xlib.cond);
-+    if (c->xlib.lock) {
-+        assert(pthread_equal(c->xlib.thread, pthread_self()));
-+        c->xlib.lock = 0;
-+        pthread_cond_broadcast(&c->xlib.cond);
-+    }
-     _xcb_unlock_io(c);
- }