mirror official repo pkgbuild

2 files changed, 26 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8c8bbe392d77..b7c04401a62c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,27 @@
 pkgbase = cairo-git
 	pkgdesc = 2D graphics library with support for multiple output devices
-	pkgver = 1.17.2+17+g52a7c79fd
+	pkgver = 1.17.4
 	pkgrel = 1
 	url = https://cairographics.org/
 	arch = x86_64
 	license = LGPL
 	license = MPL
-	makedepends = librsvg
-	makedepends = gtk2
-	makedepends = poppler-glib
-	makedepends = libspectre
+	makedepends = valgrind
 	makedepends = git
-	makedepends = gtk-doc
+	makedepends = meson
+	depends = lzo
+	depends = zlib
 	depends = libpng
-	depends = libxrender
-	depends = libxext
 	depends = fontconfig
-	depends = pixman
+	depends = freetype2
+	depends = libx11
+	depends = libxext
+	depends = libxrender
+	depends = libxcb
 	depends = glib2
-	depends = lzo
-	optdepends = valgrind: valgrind support
+	depends = pixman
 	provides = cairo
-	conflicts = cairo
+	conflicts = lib32-cairo
 	source = git+https://gitlab.freedesktop.org/cairo/cairo.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index f055a219f12f..25811ff4087d 100755..100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,20 @@
-# Maintainer: Vincent Grande <shoober420@gmail.com>
+# Maintainer:  Vincent Grande <shoober420@gmail.com>
+# Contributor: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Brice Carpentier <brice@daknet.org>
 
 pkgname=cairo-git
-pkgver=1.17.2+17+g52a7c79fd
+pkgver=1.17.4
 pkgrel=1
 pkgdesc="2D graphics library with support for multiple output devices"
 url="https://cairographics.org/"
 arch=(x86_64)
 license=(LGPL MPL)
+depends=(lzo zlib libpng fontconfig freetype2 libx11 libxext libxrender libxcb
+         glib2 pixman)
+makedepends=(valgrind git meson)
 provides=(cairo)
-conflicts=(cairo)
-depends=(libpng libxrender libxext fontconfig pixman glib2 lzo)
-optdepends=("valgrind: valgrind support")
-makedepends=(librsvg gtk2 poppler-glib libspectre git gtk-doc)
-#checkdepends=(ttf-dejavu gsfonts)
+conflicts=(lib32-cairo)
 source=("git+https://gitlab.freedesktop.org/cairo/cairo.git")
 sha256sums=('SKIP')
 
@@ -23,43 +23,15 @@ pkgver() {
   git describe --tags | sed 's/-/+/g'
 }
 
-prepare() {
-  cd cairo
-
-# Fix typo
-sed -i 's/have_png/use_png/g' configure.ac
-
-  NOCONFIGURE=1 ./autogen.sh
-}
-
 build() {
-  cd cairo
-  ./configure --prefix=/usr \
-        --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 \
+    -D spectre=disabled \
+    -D tee=enabled \
+    -D quartz=disable \
+    -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
 }