diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-18 13:39:32 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-18 13:39:32 +0100 |
commit | 7e6a790c47fb44426cdda8ea0aca8c247a524c5e (patch) | |
tree | a120e55f735660c1ab1e7fa6174fe28fb3108d1f /extra/libxt | |
parent | e5592a9039761a22a117469303c77a4215ad5048 (diff) | |
parent | d14a25fc4f65ae3d6e62f4668e9cb88d74834255 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gpsmanshp/PKGBUILD
community/parrot/PKGBUILD
extra/kdeadmin/PKGBUILD
extra/kdebindings-python/PKGBUILD
extra/kdegames/PKGBUILD
extra/kdesdk/PKGBUILD
extra/libmtp/PKGBUILD
extra/libreoffice/PKGBUILD
extra/samba/PKGBUILD
multilib/lib32-libx11/PKGBUILD
testing/xf86-video-mga/PKGBUILD
testing/xf86-video-mga/git-fixes.patch
Diffstat (limited to 'extra/libxt')
-rw-r--r-- | extra/libxt/PKGBUILD | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/extra/libxt/PKGBUILD b/extra/libxt/PKGBUILD index d2b818319..ea3a280a1 100644 --- a/extra/libxt/PKGBUILD +++ b/extra/libxt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153273 2012-03-12 20:17:00Z andyrtr $ +# $Id: PKGBUILD 153609 2012-03-16 17:09:01Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxt -pkgver=1.1.2 -pkgrel=2 +pkgver=1.1.3 +pkgrel=1 pkgdesc="X11 toolkit intrinsics library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -11,15 +11,11 @@ license=('custom') depends=('libsm' 'libx11') makedepends=('xorg-util-macros') options=('!libtool') -source=("${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2" - Revert_treat_unexpected_returned_events_from_poll_as_errors.diff) -sha1sums=('9e84b807419d78bda4acbd7aea05aed2ab0556cf' - 'bebadf4b90f6a49530b5600a12a9385253e0daa6') +source=("${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2") +sha1sums=('2cef068bc4d7170e31b89b5c06aeaf4451a7699a') build() { cd "${srcdir}/libXt-${pkgver}" - # revert broken commit, see https://bugs.archlinux.org/task/28844 + https://bugs.archlinux.org/task/28875 + https://bugs.freedesktop.org/show_bug.cgi?id=47203 - patch -Np1 -R -i ${srcdir}/Revert_treat_unexpected_returned_events_from_poll_as_errors.diff ./configure --prefix=/usr --sysconfdir=/etc --disable-static make } |