From: Po Lu <luangruo@yahoo.com>
Date: Fri, 28 Oct 2022 11:35:39 +0000 (+0800)
Subject: Fix build without Cairo FreeType and fontconfig support
X-Git-Tag: emacs-29.0.90~1616^2~427
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=36ca409d72d47aee91fe0b76431c35825789f877;p=emacs.git

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)
---

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