Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/conkeror-git/PKGBUILD
	community/spidermonkey/PKGBUILD
	core/gcc/PKGBUILD
	extra/file-roller/PKGBUILD
	extra/pixman/PKGBUILD
	extra/poppler/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/xulrunner/PKGBUILD
	extra/xulrunner/xulrunner-omnijar.patch
	kde-unstable/akonadi/PKGBUILD
	multilib-testing/lib32-mesa/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	testing/mesa/PKGBUILD

1 files changed, 14 insertions, 14 deletions

diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD
index 3c842ff4b..57414ce5c 100644
--- a/extra/pixman/PKGBUILD
+++ b/extra/pixman/PKGBUILD
@@ -1,37 +1,37 @@
-# $Id: PKGBUILD 124049 2011-05-16 10:05:58Z jgc $
+# $Id: PKGBUILD 130771 2011-07-07 22:43:35Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=pixman
-pkgver=0.22.0
-pkgrel=2
+pkgver=0.22.2
+pkgrel=1
 pkgdesc="Pixman library"
 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
-        pixman-loongson2f.patch)
-sha1sums=('d24ea233755d7dce9f0d93136ad99fba8d4e4fa0'
-          'ce4d69ea341f21fdc30f6d401ee479cd3571dab3')
+source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('ad2b828ce4280472f5933d8bb5f0f4d583aed7f3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  [ "$CARCH" = "mips64el" ] && patch -Np1 -i $srcdir/pixman-loongson2f.patch
-  autoreconf -i
+  [ "$CARCH" = "mips64el" ] && {
+    patch -Np1 -i $srcdir/pixman-loongson2f.patch
+    autoreconf -i
+  }
   ./configure --prefix=/usr --disable-static
   make
 }
 
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
 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}/"
 }
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}