From cf28821337735bb1bee3599129592e9e84c53616 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Tue, 8 Feb 2022 19:03:17 +0200 Subject: [PATCH] [meson] fix building with Cairo subproject MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We can’t pass internal (subproject) dependency to cpp.has_function(), so we manually hard-code the result. --- meson.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 6fbbcb42b..a231755f6 100644 --- a/meson.build +++ b/meson.build @@ -186,7 +186,12 @@ endif if cairo_dep.found() conf.set('HAVE_CAIRO', 1) - check_funcs += [['cairo_user_font_face_set_render_color_glyph_func', {'deps': cairo_dep}]] + 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) + else + check_funcs += [['cairo_user_font_face_set_render_color_glyph_func', {'deps': cairo_dep}]] + endif endif if cairo_ft_dep.found()