diff options
| author | James Meyer <james.meyer@operamail.com> | 2009-01-12 19:19:50 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2009-01-12 19:19:50 (GMT) |
| commit | 6c619a60fd89b5e75a93cff06977c552ddf1e621 (patch) | |
| tree | 630ca50ea1c128c4be85ce920ecf034c561bf7fe /abs/core-testing/libx11 | |
| parent | 0b2b9b97e95f8f8bfda1d1fe09136d121cd0750d (diff) | |
| parent | 634dff8fdd0a9c866c92f0020f282c23d1a438d8 (diff) | |
| download | linhes_pkgbuild-6c619a60fd89b5e75a93cff06977c552ddf1e621.zip linhes_pkgbuild-6c619a60fd89b5e75a93cff06977c552ddf1e621.tar.gz linhes_pkgbuild-6c619a60fd89b5e75a93cff06977c552ddf1e621.tar.bz2 | |
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD.git
Conflicts:
abs/core-testing/LinHES-config/PKGBUILD
Diffstat (limited to 'abs/core-testing/libx11')
| -rw-r--r-- | abs/core-testing/libx11/PKGBUILD | 31 | ||||
| -rw-r--r-- | abs/core-testing/libx11/xorg.sh | 4 |
2 files changed, 14 insertions, 21 deletions
diff --git a/abs/core-testing/libx11/PKGBUILD b/abs/core-testing/libx11/PKGBUILD index e69ed0a..d697a21 100644 --- a/abs/core-testing/libx11/PKGBUILD +++ b/abs/core-testing/libx11/PKGBUILD @@ -1,28 +1,26 @@ -# $Id: PKGBUILD 1882 2008-05-22 17:44:17Z jgc $ +# $Id: PKGBUILD 20482 2008-12-05 09:43:28Z jgc $ # Maintainer: Alexander Baldeck <alexander@archlinux.org> # Contributor Jan de Groot <jgc@archlinux.org> pkgname=libx11 -pkgver=1.1.4 +pkgver=1.1.5 pkgrel=2 pkgdesc="X11 client-side library" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" -depends=('libxau' 'libxdmcp' 'libxcb>=1.1' 'kbproto' 'inputproto' 'bigreqsproto') -makedepends=('pkgconfig' 'xcmiscproto' 'xextproto' 'xf86bigfontproto' 'xtrans' \ - 'bigreqsproto' 'xorg-util-macros' 'autoconf' 'automake' 'libtool') +depends=('libxcb>=1.1.90.1' 'kbproto>=1.0.3') +makedepends=('xproto>=7.0.13' 'xextproto>=7.0.3' 'xf86bigfontproto>=1.1.2' 'xtrans>=1.2.1' 'kbproto>=1.0.3' 'inputproto>=1.4.4' 'xorg-util-macros') options=('!libtool') license=('custom:XFREE86') source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2 012_ru_RU_UTF-8_XLC_LOCALE.diff xorg.sh) -md5sums=('1469a5a8aa8d288dce6f4c45d2f68dc3' +md5sums=('d1512d65dadd4f48c779d4749e7753a8' 'c7e38a68b932ed557bc71979eed2a8a1' - 'ea3f14c529072c8be061493763479800') + '942ff006e69e041f0307c1316e0dec5d') build() { - cd ${startdir}/src/libX11-${pkgver} - patch -Np1 -i ${startdir}/src/012_ru_RU_UTF-8_XLC_LOCALE.diff || return 1 - + cd ${srcdir}/libX11-${pkgver} + patch -Np1 -i ${srcdir}/012_ru_RU_UTF-8_XLC_LOCALE.diff || return 1 libtoolize --force --copy || return 1 aclocal || return 1 @@ -32,13 +30,12 @@ build() { ./configure --prefix=/usr \ --with-xcb || return 1 make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 + make DESTDIR=${pkgdir} install || return 1 - install -d -m755 ${startdir}/pkg/etc/profile.d - install -m755 ${startdir}/src/xorg.sh \ - ${startdir}/pkg/etc/profile.d/ || return 1 + install -m755 -d ${pkgdir}/etc/profile.d + install -m755 ${srcdir}/xorg.sh \ + ${pkgdir}/etc/profile.d/ || return 1 - install -d -m755 ${startdir}/pkg/usr/share/licenses/${pkgname} - install -m644 -D ${startdir}/src/libX11-${pkgver}/COPYING \ - ${startdir}/pkg/usr/share/licenses/${pkgname}/ || return 1 + install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname} + install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1 } diff --git a/abs/core-testing/libx11/xorg.sh b/abs/core-testing/libx11/xorg.sh index d3ade91..9b37312 100644 --- a/abs/core-testing/libx11/xorg.sh +++ b/abs/core-testing/libx11/xorg.sh @@ -13,7 +13,3 @@ if [ -z $XDG_CONFIG_DIRS ]; then else export XDG_CONFIG_DIRS=/etc/xdg:$XDG_CONFIG_DIRS fi - -# temporarily loosen restrictions in libxcb to get java -# application involving X to work. -export LIBXCB_ALLOW_SLOPPY_LOCK=true |