diff -ur /tmp/guix-build-gtk-4.22.1.drv-0/build/demos/gtk-demo/demos.h /tmp/guix-build-gtk-4.22.1.drv-1/build/demos/gtk-demo/demos.h
--- /tmp/guix-build-gtk-4.22.1.drv-0/build/demos/gtk-demo/demos.h	2026-03-17 14:55:14.243376022 +0900
+++ /tmp/guix-build-gtk-4.22.1.drv-1/build/demos/gtk-demo/demos.h	2026-03-17 14:57:14.061613884 +0900
@@ -144,10 +144,10 @@
 };
 
 DemoData child10[] = {
-  { "editable_cells", "Editable Cells", (const char*[]) {"gtkliststore", "gtkcellrenderercombo", "gtkcellrendererprogress", "gtktreeview", "gtkcellrenderer::editing-started", "gtkcellrenderertext", NULL }, "editable_cells.c", do_editable_cells, NULL },
-  { "filtermodel", "Filter Model", (const char*[]) {"gtktreemodelfilter", "gtktreeview", NULL }, "filtermodel.c", do_filtermodel, NULL },
-  { "list_store", "List Store", (const char*[]) {"gtkliststore", "gtktreeview", NULL }, "list_store.c", do_list_store, NULL },
-  { "tree_store", "Tree Store", (const char*[]) {"gtkliststore", "gtktreestore", "gtktreeview", NULL }, "tree_store.c", do_tree_store, NULL },
+  { "editable_cells", "Editable Cells", (const char*[]) {"gtkcellrenderercombo", "gtkcellrenderertext", "gtkcellrenderer::editing-started", "gtkliststore", "gtkcellrendererprogress", "gtktreeview", NULL }, "editable_cells.c", do_editable_cells, NULL },
+  { "filtermodel", "Filter Model", (const char*[]) {"gtktreeview", "gtktreemodelfilter", NULL }, "filtermodel.c", do_filtermodel, NULL },
+  { "list_store", "List Store", (const char*[]) {"gtktreeview", "gtkliststore", NULL }, "list_store.c", do_list_store, NULL },
+  { "tree_store", "Tree Store", (const char*[]) {"gtktreestore", "gtktreeview", "gtkliststore", NULL }, "tree_store.c", do_tree_store, NULL },
   { NULL }
 };
 
@@ -169,15 +169,15 @@
 };
 
 DemoData child15[] = {
-  { "fixed", " Cube", (const char*[]) {"gtkfixed", "gtklayoutmanager", NULL }, "fixed.c", do_fixed, NULL },
-  { "fixed2", " Transformations", (const char*[]) {"gtkfixed", "gtklayoutmanager", NULL }, "fixed2.c", do_fixed2, NULL },
+  { "fixed", " Cube", (const char*[]) {"gtklayoutmanager", "gtkfixed", NULL }, "fixed.c", do_fixed, NULL },
+  { "fixed2", " Transformations", (const char*[]) {"gtklayoutmanager", "gtkfixed", NULL }, "fixed2.c", do_fixed2, NULL },
   { NULL }
 };
 
 DemoData child17[] = {
   { "fontrendering", "Font Rendering", (const char*[]) {NULL }, "fontrendering.c", do_fontrendering, NULL },
   { "font_features", "Font Explorer", (const char*[]) {"pango", NULL }, "font_features.c", do_font_features, NULL },
-  { "rotated_text", "Rotated Text", (const char*[]) {"gtklabel", "pangocairo", NULL }, "rotated_text.c", do_rotated_text, NULL },
+  { "rotated_text", "Rotated Text", (const char*[]) {"pangocairo", "gtklabel", NULL }, "rotated_text.c", do_rotated_text, NULL },
   { "textmask", "Text Mask", (const char*[]) {"pangocairo", NULL }, "textmask.c", do_textmask, NULL },
   { NULL }
 };
@@ -190,24 +190,24 @@
 };
 
 DemoData child22[] = {
-  { "hypertext", "Hypertext", (const char*[]) {"gtktextbuffer", "gtktextview", NULL }, "hypertext.c", do_hypertext, NULL },
-  { "markup", "Markup", (const char*[]) {"gtktextbuffer", "pango", "gtktextview", NULL }, "markup.c", do_markup, NULL },
+  { "hypertext", "Hypertext", (const char*[]) {"gtktextview", "gtktextbuffer", NULL }, "hypertext.c", do_hypertext, NULL },
+  { "markup", "Markup", (const char*[]) {"gtktextview", "pango", "gtktextbuffer", NULL }, "markup.c", do_markup, NULL },
   { "tabs", "Tabs", (const char*[]) {"gtktextview", NULL }, "tabs.c", do_tabs, NULL },
-  { "textundo", "Undo and Redo", (const char*[]) {"gtktextbuffer", "gtktextview", NULL }, "textundo.c", do_textundo, NULL },
-  { "textview", "Multiple Views", (const char*[]) {"gtktextbuffer", "gtktextviews", "gtktextview", NULL }, "textview.c", do_textview, NULL },
-  { "textscroll", "Automatic Scrolling", (const char*[]) {"gtktextmarks", "gtkscrolledwindow", "gtktextview", NULL }, "textscroll.c", do_textscroll, NULL },
+  { "textundo", "Undo and Redo", (const char*[]) {"gtktextview", "gtktextbuffer", NULL }, "textundo.c", do_textundo, NULL },
+  { "textview", "Multiple Views", (const char*[]) {"gtktextview", "gtktextviews", "gtktextbuffer", NULL }, "textview.c", do_textview, NULL },
+  { "textscroll", "Automatic Scrolling", (const char*[]) {"gtktextview", "gtkscrolledwindow", "gtktextmarks", NULL }, "textscroll.c", do_textscroll, NULL },
   { NULL }
 };
 
 DemoData child24[] = {
-  { "iconview", "Icon View Basics", (const char*[]) {"gtktreemodel", "gtkiconview", NULL }, "iconview.c", do_iconview, NULL },
-  { "iconview_edit", "Editing and Drag-and-Drop", (const char*[]) {"dnd", "gtkcelllayout", "gtkiconview", NULL }, "iconview_edit.c", do_iconview_edit, NULL },
+  { "iconview", "Icon View Basics", (const char*[]) {"gtkiconview", "gtktreemodel", NULL }, "iconview.c", do_iconview, NULL },
+  { "iconview_edit", "Editing and Drag-and-Drop", (const char*[]) {"gtkiconview", "gtkcelllayout", "dnd", NULL }, "iconview_edit.c", do_iconview_edit, NULL },
   { NULL }
 };
 
 DemoData child26[] = {
   { "layoutmanager", "Transition", (const char*[]) {"gtklayoutmanager", NULL }, "layoutmanager.c", do_layoutmanager, NULL },
-  { "layoutmanager2", "Transformation", (const char*[]) {"gsktransform", "gtklayoutmanager", NULL }, "layoutmanager2.c", do_layoutmanager2, NULL },
+  { "layoutmanager2", "Transformation", (const char*[]) {"gtklayoutmanager", "gsktransform", NULL }, "layoutmanager2.c", do_layoutmanager2, NULL },
   { NULL }
 };
 
@@ -218,16 +218,16 @@
 };
 
 DemoData child31[] = {
-  { "listview_applauncher", "Application launcher", (const char*[]) {"glistmodel", "gtklistview", "gtklistitemfactory", NULL }, "listview_applauncher.c", do_listview_applauncher, NULL },
-  { "listview_clocks", "Clocks", (const char*[]) {"glistmodel", "gtklistitemfactory", "gtkgridview", "gtkbuilder", NULL }, "listview_clocks.c", do_listview_clocks, NULL },
-  { "listview_colors", "Colors", (const char*[]) {"gtksortlistmodel", "gtkmultiselection", "gtkgridview", "gtkdropdown", NULL }, "listview_colors.c", do_listview_colors, NULL },
-  { "listview_filebrowser", "File browser", (const char*[]) {"glistmodel", "gtklistview", "gtkgridview", NULL }, "listview_filebrowser.c", do_listview_filebrowser, NULL },
-  { "listview_minesweeper", "Minesweeper", (const char*[]) {"glistmodel", "game", "gtkgridview", NULL }, "listview_minesweeper.c", do_listview_minesweeper, NULL },
-  { "listview_selections", "Selections", (const char*[]) {"suggestion", "gtkcombobox", "gtkentrycompletion", "completion", "gtkcomboboxtext", "gtkdropdown", NULL }, "listview_selections.c", do_listview_selections, NULL },
-  { "listview_settings", "Settings", (const char*[]) {"glistmodel", "gtklistview", "gsettings", "gtkcolumnview", "gtklistitemfactory", NULL }, "listview_settings.c", do_listview_settings, NULL },
-  { "listview_settings2", "Alternative Settings", (const char*[]) {"gtksectionmodel", "gsettings", "gtklistheaderfactory", "gtklistview", NULL }, "listview_settings2.c", do_listview_settings2, NULL },
+  { "listview_applauncher", "Application launcher", (const char*[]) {"gtklistitemfactory", "glistmodel", "gtklistview", NULL }, "listview_applauncher.c", do_listview_applauncher, NULL },
+  { "listview_clocks", "Clocks", (const char*[]) {"gtklistitemfactory", "glistmodel", "gtkgridview", "gtkbuilder", NULL }, "listview_clocks.c", do_listview_clocks, NULL },
+  { "listview_colors", "Colors", (const char*[]) {"gtkmultiselection", "gtksortlistmodel", "gtkgridview", "gtkdropdown", NULL }, "listview_colors.c", do_listview_colors, NULL },
+  { "listview_filebrowser", "File browser", (const char*[]) {"gtklistview", "glistmodel", "gtkgridview", NULL }, "listview_filebrowser.c", do_listview_filebrowser, NULL },
+  { "listview_minesweeper", "Minesweeper", (const char*[]) {"glistmodel", "gtkgridview", "game", NULL }, "listview_minesweeper.c", do_listview_minesweeper, NULL },
+  { "listview_selections", "Selections", (const char*[]) {"gtkentrycompletion", "gtkdropdown", "completion", "gtkcombobox", "gtkcomboboxtext", "suggestion", NULL }, "listview_selections.c", do_listview_selections, NULL },
+  { "listview_settings", "Settings", (const char*[]) {"gtkcolumnview", "gsettings", "gtklistitemfactory", "glistmodel", "gtklistview", NULL }, "listview_settings.c", do_listview_settings, NULL },
+  { "listview_settings2", "Alternative Settings", (const char*[]) {"gsettings", "gtklistheaderfactory", "gtksectionmodel", "gtklistview", NULL }, "listview_settings2.c", do_listview_settings2, NULL },
   { "listview_ucd", "Characters", (const char*[]) {NULL }, "listview_ucd.c", do_listview_ucd, NULL },
-  { "listview_weather", "Weather", (const char*[]) {"gtkorientable", "gtklistview", "gtknoselectionmodel", NULL }, "listview_weather.c", do_listview_weather, NULL },
+  { "listview_weather", "Weather", (const char*[]) {"gtknoselectionmodel", "gtkorientable", "gtklistview", NULL }, "listview_weather.c", do_listview_weather, NULL },
   { "listview_words", "Words", (const char*[]) {"gtkinscription", "gtklistview", "gtkfilterlistmodel", NULL }, "listview_words.c", do_listview_words, NULL },
   { NULL }
 };
@@ -235,7 +235,7 @@
 DemoData child43[] = {
   { "overlay", "Interactive Overlay", (const char*[]) {"gtkoverlay", NULL }, "overlay.c", do_overlay, NULL },
   { "overlay_decorative", "Decorative Overlay", (const char*[]) {"gtkoverlay", NULL }, "overlay_decorative.c", do_overlay_decorative, NULL },
-  { "transparent", "Transparency", (const char*[]) {"gtkoverlay", "blur", "backdrop-filter", "gtksnapshot", NULL }, "transparent.c", do_transparent, NULL },
+  { "transparent", "Transparency", (const char*[]) {"blur", "gtksnapshot", "backdrop-filter", "gtkoverlay", NULL }, "transparent.c", do_transparent, NULL },
   { NULL }
 };
 
@@ -244,7 +244,7 @@
   { "paintable_animated", "Animated Paintable", (const char*[]) {"gdkpaintable", NULL }, "paintable_animated.c", do_paintable_animated, NULL },
   { "paintable_emblem", "Emblems", (const char*[]) {"gdkpaintable", NULL }, "paintable_emblem.c", do_paintable_emblem, NULL },
   { "paintable_mediastream", "Media Stream", (const char*[]) {"gtkmediastream", "gdkpaintable", NULL }, "paintable_mediastream.c", do_paintable_mediastream, NULL },
-  { "paintable_svg", "SVG", (const char*[]) {"gtkpicture", "gtksvg", NULL }, "paintable_svg.c", do_paintable_svg, NULL },
+  { "paintable_svg", "SVG", (const char*[]) {"gtksvg", "gtkpicture", NULL }, "paintable_svg.c", do_paintable_svg, NULL },
   { "paintable_symbolic", "Symbolic Paintable", (const char*[]) {"gdkpaintables", "gtksymbolicpaintable", NULL }, "paintable_symbolic.c", do_paintable_symbolic, NULL },
   { NULL }
 };
@@ -262,22 +262,22 @@
 
 DemoData child59[] = {
   { "printing", "Printing", (const char*[]) {"gtkprintoperation", NULL }, "printing.c", do_printing, NULL },
-  { "pagesetup", "Page Setup", (const char*[]) {"gtkpagesetupunixdialog", "gtkpagesetup", NULL }, "pagesetup.c", do_pagesetup, NULL },
+  { "pagesetup", "Page Setup", (const char*[]) {"gtkpagesetup", "gtkpagesetupunixdialog", NULL }, "pagesetup.c", do_pagesetup, NULL },
   { NULL }
 };
 
 DemoData gtk_demos[] = {
-  { "application_demo", "Application Class", (const char*[]) {"gtkapplication", "gmenu", "gresource", "gtkapplicationwindow", "gtkbuilder", NULL }, "application_demo.c", do_application_demo, NULL },
+  { "application_demo", "Application Class", (const char*[]) {"gmenu", "gresource", "gtkbuilder", "gtkapplication", "gtkapplicationwindow", NULL }, "application_demo.c", do_application_demo, NULL },
   { "aspect_frame", "Aspect Frame", (const char*[]) {"gtkaspectframe", NULL }, "aspect_frame.c", do_aspect_frame, NULL },
   { "assistant", "Assistant", (const char*[]) {"gtkassistant", NULL }, "assistant.c", do_assistant, NULL },
   { NULL, "Benchmark", (const char*[]) {NULL }, NULL, NULL, child14 },
-  { "builder", "Builder", (const char*[]) {"gtkshortcutcontroller", "gmenu", "gtkpopovermenubar", "toolbar", "gtkbuilder", NULL }, "builder.c", do_builder, NULL },
-  { "clipboard", "Clipboard", (const char*[]) {"drag-and-drop", "dnd", "gdkclipboard", NULL }, "clipboard.c", do_clipboard, NULL },
-  { "combobox", "Combo Boxes", (const char*[]) {"gtkcellrenderer", "gtkcombobox", "gtkcomboboxentry", NULL }, "combobox.c", do_combobox, NULL },
+  { "builder", "Builder", (const char*[]) {"gmenu", "gtkshortcutcontroller", "gtkpopovermenubar", "gtkbuilder", "toolbar", NULL }, "builder.c", do_builder, NULL },
+  { "clipboard", "Clipboard", (const char*[]) {"dnd", "gdkclipboard", "drag-and-drop", NULL }, "clipboard.c", do_clipboard, NULL },
+  { "combobox", "Combo Boxes", (const char*[]) {"gtkcellrenderer", "gtkcomboboxentry", "gtkcombobox", NULL }, "combobox.c", do_combobox, NULL },
   { NULL, "Constraints", (const char*[]) {NULL }, NULL, NULL, child0 },
   { "cursors", "Cursors", (const char*[]) {NULL }, "cursors.c", do_cursors, NULL },
   { "dialog", "Dialogs", (const char*[]) {"gtkmessagedialog", NULL }, "dialog.c", do_dialog, NULL },
-  { "dnd", "Drag-and-Drop", (const char*[]) {"popover", "dnd", "menu", "gesture", NULL }, "dnd.c", do_dnd, NULL },
+  { "dnd", "Drag-and-Drop", (const char*[]) {"menu", "popover", "gesture", "dnd", NULL }, "dnd.c", do_dnd, NULL },
   { "drawingarea", "Drawing Area", (const char*[]) {"gtkdrawingarea", NULL }, "drawingarea.c", do_drawingarea, NULL },
   { NULL, "Entry", (const char*[]) {NULL }, NULL, NULL, child11 },
   { "errorstates", "Error States", (const char*[]) {"gtklabel", "gtkbuilderscope", "gtkentry", "gtkbuilder", NULL }, "errorstates.c", do_errorstates, NULL },
@@ -285,11 +285,11 @@
   { NULL, "Fixed Layout ", (const char*[]) {NULL }, NULL, NULL, child15 },
   { "flowbox", "Flow Box", (const char*[]) {"gtkflowbox", NULL }, "flowbox.c", do_flowbox, NULL },
   { "gestures", "Gestures", (const char*[]) {"gtkgesture", NULL }, "gestures.c", do_gestures, NULL },
-  { "headerbar", "Header Bar", (const char*[]) {"gtkwindowcontrols", "gtkheaderbar", "gtkwindowhandle", NULL }, "headerbar.c", do_headerbar, NULL },
+  { "headerbar", "Header Bar", (const char*[]) {"gtkheaderbar", "gtkwindowhandle", "gtkwindowcontrols", NULL }, "headerbar.c", do_headerbar, NULL },
   { NULL, "Icon View", (const char*[]) {NULL }, NULL, NULL, child24 },
-  { "image_filtering", "Image Filtering", (const char*[]) {"saturation", "posterize", "color", "graph", "gpu", "blur", "contrast", "brightness", "sepia", NULL }, "image_filtering.c", do_image_filtering, NULL },
-  { "image_scaling", "Image Scaling", (const char*[]) {"gtkpicture", "scale", "menu", "action", "zoom", "filter", NULL }, "image_scaling.c", do_image_scaling, NULL },
-  { "images", "Images", (const char*[]) {"gtkpicture", "gtkimage", "gtkwidgetpaintable", "gdkpaintable", NULL }, "images.c", do_images, NULL },
+  { "image_filtering", "Image Filtering", (const char*[]) {"graph", "contrast", "gpu", "sepia", "color", "saturation", "brightness", "blur", "posterize", NULL }, "image_filtering.c", do_image_filtering, NULL },
+  { "image_scaling", "Image Scaling", (const char*[]) {"menu", "gtkpicture", "scale", "zoom", "filter", "action", NULL }, "image_scaling.c", do_image_scaling, NULL },
+  { "images", "Images", (const char*[]) {"gtkimage", "gtkpicture", "gtkwidgetpaintable", "gdkpaintable", NULL }, "images.c", do_images, NULL },
   { "infobar", "Info Bars", (const char*[]) {"gtkinfobar", NULL }, "infobar.c", do_infobar, NULL },
   { NULL, "Layout Manager", (const char*[]) {NULL }, NULL, NULL, child26 },
   { "links", "Links", (const char*[]) {"gtklabel", NULL }, "links.c", do_links, NULL },
@@ -298,21 +298,21 @@
   { "mask", "Masking", (const char*[]) {NULL }, "mask.c", do_mask, NULL },
   { NULL, "OpenGL", (const char*[]) {NULL }, NULL, NULL, child20 },
   { NULL, "Overlay", (const char*[]) {NULL }, NULL, NULL, child43 },
-  { "paint", "Paint", (const char*[]) {"gdkdrawingarea", "gtkgesture", NULL }, "paint.c", do_paint, NULL },
+  { "paint", "Paint", (const char*[]) {"gtkgesture", "gdkdrawingarea", NULL }, "paint.c", do_paint, NULL },
   { NULL, "Paintable", (const char*[]) {NULL }, NULL, NULL, child45 },
   { "panes", "Paned Widgets", (const char*[]) {"gtkpaned", NULL }, "panes.c", do_panes, NULL },
   { NULL, "Pango", (const char*[]) {NULL }, NULL, NULL, child17 },
   { NULL, "Path", (const char*[]) {NULL }, NULL, NULL, child52 },
-  { "peg_solitaire", "Peg Solitaire", (const char*[]) {"game", "drag-and-drop", "dnd", "gtkgridview", NULL }, "peg_solitaire.c", do_peg_solitaire, NULL },
-  { "pickers", "Pickers and Launchers", (const char*[]) {"gtkfilelauncher", "gtkcolordialog", "gtkfiledialog", "gtkprintdialog", "gtkurilauncher", "gtkfontdialog", NULL }, "pickers.c", do_pickers, NULL },
+  { "peg_solitaire", "Peg Solitaire", (const char*[]) {"dnd", "gtkgridview", "game", "drag-and-drop", NULL }, "peg_solitaire.c", do_peg_solitaire, NULL },
+  { "pickers", "Pickers and Launchers", (const char*[]) {"gtkcolordialog", "gtkurilauncher", "gtkfiledialog", "gtkfontdialog", "gtkfilelauncher", "gtkprintdialog", NULL }, "pickers.c", do_pickers, NULL },
   { NULL, "Printing", (const char*[]) {NULL }, NULL, NULL, child59 },
   { "read_more", "Read More", (const char*[]) {"gtkinscription", NULL }, "read_more.c", do_read_more, NULL },
   { "revealer", "Revealer", (const char*[]) {"gtkrevealer", NULL }, "revealer.c", do_revealer, NULL },
   { "scale", "Scales", (const char*[]) {"gtkscale", NULL }, "scale.c", do_scale, NULL },
-  { "shortcut_triggers", "Shortcuts", (const char*[]) {"gtkshortcut", "gtkshortcutcontroller", NULL }, "shortcut_triggers.c", do_shortcut_triggers, NULL },
+  { "shortcut_triggers", "Shortcuts", (const char*[]) {"gtkshortcutcontroller", "gtkshortcut", NULL }, "shortcut_triggers.c", do_shortcut_triggers, NULL },
   { "shortcuts", "Shortcuts Window", (const char*[]) {"gtkshortcutswindow", NULL }, "shortcuts.c", do_shortcuts, NULL },
-  { "sizegroup", "Size Groups", (const char*[]) {"gtksizegroup", "gtktable", "gtk_fill", NULL }, "sizegroup.c", do_sizegroup, NULL },
-  { "sliding_puzzle", "Sliding Puzzle", (const char*[]) {"game", "gdkpaintable", "gdkgesture", "gtkshortcutcontroller", NULL }, "sliding_puzzle.c", do_sliding_puzzle, NULL },
+  { "sizegroup", "Size Groups", (const char*[]) {"gtksizegroup", "gtk_fill", "gtktable", NULL }, "sizegroup.c", do_sizegroup, NULL },
+  { "sliding_puzzle", "Sliding Puzzle", (const char*[]) {"gdkgesture", "gtkshortcutcontroller", "game", "gdkpaintable", NULL }, "sliding_puzzle.c", do_sliding_puzzle, NULL },
   { "spinbutton", "Spin Buttons", (const char*[]) {"gtkspinbutton", "gtkentry", NULL }, "spinbutton.c", do_spinbutton, NULL },
   { "spinner", "Spinner", (const char*[]) {"gtkspinner", NULL }, "spinner.c", do_spinner, NULL },
   { "stack", "Stack", (const char*[]) {"gtkstackswitcher", "gtkstack", NULL }, "stack.c", do_stack, NULL },
@@ -320,6 +320,6 @@
   { NULL, "Text View", (const char*[]) {NULL }, NULL, NULL, child22 },
   { NULL, "Theming", (const char*[]) {NULL }, NULL, NULL, child4 },
   { NULL, "Tree View", (const char*[]) {NULL }, NULL, NULL, child10 },
-  { "video_player", "Video Player", (const char*[]) {"gtkvideo", "gdkpaintable", "gtkmediafile", "gtkmediastream", "gtkmediacontrols", NULL }, "video_player.c", do_video_player, NULL },
+  { "video_player", "Video Player", (const char*[]) {"gtkvideo", "gtkmediacontrols", "gtkmediastream", "gtkmediafile", "gdkpaintable", NULL }, "video_player.c", do_video_player, NULL },
   { NULL }
 };
Les fichiers binaires /tmp/guix-build-gtk-4.22.1.drv-0/build/demos/gtk-demo/gtk4-demo et /tmp/guix-build-gtk-4.22.1.drv-1/build/demos/gtk-demo/gtk4-demo sont différents
Les fichiers binaires /tmp/guix-build-gtk-4.22.1.drv-0/build/demos/gtk-demo/gtk4-demo.p/main.c.o et /tmp/guix-build-gtk-4.22.1.drv-1/build/demos/gtk-demo/gtk4-demo.p/main.c.o sont différents