diff options
| author | root <root@rshg054.dnsready.net> | 2012-03-14 00:01:30 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-03-14 00:01:30 +0000 |
| commit | 01a0c4bc740842efa3bf1a7e1d6c8be5656e4e2a (patch) | |
| tree | c9cf79fb6311cbb2a890419e0a382aa211fb3010 /extra/libxcb | |
| parent | ca06c41d7d8e5d38284de9048372ab45dcd8b2fb (diff) | |
Wed Mar 14 00:01:29 UTC 2012
Diffstat (limited to 'extra/libxcb')
| -rw-r--r-- | extra/libxcb/PKGBUILD | 38 | ||||
| -rw-r--r-- | extra/libxcb/libxcb-1.1-no-pthread-stubs.patch | 9 |
2 files changed, 21 insertions, 26 deletions
diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD index 31a5183f5..2bbe1b908 100644 --- a/extra/libxcb/PKGBUILD +++ b/extra/libxcb/PKGBUILD @@ -1,36 +1,32 @@ -# $Id: PKGBUILD 122471 2011-05-04 08:36:03Z jgc $ +# $Id: PKGBUILD 153294 2012-03-12 20:52:27Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxcb -pkgver=1.7 -pkgrel=2 +pkgver=1.8.1 +pkgrel=1 pkgdesc="X11 client-side library" arch=(i686 x86_64) url="http://xcb.freedesktop.org/" -depends=('xcb-proto>=1.6' 'libxdmcp' 'libxau') +depends=('xcb-proto>=1.7' 'libxdmcp' 'libxau') makedepends=('pkgconfig' 'libxslt' 'python2') -conflicts=('libx11<1.1.99.2') options=('!libtool') license=('custom') -source=(${url}/dist/${pkgname}-${pkgver}.tar.bz2 - xcb_auth-fix-memory-leak.patch +source=($url/dist/$pkgname-$pkgver.tar.bz2 libxcb-1.1-no-pthread-stubs.patch) -sha1sums=('7540f0587907bce421914f0ddb813810cb2f36f8' - '0c9246fd2ea270bfa06cb8ef93df2f8227d83c2a' - '3455e84642283bc91c8313af319002a20bbcbdf4') +sha1sums=('98199b6054750a06cddd4e77baa4354af547ce6f' + 'd2df03ddf3e949c10c2c185256b0eb7fa02837ab') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/libxcb-1.1-no-pthread-stubs.patch" - patch -Np1 -i "${srcdir}/xcb_auth-fix-memory-leak.patch" - libtoolize --force --copy - aclocal - autoconf - automake --add-missing - PYTHON=python2 ./configure --prefix=/usr --enable-xinput + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch" + PYTHON=/usr/bin/python2 ./autogen.sh --prefix=/usr --enable-xinput make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -m755 -d "$pkgdir/usr/share/licenses/$pkgname" + install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname" } diff --git a/extra/libxcb/libxcb-1.1-no-pthread-stubs.patch b/extra/libxcb/libxcb-1.1-no-pthread-stubs.patch index f17de1b1d..8e8162f0a 100644 --- a/extra/libxcb/libxcb-1.1-no-pthread-stubs.patch +++ b/extra/libxcb/libxcb-1.1-no-pthread-stubs.patch @@ -1,10 +1,9 @@ -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) +--- 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 @@ # Checks for pkg-config packages - PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.6) + PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.7) -NEEDED="pthread-stubs xau >= 0.99.2" +NEEDED="xau >= 0.99.2" PKG_CHECK_MODULES(NEEDED, $NEEDED) |