From d83fd70728f4bb0677a6b267691df6203e989fdd Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 15 Sep 2017 00:53:35 +0000
Subject: [PATCH] extra/cairo to 1.15.8-2

---
 extra/cairo/PKGBUILD | 70 ++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 41 deletions(-)

diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD
index 2e6fe3a39..948880a66 100644
--- a/extra/cairo/PKGBUILD
+++ b/extra/cairo/PKGBUILD
@@ -6,56 +6,44 @@
 #  - drop valgrind makedepend
 
 pkgname=cairo
-pkgver=1.14.10
-pkgrel=1
-pkgdesc="Cairo vector graphics library"
+pkgver=1.15.8
+pkgrel=2
+pkgdesc="2D graphics library with support for multiple output devices"
+url="https://cairographics.org/"
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
-url="https://cairographics.org/"
-# requires libGL + libEGL - all libgl variants (mesa, nvidia-xxx-libgl/nvidia-utils) provide libEGL
-depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman' 'glib2' 'libgl' 'lzo')
-makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' 'git')
-             # 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')
-source=(https://cairographics.org/releases/cairo-$pkgver.tar.xz)
-sha1sums=('28c59d85d6b790c21b8b59ece73a6a1dda28d69a')
+depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman' 'glib2' 'lzo')
+makedepends=('librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' 'git')
+source=(https://cairographics.org/snapshots/cairo-$pkgver.tar.xz
+        color-glyph-source-op.patch)
+sha1sums=('07cc2031b74d758299eeee3ec49ecbfbfb85f1c6'
+          '5d8efd47038edcf0debf0a43713bba3025f3cffd')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # https://bugs.freedesktop.org/show_bug.cgi?id=102661
+  patch -Np1 -i ../color-glyph-source-op.patch
+}
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-lto \
-	--enable-tee \
-	--enable-gl \
-	--enable-egl \
-	--enable-svg \
-	--enable-ps \
-	--enable-pdf \
-	--enable-gobject \
-	--enable-gtk-doc
-	
-	#--disable-xlib-xcb \
-	#--enable-test-surfaces \ takes ages
-	#--enable-drm # breaks build
-	
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --disable-static \
+        --disable-lto \
+        --disable-gl \
+        --enable-tee \
+        --enable-svg \
+        --enable-ps \
+        --enable-pdf \
+        --enable-gobject \
+        --enable-gtk-doc
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
-check() {
-  cd $pkgname-$pkgver
-  #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
-}
-
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install