Date: Saturday, October 20, 2018 @ 21:48:12 Author: heftig Revision: 398141
1.16.0-1 Modified: lib32-cairo/trunk/PKGBUILD ----------+ PKGBUILD | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-10-20 21:27:18 UTC (rev 398140) +++ PKGBUILD 2018-10-20 21:48:12 UTC (rev 398141) @@ -1,26 +1,27 @@ # Contributor: Ionut Biru <[email protected]> -_pkgbasename=cairo -pkgname=lib32-$_pkgbasename -pkgver=1.15.14 +pkgname=lib32-cairo +pkgver=1.16.0 pkgrel=1 pkgdesc="2D graphics library with support for multiple output devices (32-bit)" url="https://cairographics.org/"; arch=(x86_64) license=(LGPL MPL) -depends=(lib32-libpng lib32-libxrender lib32-libxext lib32-fontconfig lib32-pixman lib32-glib2 $_pkgbasename) +depends=(lib32-libpng lib32-libxrender lib32-libxext lib32-fontconfig lib32-pixman lib32-glib2 + cairo) makedepends=(lib32-librsvg lib32-gtk2 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 $_pkgbasename + cd cairo git describe --tags | sed 's/-/+/g' } prepare() { - cd $_pkgbasename + cd cairo # Update gtk-doc cp /usr/share/aclocal/gtk-doc.m4 build/aclocal.gtk-doc.m4 @@ -34,7 +35,7 @@ export CXX="g++ -m32" export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - cd $_pkgbasename + cd cairo ./configure --prefix=/usr \ --libdir=/usr/lib32 \ --sysconfdir=/etc \ @@ -46,21 +47,23 @@ --enable-ps \ --enable-pdf \ --enable-gobject \ - --disable-gtk-doc - #--enable-full-testing \ - #--enable-test-surfaces + --disable-gtk-doc \ + --enable-full-testing \ + --enable-test-surfaces sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make } check() { - cd $_pkgbasename - # 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 $_pkgbasename + cd cairo make DESTDIR="$pkgdir" install rm -r "$pkgdir"/usr/{include,bin} }
