Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix build without Cairo FreeType and fontconfig support

Browse source 
* src/xsettings.c (apply_xft_settings): Don't enable Xft code
unless Cairo FreeType support is present.  (bug#58830)
This commit is contained in:
Po Lu 2022-10-28 19:35:39 +08:00
parent e893fd1073
commit 36ca409d72
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/xsettings.c
View file

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