updated to 1.17.6

4 files changed, 26 insertions, 76 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7db0c8cdc733..91e412e01f1f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-cairo
 	pkgdesc = 2D graphics library with support for multiple output devices (mingw-w64)
-	pkgver = 1.17.4
+	pkgver = 1.17.6
 	pkgrel = 1
 	url = https://cairographics.org
 	arch = any
@@ -20,13 +20,9 @@ pkgbase = mingw-w64-cairo
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://cairographics.org/snapshots/cairo-1.17.4.tar.xz
-	source = 0009-standalone-headers.mingw.patch
+	source = git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=b43e7c6f3cf7855e16170a06d3a9c7234c60ca94
 	source = 0026-create-argb-fonts.all.patch
-	source = 0027-win32-print-fix-unbounded-surface-assertion.patch
-	sha256sums = 74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705
-	sha256sums = 234de8c5d4c28b03c19e638a353e8defb2de0367a634c002b0ea7d2877bd0756
+	sha256sums = SKIP
 	sha256sums = 6db6c44fbdb4926d09afa978fe80430186c4b7b7d255059602b1f94c6a079975
-	sha256sums = 7e244c20eec8c7b287dbee1d34de178d9b0c419dc4c2b11c90eaf626c92bf781
 
 pkgname = mingw-w64-cairo
diff --git a/0009-standalone-headers.mingw.patch b/0009-standalone-headers.mingw.patch
deleted file mode 100644
index ce591c78c00c..000000000000
--- a/0009-standalone-headers.mingw.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cairo-1.12.10/src/Makefile.am.analysis.orig	2013-01-19 16:35:36 +0400
-+++ cairo-1.12.10/src/Makefile.am.analysis	2013-01-19 17:16:51 +0400
-@@ -24,7 +24,7 @@
- 	@echo Checking that enabled public/private headers can be compiled standalone
- 	@status=true; for f in $(enabled_cairo_headers) $(enabled_cairo_private); do \
- 		echo "  CHECK $$f"; \
--		echo "#include \"$(srcdir)/$$f\"" > headers-standalone-tmp.c; \
-+		echo "#include \"$(shell cd $(srcdir) ; pwd -W)/$$f\"" > headers-standalone-tmp.c; \
- 		echo "int main(int argc, char * argv[]) { return 0; }" >> headers-standalone-tmp.c; \
- 		$(COMPILE) -o headers-standalone-tmp headers-standalone-tmp.c || status=false; \
- 		$(RM) headers-standalone-tmp headers-standalone-tmp.c; \
diff --git a/0027-win32-print-fix-unbounded-surface-assertion.patch b/0027-win32-print-fix-unbounded-surface-assertion.patch
deleted file mode 100644
index 524402b22df9..000000000000
--- a/0027-win32-print-fix-unbounded-surface-assertion.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru cairo-1.15.6/src/win32/cairo-win32-printing-surface.c cairo-1.15.6b/src/win32/cairo-win32-printing-surface.c
---- cairo-1.15.6/src/win32/cairo-win32-printing-surface.c	2017-06-09 08:46:49.000000000 +0200
-+++ cairo-1.15.6b/src/win32/cairo-win32-printing-surface.c	2017-07-26 21:41:09.380698500 +0200
-@@ -335,7 +335,7 @@
- static cairo_bool_t
- surface_pattern_supported (const cairo_surface_pattern_t *pattern)
- {
--    if (_cairo_surface_is_recording (pattern->surface))
-+    if (pattern->surface->type == CAIRO_SURFACE_TYPE_RECORDING)
- 	return TRUE;
- 
-     if (pattern->surface->backend->acquire_source_image == NULL)
-@@ -1119,7 +1119,7 @@
-     case CAIRO_PATTERN_TYPE_SURFACE: {
- 	cairo_surface_pattern_t *surface_pattern = (cairo_surface_pattern_t *) pattern;
- 
--	if ( _cairo_surface_is_recording (surface_pattern->surface))
-+	if (surface_pattern->surface->type == CAIRO_SURFACE_TYPE_RECORDING)
- 	    status = _cairo_win32_printing_surface_paint_recording_pattern (surface, surface_pattern);
- 	else
- 	    status = _cairo_win32_printing_surface_paint_image_pattern (surface, pattern, extents);
diff --git a/PKGBUILD b/PKGBUILD
index c2423f3d1887..1f77d6288036 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,12 @@
 # Contributor: Schala Zeal < schalaalexiazeal at gmail dot com >
 # Contributor: Xiao-Long Chen < chenxiaolong at cxl dot epac dot to >
 
-_pkgname=cairo
+
+_commit=b43e7c6f3cf7855e16170a06d3a9c7234c60ca94  # tags/1.17.6^0
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgname=mingw-w64-cairo
-pkgver=1.17.4
+pkgver=1.17.6
 pkgrel=1
 pkgdesc="2D graphics library with support for multiple output devices (mingw-w64)"
 arch=('any')
@@ -24,55 +25,40 @@ makedepends=('mingw-w64-configure'
 conflicts=("${pkgname}-bootstrap")
 replaces=("${pkgname}-bootstrap")
 options=('!strip' '!buildflags' 'staticlibs')
-source=("https://cairographics.org/snapshots/${_pkgname}-${pkgver}.tar.xz"
-        "0009-standalone-headers.mingw.patch"
-        "0026-create-argb-fonts.all.patch"
-        "0027-win32-print-fix-unbounded-surface-assertion.patch")
-sha256sums=('74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705'
-            '234de8c5d4c28b03c19e638a353e8defb2de0367a634c002b0ea7d2877bd0756'
-            '6db6c44fbdb4926d09afa978fe80430186c4b7b7d255059602b1f94c6a079975'
-            '7e244c20eec8c7b287dbee1d34de178d9b0c419dc4c2b11c90eaf626c92bf781')
+source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=${_commit}"
+        "0026-create-argb-fonts.all.patch")
+sha256sums=('SKIP'
+            '6db6c44fbdb4926d09afa978fe80430186c4b7b7d255059602b1f94c6a079975')
+
+pkgver() {
+  cd "${srcdir}/cairo"
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
 
 prepare() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  patch -p1 -i ${srcdir}/0009-standalone-headers.mingw.patch
+  cd "${srcdir}/cairo"
   patch -p1 -i ${srcdir}/0026-create-argb-fonts.all.patch
-  patch -p1 -i ${srcdir}/0027-win32-print-fix-unbounded-surface-assertion.patch
-  autoreconf -fi
 }
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  CFLAGS+=" -Wno-implicit-function-declaration"
+  cd "${srcdir}"
   for _arch in ${_architectures}; do
-    mkdir -p "build-${_arch}" && pushd "build-${_arch}"
-    ${_arch}-configure \
-      --enable-win32 \
-      --enable-win32-font \
-      --enable-gobject \
-      --enable-tee \
-      --disable-xlib \
-      --disable-xcb \
-      --enable-pdf \
-      --enable-ps \
-      --enable-svg \
-      --disable-gtk-doc \
-      --disable-gtk-doc-html \
-      ac_cv_prog
-    make
-    popd
+    ${_arch}-meson cairo build-${_arch} \
+      -D spectre=disabled \
+      -D tee=enabled \
+      -D tests=disabled \
+      -D symbol-lookup=disabled \
+      -D gtk_doc=false
+    meson compile -C build-${_arch}
   done
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}"
   for _arch in ${_architectures}; do
-    pushd "build-${_arch}"
-    make DESTDIR="${pkgdir}" install
+    meson install -C build-${_arch} --destdir "${pkgdir}"
     find "${pkgdir}/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
     find "${pkgdir}/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs ${_arch}-strip -g
-    rm -r "${pkgdir}/usr/${_arch}/share"
-    popd
   done
 }