aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPo Lu2022-10-28 19:35:39 +0800
committerPo Lu2022-10-28 19:35:39 +0800
commit36ca409d72d47aee91fe0b76431c35825789f877 (patch)
tree94c40cfcb90581307acc92057a5bdcffd9093f1e /src
parente893fd10735239aeecae83805fc4cc6b37156a01 (diff)
downloademacs-36ca409d72d47aee91fe0b76431c35825789f877.tar.gz
emacs-36ca409d72d47aee91fe0b76431c35825789f877.zip
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)
Diffstat (limited to 'src')
-rw-r--r--src/xsettings.c6
1 files 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
804apply_xft_settings (Display_Info *dpyinfo, 804apply_xft_settings (Display_Info *dpyinfo,
805 struct xsettings *settings) 805 struct xsettings *settings)
806{ 806{
807#if defined USE_CAIRO || defined HAVE_XFT 807#if defined HAVE_XFT \
808 || (defined USE_CAIRO && defined CAIRO_HAS_FC_FONT \
809 && defined CAIRO_HAS_FT_FONT)
808 FcPattern *pat; 810 FcPattern *pat;
809 struct xsettings oldsettings; 811 struct xsettings oldsettings;
810 bool changed = false; 812 bool changed = false;
@@ -940,7 +942,7 @@ apply_xft_settings (Display_Info *dpyinfo,
940 } 942 }
941 else 943 else
942 FcPatternDestroy (pat); 944 FcPatternDestroy (pat);
943#endif /* HAVE_XFT */ 945#endif /* HAVE_XFT || (USE_CAIRO && CAIRO_HAS_FC_FONT && CAIRO_HAS_FT_FONT) */
944} 946}
945#endif 947#endif
946 948