diff options
Diffstat (limited to 'abs/core/libx11')
| -rw-r--r-- | abs/core/libx11/PKGBUILD | 40 | ||||
| -rw-r--r-- | abs/core/libx11/xorg.sh | 4 |
2 files changed, 14 insertions, 30 deletions
diff --git a/abs/core/libx11/PKGBUILD b/abs/core/libx11/PKGBUILD index e69ed0a..cfcc85a 100644 --- a/abs/core/libx11/PKGBUILD +++ b/abs/core/libx11/PKGBUILD @@ -1,44 +1,32 @@ -# $Id: PKGBUILD 1882 2008-05-22 17:44:17Z jgc $ +# $Id: PKGBUILD 34217 2009-04-08 08:01:42Z jgc $ # Maintainer: Alexander Baldeck <alexander@archlinux.org> # Contributor Jan de Groot <jgc@archlinux.org> pkgname=libx11 -pkgver=1.1.4 -pkgrel=2 +pkgver=1.2.1 +pkgrel=1 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.2' 'kbproto>=1.0.3') +makedepends=('xproto>=7.0.14' 'xextproto>=7.0.5' 'xf86bigfontproto>=1.1.2' 'xtrans>=1.2.3' 'kbproto>=1.0.3' 'inputproto>=1.5.0' 'xorg-util-macros>=1.2.1') 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' - 'c7e38a68b932ed557bc71979eed2a8a1' - 'ea3f14c529072c8be061493763479800') +md5sums=('2f2beb98e71f397e1209beaca4e97cb1' + '942ff006e69e041f0307c1316e0dec5d') build() { - cd ${startdir}/src/libX11-${pkgver} - patch -Np1 -i ${startdir}/src/012_ru_RU_UTF-8_XLC_LOCALE.diff || return 1 - - - libtoolize --force --copy || return 1 - aclocal || return 1 - autoconf || return 1 - automake --add-missing || return 1 - + cd "${srcdir}/libX11-${pkgver}" ./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/libx11/xorg.sh b/abs/core/libx11/xorg.sh index d3ade91..9b37312 100644 --- a/abs/core/libx11/xorg.sh +++ b/abs/core/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 |