Automated PR: Changes from updating gir/gir-files

[github-actions]

This PR contains auto-generated changes after a merge in the external gir-files repository.

[sdroege]

Hrm, need GLib 2.85 in the CI images. @bilelmoussaoui that just requires a CI image rebuild once GLib 2.85.0 is released, right?

[bilelmoussaoui]

The image was rebuilt few hours ago and failed with the following

107.6  1493 |         _cairo_surface_release_source_image (extracted_surface, extracted_image, extracted_image_extra);
107.6       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
107.6 ../src/cairo-svg-surface.c: In function ‘_cairo_svg_document_emit_font_subset’:
107.6 ../src/cairo-svg-surface.c:1371:22: note: ‘extracted_surface’ was declared here
107.6  1371 |     cairo_surface_t *extracted_surface;
107.6       |                      ^~~~~~~~~~~~~~~~~
107.7 [213/335] Compiling C object src/libcairo.so.2.11805.5.p/cairo-svg-glyph-render.c.o
107.7 ninja: build stopped: subcommand failed.
107.7 Could not rebuild /cairo/builddir

because we build everything from main, but that error itself is a false-positive one...

[bilelmoussaoui]

actually it been the case for the last two weeks https://github.com/gtk-rs/gtk-rs-core/actions/workflows/image.yml

[sdroege]

The actual error is this though:

#6 106.1 ../src/cairo-xlib-screen.c: In function ‘_cairo_xlib_init_screen_font_options’:
#6 106.1 ../src/cairo-xlib-screen.c:160:25: error: ‘FC_HINT_FULL’ undeclared (first use in this function)
#6 106.1   160 |         xft_hintstyle = FC_HINT_FULL;
#6 106.1       |                         ^~~~~~~~~~~~
#6 106.1 ../src/cairo-xlib-screen.c:160:25: note: each undeclared identifier is reported only once for each function it appears in
#6 106.1 ../src/cairo-xlib-screen.c:166:20: error: ‘FC_RGBA_UNKNOWN’ undeclared (first use in this function)
#6 106.1   166 |         xft_rgba = FC_RGBA_UNKNOWN;
#6 106.1       |                    ^~~~~~~~~~~~~~~
#6 106.1 ../src/cairo-xlib-screen.c:179:28: error: ‘FC_RGBA_RGB’ undeclared (first use in this function)
#6 106.1   179 |                 xft_rgba = FC_RGBA_RGB;
#6 106.1       |                            ^~~~~~~~~~~
#6 106.1 ../src/cairo-xlib-screen.c:182:28: error: ‘FC_RGBA_BGR’ undeclared (first use in this function)
#6 106.1   182 |                 xft_rgba = FC_RGBA_BGR;
#6 106.1       |                            ^~~~~~~~~~~
#6 106.1 ../src/cairo-xlib-screen.c:185:28: error: ‘FC_RGBA_VRGB’ undeclared (first use in this function)
#6 106.1   185 |                 xft_rgba = FC_RGBA_VRGB;
#6 106.1       |                            ^~~~~~~~~~~~
#6 106.1 ../src/cairo-xlib-screen.c:188:28: error: ‘FC_RGBA_VBGR’ undeclared (first use in this function)
#6 106.1   188 |                 xft_rgba = FC_RGBA_VBGR;
#6 106.1       |                            ^~~~~~~~~~~~
#6 106.1 ../src/cairo-xlib-screen.c:191:28: error: ‘FC_RGBA_NONE’ undeclared (first use in this function)
#6 106.1   191 |                 xft_rgba = FC_RGBA_NONE;
#6 106.1       |                            ^~~~~~~~~~~~
#6 106.1 ../src/cairo-xlib-screen.c:200:14: error: ‘FC_HINT_NONE’ undeclared (first use in this function)
#6 106.1   200 |         case FC_HINT_NONE:
#6 106.1       |              ^~~~~~~~~~~~
#6 106.1 ../src/cairo-xlib-screen.c:203:14: error: ‘FC_HINT_SLIGHT’ undeclared (first use in this function)
#6 106.1   203 |         case FC_HINT_SLIGHT:
#6 106.1       |              ^~~~~~~~~~~~~~
#6 106.1 ../src/cairo-xlib-screen.c:206:14: error: ‘FC_HINT_MEDIUM’ undeclared (first use in this function)
#6 106.1   206 |         case FC_HINT_MEDIUM:
#6 106.1       |              ^~~~~~~~~~~~~~
#6 106.1 ../src/cairo-xlib-screen.c:239:10: error: ‘FC_LCD_NONE’ undeclared (first use in this function)
#6 106.1   239 |     case FC_LCD_NONE:
#6 106.1       |          ^~~~~~~~~~~
#6 106.1 ../src/cairo-xlib-screen.c:242:10: error: ‘FC_LCD_DEFAULT’ undeclared (first use in this function)
#6 106.1   242 |     case FC_LCD_DEFAULT:
#6 106.1       |          ^~~~~~~~~~~~~~
#6 106.1 ../src/cairo-xlib-screen.c:245:10: error: ‘FC_LCD_LIGHT’ undeclared (first use in this function)
#6 106.1   245 |     case FC_LCD_LIGHT:
#6 106.1       |          ^~~~~~~~~~~~
#6 106.1 ../src/cairo-xlib-screen.c:248:10: error: ‘FC_LCD_LEGACY’ undeclared (first use in this function)
#6 106.1   248 |     case FC_LCD_LEGACY:
#6 106.1       |          ^~~~~~~~~~~~~

Something broke with fontconfig it seems?

[bilelmoussaoui]

ah nvm, didn't look too hard at the logs.

[bilelmoussaoui]

oh no, me by merging the gir-files changes, i overwrote your commits here. Sorry for that...

[sdroege]

No problem, just rebased and here they are again :)

[sdroege]

regen check fails 🙄

Run git diff --exit-code
diff --git a/glib/gobject-sys/Cargo.toml b/glib/gobject-sys/Cargo.toml
index 5636d27..89f7bb9 100644
--- a/glib/gobject-sys/Cargo.toml
+++ b/glib/gobject-sys/Cargo.toml
@@ -23,7 +23,7 @@ v2_76 = ["v2_74"]
 v2_78 = ["v2_74"]
 v2_80 = ["v2_78"]
 v2_82 = ["v2_80"]
-v2_84 = ["v2_82"]
+v2_84 = ["v2_80"]
 v2_86 = ["v2_84"]

[bilelmoussaoui]

oups i merged too fast

[bilelmoussaoui]

that is indeed a bit dumb...