From 36ca409d72d47aee91fe0b76431c35825789f877 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Fri, 28 Oct 2022 19:35:39 +0800 Subject: [PATCH] Fix build without Cairo FreeType and fontconfig support * src/xsettings.c (apply_xft_settings): Don't enable Xft code unless Cairo FreeType support is present. (bug#58830) --- src/xsettings.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/xsettings.c b/src/xsettings.c index 14098e21f5c..deacddcfde9 100644 --- a/src/xsettings.c +++ b/src/xsettings.c @@ -804,7 +804,9 @@ static void apply_xft_settings (Display_Info *dpyinfo, struct xsettings *settings) { -#if defined USE_CAIRO || defined HAVE_XFT +#if defined HAVE_XFT \ + || (defined USE_CAIRO && defined CAIRO_HAS_FC_FONT \ + && defined CAIRO_HAS_FT_FONT) FcPattern *pat; struct xsettings oldsettings; bool changed = false; @@ -940,7 +942,7 @@ apply_xft_settings (Display_Info *dpyinfo, } else FcPatternDestroy (pat); -#endif /* HAVE_XFT */ +#endif /* HAVE_XFT || (USE_CAIRO && CAIRO_HAS_FC_FONT && CAIRO_HAS_FT_FONT) */ } #endif -- 2.39.5