From 74ebfc646a662fa84e20f3aafeb02f42daf41496 Mon Sep 17 00:00:00 2001
From: Khaled Hosny <khaled@aliftype.com>
Date: Tue, 8 Feb 2022 22:44:11 +0200
Subject: [PATCH] [meson] Update cairo subproject

Update to the current master branch so that is has
cairo_user_font_face_set_render_color_glyph_func().

I had to disable optimized builds on win[32|64] crossbuild setups
because they are now broken in the CI (something about cairo defining
_FORTIFY_SOURCE for optimized builds that MingW does not like).
---
 .ci/build-win32.sh     | 1 -
 .ci/build-win64.sh     | 1 -
 meson.build            | 3 +--
 subprojects/cairo.wrap | 2 +-
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.ci/build-win32.sh b/.ci/build-win32.sh
index 39ed42cb3..a1ca53d27 100755
--- a/.ci/build-win32.sh
+++ b/.ci/build-win32.sh
@@ -3,7 +3,6 @@ set -e
 
 meson 	--cross-file=.ci/win32-cross-file.txt \
 	--wrap-mode=forcefallback \
-	--buildtype=release \
 	-Dtests=disabled \
 	-Dcairo=enabled \
 	-Dcairo:fontconfig=disabled \
diff --git a/.ci/build-win64.sh b/.ci/build-win64.sh
index 652410a97..385d55974 100644
--- a/.ci/build-win64.sh
+++ b/.ci/build-win64.sh
@@ -3,7 +3,6 @@ set -e
 
 meson 	--cross-file=.ci/win64-cross-file.txt \
 	--wrap-mode=forcefallback \
-	--buildtype=release \
 	-Dtests=disabled \
 	-Dcairo=enabled \
 	-Dcairo:fontconfig=disabled \
diff --git a/meson.build b/meson.build
index 566567b06..8a9400cdb 100644
--- a/meson.build
+++ b/meson.build
@@ -187,8 +187,7 @@ endif
 if cairo_dep.found()
   conf.set('HAVE_CAIRO', 1)
   if cairo_dep.type_name() == 'internal'
-    # FIXME: uncomment this when we update Ciaro subproject
-    #conf.set('HAVE_CAIRO_USER_FONT_FACE_SET_RENDER_COLOR_GLYPH_FUNC', 1)
+    conf.set('HAVE_CAIRO_USER_FONT_FACE_SET_RENDER_COLOR_GLYPH_FUNC', 1)
   else
     check_funcs += [['cairo_user_font_face_set_render_color_glyph_func', {'deps': cairo_dep}]]
   endif
diff --git a/subprojects/cairo.wrap b/subprojects/cairo.wrap
index 7a7d18c8c..386536d1f 100644
--- a/subprojects/cairo.wrap
+++ b/subprojects/cairo.wrap
@@ -2,7 +2,7 @@
 directory=cairo
 url=https://gitlab.freedesktop.org/cairo/cairo.git
 depth=1
-revision=1.17.4
+revision=fb3734fac0b41eb370911b04cbfa6604a99e6bf7
 
 [provide]
 dependency_names = cairo, cairo-ft