[arch-commits] Commit in cairo/trunk (PKGBUILD)

[Jan Steffens]

    Date: Saturday, October 20, 2018 @ 21:48:01
  Author: heftig
Revision: 336918

1.16.0-1

Modified:
  cairo/trunk/PKGBUILD

----------+
 PKGBUILD |   27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-20 20:55:08 UTC (rev 336917)
+++ PKGBUILD	2018-10-20 21:48:01 UTC (rev 336918)
@@ -2,7 +2,7 @@
 # Contributor: Brice Carpentier <brice at daknet.org>
 
 pkgname=cairo
-pkgver=1.15.14
+pkgver=1.16.0
 pkgrel=1
 pkgdesc="2D graphics library with support for multiple output devices"
 url="https://cairographics.org/"
@@ -10,17 +10,18 @@
 license=(LGPL MPL)
 depends=(libpng libxrender libxext fontconfig pixman glib2 lzo)
 makedepends=(librsvg gtk2 poppler-glib libspectre gtk-doc valgrind git)
-_commit=d9aaea0c1e1484c632e1a6735c6ecc961c4b032b  # tags/1.15.14^0
+checkdepends=(ttf-dejavu gsfonts)
+_commit=3ad43122b21a3299dd729dc8462d6b8f7f01142d  # tags/1.16.0^0
 source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit")
 sha1sums=('SKIP')
 
 pkgver() {
-  cd $pkgname
+  cd cairo
   git describe --tags | sed 's/-/+/g'
 }
 
 prepare() {
-  cd $pkgname
+  cd cairo
 
   # Update gtk-doc
   cp /usr/share/aclocal/gtk-doc.m4 build/aclocal.gtk-doc.m4
@@ -30,7 +31,7 @@
 }
 
 build() {
-  cd $pkgname
+  cd cairo
   ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
@@ -41,20 +42,22 @@
         --enable-ps \
         --enable-pdf \
         --enable-gobject \
-        --enable-gtk-doc
-        #--enable-full-testing \
-        #--enable-test-surfaces
+        --enable-gtk-doc \
+        --enable-full-testing \
+        --enable-test-surfaces
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
 check() {
-  cd $pkgname
-  # many tests in cairo-test-suite hang forever
-  # xvfb-run make 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 $pkgname
+  cd cairo
   make DESTDIR="$pkgdir" install
 }