Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg73.git;a=commitdiff;h=c019edc5ed2964af666c96bd85cd58c99a0b68ee
commit c019edc5ed2964af666c96bd85cd58c99a0b68ee Author: Christian Hamar alias krix <[EMAIL PROTECTED]> Date: Tue Dec 4 17:42:22 2007 +0100 libxcb-1.1-1-x86_64 * Version bump * Drop sloppy_lock patch (now in upstream) diff --git a/source/x11/libxcb/FrugalBuild b/source/x11/libxcb/FrugalBuild index 88fd18c..ed1fa37 100644 --- a/source/x11/libxcb/FrugalBuild +++ b/source/x11/libxcb/FrugalBuild @@ -2,19 +2,17 @@ # Maintainer: Christian Hamar alias krix <[EMAIL PROTECTED]> pkgname=libxcb -pkgver=1.0 -pkgrel=4 +pkgver=1.1 +pkgrel=1 pkgdesc="X.org X-protocol C Binding" url="http://xcb.freedesktop.org"; groups=('x11' 'xorg-core' 'xorg-proto') -depends=('xcb-proto>=1.0' 'libpthread-stubs' 'libxml2' 'libxau>=1.0.3-2' 'libxdmcp>=1.0.2-2' 'libxslt') +depends=('xcb-proto>=1.1' 'libpthread-stubs' 'libxml2' 'libxau>=1.0.3-2' 'libxdmcp>=1.0.2-2' 'libxslt') archs=('i686' 'x86_64') makedepends=('pkgconfig') up2date=("lynx -dump 'http://xcb.freedesktop.org/dist/?C=M;O=A' | grep libxcb | Flasttar") -source=(http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2 \ - libxcb-1.0-sloppy_lock.patch) -sha1sums=('0a7e0b65e6f1e0ef4dcaecaa01c4b2854206e96e'\ - '4248f7becce913e5cc15f5f45b9f1cc47e6657e5') +source=(http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2) +sha1sums=('b27c7eb86fd2ea43cea83cadcf20cc77abf5defe') build() { Fbuild diff --git a/source/x11/libxcb/libxcb-1.0-sloppy_lock.patch b/source/x11/libxcb/libxcb-1.0-sloppy_lock.patch deleted file mode 100644 index 22236cb..0000000 --- a/source/x11/libxcb/libxcb-1.0-sloppy_lock.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- src/xcb_conn.c.orig 2007-03-03 17:05:12.000000000 +0100 -+++ src/xcb_conn.c 2007-03-03 17:18:25.000000000 +0100 -@@ -62,6 +62,11 @@ - static int _xcb_xlib_init(_xcb_xlib *xlib) - { - xlib->lock = 0; -+ xlib->sloppy_lock = 0; -+ -+ if (getenv("LIBXCB_ALLOW_SLOPPY_LOCK")) -+ xlib->sloppy_lock = 1; -+ - pthread_cond_init(&xlib->cond, 0); - return 1; - } ---- src/xcbint.h.orig 2007-03-03 17:05:00.000000000 +0100 -+++ src/xcbint.h 2007-03-03 17:10:33.000000000 +0100 -@@ -130,6 +130,7 @@ - - typedef struct _xcb_xlib { - int lock; -+ int sloppy_lock; - pthread_t thread; - pthread_cond_t cond; - } _xcb_xlib; ---- src/xcb_xlib.c.orig 2007-03-03 17:07:06.000000000 +0100 -+++ src/xcb_xlib.c 2007-03-03 17:10:14.000000000 +0100 -@@ -40,7 +40,8 @@ - void xcb_xlib_lock(xcb_connection_t *c) - { - _xcb_lock_io(c); -- assert(!c->xlib.lock); -+ if (!c->xlib.sloppy_lock) -+ assert(!c->xlib.lock); - c->xlib.lock = 1; - c->xlib.thread = pthread_self(); - _xcb_unlock_io(c); -@@ -49,7 +50,8 @@ - void xcb_xlib_unlock(xcb_connection_t *c) - { - _xcb_lock_io(c); -- assert(c->xlib.lock); -+ if (!c->xlib.sloppy_lock) -+ assert(c->xlib.lock); - assert(pthread_equal(c->xlib.thread, pthread_self())); - c->xlib.lock = 0; - pthread_cond_broadcast(&c->xlib.cond); _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
