extra/cairo to 1.14.0-1

extra/cairo/PKGBUILD

@@ -6,35 +6,24 @@
 #  - drop valgrind makedepend
 
 pkgname=cairo
-pkgver=1.12.16
-pkgrel=3.1
+pkgver=1.14.0
+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' 'libgl' 'sh' 'lzo')
-makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc'
+depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa' 'libgl' 'lzo')
+makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' 'git')
              # for the test suite:
-             'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
+             #'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
 #optdepends=('xcb-util: for XCB backend') # really needed?
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
-source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz
-        cairo-1.12.16-lto-optional.patch)
-sha1sums=('4f6e337d5d3edd7ea79d1426f575331552b003ec'
-          '80883e44a57942762995aea2f136701b1fa54568')
-
-prepare() {
-  cd $pkgname-$pkgver
-  # https://bugs.archlinux.org/task/40313 + https://bugs.gentoo.org/510782
-  # patch to make it optional is taken from Gentoo
-  patch -Np1 -i $srcdir/cairo-1.12.16-lto-optional.patch
-  autoreconf -vfi
-}
+source=(http://cairographics.org/releases/cairo-$pkgver.tar.xz)
+sha1sums=('53cf589b983412ea7f78feee2e1ba9cea6e3ebae')
 
 build() {
   cd $pkgname-$pkgver
-
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
@@ -46,11 +35,11 @@ build() {
 	--enable-svg \
 	--enable-ps \
 	--enable-pdf \
-	--enable-gobject #\
-	# --enable-test-surfaces
+	--enable-gobject \
+        --enable-gtk-doc
 	
 	#--disable-xlib-xcb \
-	# --enable-test-surfaces \ takes ages
+	#--enable-test-surfaces \ takes ages
 	#--enable-drm # breaks build
 	
   make
@@ -58,13 +47,12 @@ build() {
 
 check() {
   cd $pkgname-$pkgver
-  make -k test || /bin/true
+  #make -j1 -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
-
+  # 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() {