Merge with the current Arch cairo package.

03_cairo-iu/.gitignore

@@ -0,0 +1 @@
+cairo/

03_cairo-iu/PKGBUILD

@@ -4,80 +4,76 @@
 
 pkgname=cairo-infinality-ultimate
 _name=cairo
-pkgver=1.14.8
-pkgrel=2
-pkgdesc="Cairo vector graphics library"
-arch=(i686 x86_64)
-license=('LGPL' 'MPL')
-url="http://cairographics.org/"
-groups=('infinality-bundle')
-# requires libGL + libEGL - all libgl variants (mesa, nvidia-xxx-libgl/nvidia-utils) provide libEGL
-depends=('libpng' 'libxrender' 'libxext' 'fontconfig-infinality-ultimate' 'pixman' 'glib2' 'libgl' 'lzo')
-makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' 'valgrind' 'git')
-             # for the test suite:
-             #'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
-#optdepends=('xcb-util: for XCB backend') # really needed?
-provides=('cairo-xcb' 'cairo')
-replaces=('cairo-xcb')
-conflicts=('cairo' 'cairo-cleartype' 'cairo-git' 'cairo-gl-git' 'cairo-glitz' 'cairo-ocaml-git' 'cairo-small' 'cairo-ubuntu')
-
-source=(http://cairographics.org/releases/cairo-$pkgver.tar.xz
+pkgver=1.16.0+6+g01788f5ed
+pkgrel=1
+pkgdesc="2D graphics library with support for multiple output devices (infinality version)"
+url="https://cairographics.org/"
+arch=(x86_64)
+license=(LGPL MPL)
+groups=(infinality-bundle)
+depends=(libpng libxrender libxext fontconfig-infinality-ultimate pixman glib2 lzo)
+makedepends=(librsvg gtk2 poppler-glib libspectre gtk-doc valgrind git)
+provides=(cairo)
+conflicts=(cairo cairo-cleartype cairo-git cairo-gl-git cairo-glitz cairo-ocaml-git cairo-small cairo-ubuntu)
+source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit"
         cairo-make-lcdfilter-default.patch
         cairo-respect-fontconfig_pb.patch
         cairo-server-side-gradients.patch
-        cairo-webkit-html5-fix.patch
-	cairo-color-glyphs.patch)
-sha1sums=('c6f7b99986f93c9df78653c3e6a3b5043f65145e'
+        cairo-webkit-html5-fix.patch)
+sha1sums=('SKIP'
           'b0cc2466cc5479f055ca2148cfa37fe13a1e78a6'
           'd8ffcb4c4745f7e61671109362a80a872ac989d3'
           '72ecf2dda8462e1588512de257ccbe18642d507f'
-          '5bff494f52a16114f4cf6d04bfb0b9d7c4e9da23'
-          'c25463ce365627ba55a2614d4542e17ca6ac7d51')
+          '5bff494f52a16114f4cf6d04bfb0b9d7c4e9da23')
+
+pkgver() {
+  cd cairo
+  git describe --tags | sed 's/-/+/g'
+}
 
-prepare(){
-  cd $_name-$pkgver
+prepare() {
+  cd cairo
 
   patch -Np1 -i "${srcdir}"/cairo-make-lcdfilter-default.patch
   patch -Np1 -i "${srcdir}"/cairo-respect-fontconfig_pb.patch
   patch -Np1 -i "${srcdir}"/cairo-server-side-gradients.patch
   patch -Np1 -i "${srcdir}"/cairo-webkit-html5-fix.patch
-  patch -Np1 -i "${srcdir}"/cairo-color-glyphs.patch
+
+  # Update gtk-doc
+  cp /usr/share/aclocal/gtk-doc.m4 build/aclocal.gtk-doc.m4
+  cp /usr/share/gtk-doc/data/gtk-doc.make build/Makefile.am.gtk-doc
+
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd $_name-$pkgver
+  cd cairo
   ./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-gl \
+        --enable-tee \
+        --enable-svg \
+        --enable-ps \
+        --enable-pdf \
+        --enable-gobject \
+        --enable-gtk-doc \
+        --enable-full-testing \
+        --enable-test-surfaces
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
-#check() {
-#  cd $_name-$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
-#}
+check() {
+  cd cairo
+  # FIXME: tests don't pass
+  env CAIRO_TEST_TARGET=image \
+      CAIRO_TEST_TARGET_FORMAT=rgba \
+      CAIRO_TESTS='!pthread-show-text' make -k check || :
+}
 
 package() {
-  cd $_name-$pkgver
+  cd cairo
   make DESTDIR="$pkgdir" install
 }