3 files changed, 28 insertions, 31 deletions
diff --git a/abs/core/cairo/PKGBUILD b/abs/core/cairo/PKGBUILD
index efdd5f8..1fca76e 100644
--- a/abs/core/cairo/PKGBUILD
+++ b/abs/core/cairo/PKGBUILD
@@ -1,30 +1,42 @@
-# $Id: PKGBUILD 90247 2010-09-09 21:56:54Z jgc $
+# $Id: PKGBUILD 170782 2012-11-11 10:23:13Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Brice Carpentier <brice@daknet.org>
 
 pkgname=cairo
-pkgver=1.10.0
-pkgrel=3
+pkgver=1.12.8
+pkgrel=2
 pkgdesc="Cairo vector graphics library"
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
 url="http://cairographics.org/"
-depends=('libpng>=1.4.0' 'libxrender' 'fontconfig>=2.8.0' 'pixman>=0.18.4' 'glib2>=2.24.0')
-makedepends=('pkgconfig')
+depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'sh')
+makedepends=('librsvg' 'poppler-glib' 'libspectre' 'gtk-doc' 'valgrind') # 'libdrm')
+optdepends=('xcb-util: for XCB backend') # really needed?
+provides=('cairo-xcb')
+replaces=('cairo-xcb')
 options=('!libtool')
-source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz
-        cairo-1.10.0-buggy_gradients.patch)
-sha1sums=('efe7e47408d5188690228ccadc8523652f6bf702'
-          '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04')
+source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz)
+sha1sums=('56a10bf3b804367c97734d655c23a9f652d5c297')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-# patch -Np1 -i "${srcdir}/cairo-1.10.0-buggy_gradients.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --localstatedir=/var --disable-static
-  make || return 1
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--localstatedir=/var \
+	--disable-static \
+	--enable-tee \
+	--disable-xlib-xcb \
+	# --enable-test-surfaces \ takes ages
+	#--enable-drm # breaks build
+  make
 }
+
+#check() {
+#  cd "$srcdir/$pkgname-$pkgver"
+#  make -k check || /bin/true # 162 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped
+#}
+
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/abs/core/cairo/__changelog b/abs/core/cairo/__changelog
deleted file mode 100644
index 1434988..0000000
--- a/abs/core/cairo/__changelog
+++ /dev/null
@@ -1,2 +0,0 @@
-reduced pixman dep to 0.18.2
-removed patch for cairo-1.10.0-buggy_gradients.patch -- file patched does not seem to exist
diff --git a/abs/core/cairo/cairo-1.10.0-buggy_gradients.patch b/abs/core/cairo/cairo-1.10.0-buggy_gradients.patch
deleted file mode 100644
index 368e356..0000000
--- a/abs/core/cairo/cairo-1.10.0-buggy_gradients.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/cairo-xlib-display.c.ubuntu	2010-08-04 11:57:49.000000000 +0200
-+++ b/src/cairo-xlib-display.c	2010-08-04 11:58:28.000000000 +0200
-@@ -353,11 +353,7 @@
-     /* Prior to Render 0.10, there is no protocol support for gradients and
-      * we call function stubs instead, which would silently consume the drawing.
-      */
--#if RENDER_MAJOR == 0 && RENDER_MINOR < 10
-     display->buggy_gradients = TRUE;
--#else
--    display->buggy_gradients = FALSE;
--#endif
-     display->buggy_pad_reflect = FALSE;
-     display->buggy_repeat = FALSE;