diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-07 23:00:59 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-07 23:00:59 -0300 |
| commit | 87bd9124ec1abd5c6171af47af93805b975343b6 (patch) | |
| tree | f9732aabf9c46c6391409187f8ddf8cc5b005006 /extra/pixman/PKGBUILD | |
| parent | 96c65d8a0393645808ab5ea31776baa26209fc5f (diff) | |
| parent | 0dee03071a0643c3ee5820afa3c694dcef71d385 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/beye/PKGBUILD
community/xmlrpc-c/PKGBUILD
extra/avidemux/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gtk2/PKGBUILD
extra/libvpx/PKGBUILD
extra/libxfce4menu/PKGBUILD
extra/libxml2/PKGBUILD
extra/pixman/PKGBUILD
extra/thunar-archive-plugin/PKGBUILD
extra/thunar-volman/PKGBUILD
extra/vdpau-video/PKGBUILD
extra/xfce4-appfinder/PKGBUILD
extra/xfce4-battery-plugin/PKGBUILD
extra/xfce4-cpufreq-plugin/PKGBUILD
extra/xfce4-cpugraph-plugin/PKGBUILD
extra/xfce4-dict/PKGBUILD
extra/xfce4-diskperf-plugin/PKGBUILD
extra/xfce4-eyes-plugin/PKGBUILD
extra/xfce4-fsguard-plugin/PKGBUILD
extra/xfce4-mixer/PKGBUILD
extra/xfce4-mount-plugin/PKGBUILD
extra/xfce4-mpc-plugin/PKGBUILD
extra/xfce4-power-manager/PKGBUILD
extra/xfce4-systemload-plugin/PKGBUILD
extra/xfce4-taskmanager/PKGBUILD
extra/xfce4-time-out-plugin/PKGBUILD
extra/xfce4-timer-plugin/PKGBUILD
extra/xfce4-wavelan-plugin/PKGBUILD
extra/xorg-luit/PKGBUILD
extra/xorg-xfontsel/PKGBUILD
extra/xulrunner/PKGBUILD
kde-unstable/calligra/PKGBUILD
libre/mplayer-vaapi-libre/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'extra/pixman/PKGBUILD')
| -rw-r--r-- | extra/pixman/PKGBUILD | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD index d86a432b7..9f35512fc 100644 --- a/extra/pixman/PKGBUILD +++ b/extra/pixman/PKGBUILD @@ -1,18 +1,20 @@ -# $Id: PKGBUILD 147073 2012-01-21 15:12:23Z andyrtr $ +# $Id: PKGBUILD 149216 2012-02-06 13:29:48Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=pixman pkgver=0.24.2 -pkgrel=1 -pkgdesc="Pixman library" +pkgrel=2 +pkgdesc="The pixel-manipulation library for X and cairo" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org" license=('custom') depends=('glibc') options=('!libtool') -source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('233eed3cd16ee1b2a842140477503d2c68b74418') +source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2 +revert-reject-trapezoids-where-top-is-above-the-edges.patch) +sha1sums=('233eed3cd16ee1b2a842140477503d2c68b74418' + 'ee36251d47ccefd5e276cabdba9917fbb2be787a') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -20,6 +22,7 @@ build() { # patch -Np1 -i $srcdir/pixman-loongson2f.patch # autoreconf -i # } + patch -Np1 -i "${srcdir}/revert-reject-trapezoids-where-top-is-above-the-edges.patch" ./configure --prefix=/usr --disable-static make } |