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

[Jan Steffens]

    Date: Monday, November 30, 2020 @ 13:17:17
  Author: heftig
Revision: 766557

1.17.4-1

Modified:
  lib32-cairo/trunk/PKGBUILD

----------+
 PKGBUILD |   54 +++++++++++++-----------------------------------------
 1 file changed, 13 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-30 12:22:58 UTC (rev 766556)
+++ PKGBUILD	2020-11-30 13:17:17 UTC (rev 766557)
@@ -1,17 +1,18 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 # Contributor: Ionut Biru <ibiru at archlinux.org>
 
 pkgname=lib32-cairo
-pkgver=1.17.2+25+gaee96d175
+pkgver=1.17.4
 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
+depends=(lib32-zlib lib32-libpng lib32-fontconfig lib32-freetype2 lib32-libx11
+         lib32-libxext lib32-libxrender lib32-libxcb lib32-glib2 lib32-pixman
          cairo)
-makedepends=(lib32-librsvg lib32-gtk2 gtk-doc valgrind git)
-checkdepends=(ttf-dejavu gsfonts)
-_commit=aee96d175d8349945a6d1948a56abd4b4ec6ad84  # master
+makedepends=(valgrind git meson)
+_commit=156cd3eaaebfd8635517c2baf61fcf3627ff7ec2  # tags/1.17.4^0
 source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -22,15 +23,6 @@
 
 prepare() {
   cd cairo
-
-  # 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
-
-  # Fix typo
-  sed -i 's/have_png/use_png/g' configure.ac
-
-  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
@@ -38,35 +30,15 @@
   export CXX="g++ -m32"
   export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
 
-  cd cairo
-  ./configure --prefix=/usr \
-        --libdir=/usr/lib32 \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --disable-static \
-        --disable-gl \
-        --enable-tee \
-        --enable-svg \
-        --enable-ps \
-        --enable-pdf \
-        --enable-gobject \
-        --disable-gtk-doc \
-        --enable-full-testing \
-        --enable-test-surfaces
-  sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
+  arch-meson cairo build \
+    --libdir=/usr/lib32 \
+    -D spectre=disabled \
+    -D tee=enabled \
+    -D tests=disabled
+  meson compile -C build
 }
 
-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 cairo
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" meson install -C build
   rm -r "$pkgdir"/usr/{include,bin}
 }