bug#58830: 29.0.50; Build failure on master with cairo_ft_font_options_substitute

[Sam James]

Po Lu <luangruo@yahoo.com> writes:

> Sam James <sam@gentoo.org> writes:
>
>> Sadly no. Attaching new build.log & config.log.
>
> Thanks, what if you apply this:
>
> diff --git a/src/xsettings.c b/src/xsettings.c
> index deacddcfde..15e7ff5499 100644
> --- a/src/xsettings.c
> +++ b/src/xsettings.c
> @@ -54,12 +54,14 @@ Copyright (C) 2009-2022 Free Software Foundation, Inc.
>  #include <gconf/gconf-client.h>
>  #endif
>  
> -#if defined USE_CAIRO || defined HAVE_XFT
>  #ifdef USE_CAIRO
>  #include <fontconfig/fontconfig.h>
> -#else  /* HAVE_XFT */
> +#elif defined HAVE_XFT
>  #include <X11/Xft/Xft.h>
>  #endif
> +
> +#if defined USE_CAIRO && defined CAIRO_HAS_FT_FONT
> +#include <cairo/cairo-ft.h>
>  #endif
>  
>  static char *current_mono_font;

Works! Thank you!

signature.asc
Description: PGP signature