Thu Aug 29 03:04:08 PDT 2013

2 files changed, 17 insertions, 58 deletions

diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD
index 94b113a82..ea88e9d60 100644
--- a/extra/cairo/PKGBUILD
+++ b/extra/cairo/PKGBUILD
@@ -1,32 +1,28 @@
-# $Id: PKGBUILD 184362 2013-05-06 19:36:38Z foutrelis $
+# $Id: PKGBUILD 193704 2013-08-28 15:19:08Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Brice Carpentier <brice@daknet.org>
 
 pkgname=cairo
-pkgver=1.12.14
-pkgrel=4
+pkgver=1.12.16
+pkgrel=1
 pkgdesc="Cairo vector graphics library"
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
 url="http://cairographics.org/"
-# depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa>=9.1' 'libgl' 'sh') 
-makedepends=('mesa>=9.1' 'mesa-libgl>=9.1' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' 'valgrind'
+depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa' 'libgl' 'sh' 'lzo2')
+makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' 'valgrind'
              # for the test suite:
              'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # '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.xz
-        libpng16.patch)
-sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15'
-          'c9911f185637d266ce1d2985bd6fb7d0df3d75b2')
+source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz)
+sha1sums=('4f6e337d5d3edd7ea79d1426f575331552b003ec')
 
 build() {
   cd $pkgname-$pkgver
 
-  patch -Np1 -i ../libpng16.patch
-
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
@@ -47,15 +43,18 @@ build() {
   make
 }
 
-#check() {
-#  cd "$srcdir/$pkgname-$pkgver"
-  #make -k check || /bin/true # 162 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped
-#  make test || /bin/true # 29 Passed, 464 Failed [460 crashed, 2 expected], 26 Skipped
-#}
+check() {
+  cd $pkgname-$pkgver
+  make -k test || /bin/true
+  
+  # results:
+  # 1.12.8-1	# 162 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped
+  # 1.12.12-2:	# 29 Passed, 464 Failed [460 crashed, 2 expected], 26 Skipped
+  # 1.12.16-1:	144 Passed, 364 Failed [6 crashed, 12 expected], 27 Skipped
 
-package() {
-  depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa>=9.1' 'libgl' 'sh' 'lzo2')
+}
 
+package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
diff --git a/extra/cairo/libpng16.patch b/extra/cairo/libpng16.patch
deleted file mode 100644
index c16317811..000000000
--- a/extra/cairo/libpng16.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2dd2c826a5b367d32cf2d48ed69754795990c5db Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Tue, 16 Apr 2013 09:58:56 +0000
-Subject: png: Avoid marking the surface as in error after a png warning
-
-It turns out that libpng will continue to load an image after throwing a
-warning, and that libpng16 now throws warnings for images that libpng15
-and earlier loaded without error. As we were happily loading those
-images into cairo surfaces before, we are therefore being overzealous
-in throwing an error now - so just squelch the warning.
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-png.c b/src/cairo-png.c
-index e74a4a8..068617d 100644
---- a/src/cairo-png.c
-+++ b/src/cairo-png.c
-@@ -149,13 +149,13 @@ static void
- png_simple_warning_callback (png_structp png,
- 	                     png_const_charp error_msg)
- {
--    cairo_status_t *error = png_get_error_ptr (png);
--
--    /* default to the most likely error */
--    if (*error == CAIRO_STATUS_SUCCESS)
--	*error = _cairo_error (CAIRO_STATUS_NO_MEMORY);
--
--    /* png does not expect to abort and will try to tidy up after a warning */
-+    /* png does not expect to abort and will try to tidy up and continue
-+     * loading the image after a warning. So we also want to return the
-+     * (incorrect?) surface.
-+     *
-+     * We use our own warning callback to squelch any attempts by libpng
-+     * to write to stderr as we may not be in control of that output.
-+     */
- }
- 
- 
---
-cgit v0.9.0.2-2-gbebe