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

[Jan de Groot]

    Date: Saturday, August 1, 2009 @ 13:07:28
  Author: jgc
Revision: 48387

Merged revisions 46386,48386 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/libxcb/trunk

........
  r46386 | jgc | 2009-07-17 09:33:57 +0200 (Fri, 17 Jul 2009) | 1 line
  
  Remove old unused patch, remove testing-i686, as this package is not in testing
........
  r48386 | jgc | 2009-08-01 19:07:09 +0200 (Sat, 01 Aug 2009) | 1 line
  
  upgpkg: libxcb 1.4-1
........

Modified:
  libxcb/repos/extra-x86_64/	(properties)
  libxcb/repos/extra-x86_64/PKGBUILD
  libxcb/repos/extra-x86_64/libxcb-1.1-no-pthread-stubs.patch
Deleted:
  libxcb/repos/extra-x86_64/libxcb-1.1-sloppy-lock.patch

-----------------------------------+
 PKGBUILD                          |   10 +++++-----
 libxcb-1.1-no-pthread-stubs.patch |    2 +-
 libxcb-1.1-sloppy-lock.patch      |   12 ------------
 3 files changed, 6 insertions(+), 18 deletions(-)


Property changes on: libxcb/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /libxcb/trunk:1-27427
   + /libxcb/trunk:1-48386

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-08-01 17:07:09 UTC (rev 48386)
+++ extra-x86_64/PKGBUILD	2009-08-01 17:07:28 UTC (rev 48387)
@@ -2,20 +2,20 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=libxcb
-pkgver=1.2
+pkgver=1.4
 pkgrel=1
 pkgdesc="X11 client-side library"
 arch=(i686 x86_64)
 url="http://xcb.freedesktop.org/"
-depends=('xcb-proto>=1.4' 'libxdmcp' 'libxau')
+depends=('xcb-proto>=1.5' 'libxdmcp' 'libxau')
 makedepends=('pkgconfig' 'libxslt' 'python')
 conflicts=('libx11<1.1.99.2')
 options=('!libtool')
 license=('custom')
 source=(${url}/dist/${pkgname}-${pkgver}.tar.bz2
-	libxcb-1.1-no-pthread-stubs.patch)
-md5sums=('ae32b7846a7d83f5ec542a5431117564'
-         'a53f09ab3ec5cbfc1b0848bd137c535a')
+        libxcb-1.1-no-pthread-stubs.patch)
+md5sums=('b00fd506c717dea01f595e8da31f6914'
+         '2da07ad25b594457b7396a9155d0e5b6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

Modified: extra-x86_64/libxcb-1.1-no-pthread-stubs.patch
===================================================================
--- extra-x86_64/libxcb-1.1-no-pthread-stubs.patch	2009-08-01 17:07:09 UTC (rev 48386)
+++ extra-x86_64/libxcb-1.1-no-pthread-stubs.patch	2009-08-01 17:07:28 UTC (rev 48387)
@@ -4,7 +4,7 @@
 @@ -31,7 +31,7 @@ AC_SUBST(HTML_CHECK_RESULT)
  
  # Checks for pkg-config packages
- PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.1)
+ PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.5)
 -NEEDED="pthread-stubs xau >= 0.99.2"
 +NEEDED="xau >= 0.99.2"
  PKG_CHECK_MODULES(NEEDED, $NEEDED)

Deleted: extra-x86_64/libxcb-1.1-sloppy-lock.patch
===================================================================
--- extra-x86_64/libxcb-1.1-sloppy-lock.patch	2009-08-01 17:07:09 UTC (rev 48386)
+++ extra-x86_64/libxcb-1.1-sloppy-lock.patch	2009-08-01 17:07:28 UTC (rev 48387)
@@ -1,12 +0,0 @@
-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;