Compilation of src/xsettings.c fails when configured with --without_gsettings

Compilation of src/xsettings.c fails when configured with --without_gsettings

[wilde]

Hi *,

When HAVE_GSETTINGS is not defined (e.g. --without-gsettings
configuration option), but HAVE_PGTK is defined, then compilation of
src/xsettings.c fails with:

../../src/xsettings.c: In function ‘xsettings_get_font_options’:
../../src/xsettings.c:1163:35: error: ‘font_options’ undeclared (first use in this function)
 1163 |   return cairo_font_options_copy (font_options);
      |                                   ^~~~~~~~~~~~
../../src/xsettings.c:1163:35: note: each undeclared identifier is reported only once for each function it appears in
../../src/xsettings.c: In function ‘syms_of_xsettings’:
../../src/xsettings.c:1220:3: error: ‘font_options’ undeclared (first use in this function)
 1220 |   font_options = NULL;
      |   ^~~~~~~~~~~~

This happens due to the fact that: `font_options' is declared in L.231 which is guarded by
#ifdef HAVE_GSETTINGS
in L.209.

This was problem was most likely introduced with:

commit 526e9758de7d163ce3b25fde69a4e122ce9c3742
Author: Pieter van Prooijen <pieter.van.prooijen@teloden.nl>
Date:   Sun May 8 16:27:38 2022 +0200

    Use gsettings font rendering entries for pgtk builds

cheers,
sascha

Re: Compilation of src/xsettings.c fails when configured with --without_gsettings

[Pieter van Prooijen]

Hi Sascha,

It looks like my gsettings font changes needs some extra ifdef guards
to handle this case. I'll create a bug and patch for this in bug-gnu-
emacs.

Thanks,

Pieter
  
On Sat, 2022-05-14 at 20:27 +0200, wilde@sha-bang.de wrote:
> Hi *,
> 
> When HAVE_GSETTINGS is not defined (e.g. --without-gsettings
> configuration option), but HAVE_PGTK is defined, then compilation of
> src/xsettings.c fails with:
> 
> ../../src/xsettings.c: In function ‘xsettings_get_font_options’:
> ../../src/xsettings.c:1163:35: error: ‘font_options’ undeclared
> (first use in this function)
>  1163 |   return cairo_font_options_copy (font_options);
>       |                                   ^~~~~~~~~~~~
> ../../src/xsettings.c:1163:35: note: each undeclared identifier is
> reported only once for each function it appears in
> ../../src/xsettings.c: In function ‘syms_of_xsettings’:
> ../../src/xsettings.c:1220:3: error: ‘font_options’ undeclared (first
> use in this function)
>  1220 |   font_options = NULL;
>       |   ^~~~~~~~~~~~
> 
> This happens due to the fact that: `font_options' is declared in
> L.231 which is guarded by
> #ifdef HAVE_GSETTINGS
> in L.209.
> 
> This was problem was most likely introduced with:
> 
> commit 526e9758de7d163ce3b25fde69a4e122ce9c3742
> Author: Pieter van Prooijen <pieter.van.prooijen@teloden.nl>
> Date:   Sun May 8 16:27:38 2022 +0200
> 
>     Use gsettings font rendering entries for pgtk builds
> 
> cheers,
> sascha