From 9f4863ef2a293f3a6c12b6bc7191a6fddecbdc65 Mon Sep 17 00:00:00 2001
From: Jia Yuan Lo <jylo06g@gmail.com>
Date: Sun, 15 Oct 2023 23:28:40 +0800
Subject: [PATCH] bump(x11/gtk4): 4.12.4

* enable auto update
* enable wayland
---
 x11-packages/gtk4/build.sh                    |  40 ++-
 x11-packages/gtk4/gdkdisplay-wayland.c.patch  |  68 +++++
 .../gtk4/gir/{4.10.4 => 4.12.4}/Gdk-4.0.xml   |  60 ++--
 .../gtk4/gir/4.12.4/GdkWayland-4.0.xml        |  21 ++
 .../gir/{4.10.4 => 4.12.4}/GdkX11-4.0.xml     |   0
 .../gtk4/gir/{4.10.4 => 4.12.4}/Gsk-4.0.xml   |  10 +-
 .../gtk4/gir/{4.10.4 => 4.12.4}/Gtk-4.0.xml   | 282 +++++++++++-------
 7 files changed, 344 insertions(+), 137 deletions(-)
 create mode 100644 x11-packages/gtk4/gdkdisplay-wayland.c.patch
 rename x11-packages/gtk4/gir/{4.10.4 => 4.12.4}/Gdk-4.0.xml (94%)
 create mode 100644 x11-packages/gtk4/gir/4.12.4/GdkWayland-4.0.xml
 rename x11-packages/gtk4/gir/{4.10.4 => 4.12.4}/GdkX11-4.0.xml (100%)
 rename x11-packages/gtk4/gir/{4.10.4 => 4.12.4}/Gsk-4.0.xml (98%)
 rename x11-packages/gtk4/gir/{4.10.4 => 4.12.4}/Gtk-4.0.xml (96%)

diff --git a/x11-packages/gtk4/build.sh b/x11-packages/gtk4/build.sh
index df03bcd669..9a1bc05cfa 100644
--- a/x11-packages/gtk4/build.sh
+++ b/x11-packages/gtk4/build.sh
@@ -2,27 +2,41 @@ TERMUX_PKG_HOMEPAGE=https://www.gtk.org/
 TERMUX_PKG_DESCRIPTION="GObject-based multi-platform GUI toolkit"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-_MAJOR_VERSION=4.10
-TERMUX_PKG_VERSION=${_MAJOR_VERSION}.4
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SRCURL=https://download.gnome.org/sources/gtk/${_MAJOR_VERSION}/gtk-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=7725400482e0685e28265e226c62847f4e73cfca9e9b416ac5838207f5377a24
-TERMUX_PKG_DEPENDS="adwaita-icon-theme, fontconfig, fribidi, gdk-pixbuf, glib, glib-bin, graphene, gtk-update-icon-cache, harfbuzz, libcairo, libepoxy, libjpeg-turbo, libpng, libtiff, libx11, libxcursor, libxdamage, libxext, libxfixes, libxi, libxinerama, libxrandr, pango, shared-mime-info"
-TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner, xorgproto"
+TERMUX_PKG_VERSION="4.12.4"
+TERMUX_PKG_SRCURL=https://download.gnome.org/sources/gtk/${TERMUX_PKG_VERSION%.*}/gtk-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=ba67c6498e5599f928edafb9e08a320adfaa50ab2f0da6fc6ab2252fc2d57520
+TERMUX_PKG_DEPENDS="adwaita-icon-theme, fontconfig, fribidi, gdk-pixbuf, glib, glib-bin, graphene, gtk-update-icon-cache, harfbuzz, libcairo, libepoxy, libjpeg-turbo, libpng, libtiff, libwayland, libx11, libxcursor, libxdamage, libxext, libxfixes, libxi, libxinerama, libxkbcommon, libxrandr, pango, shared-mime-info"
+TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner, glib-cross, libwayland-protocols, xorgproto"
 TERMUX_PKG_RECOMMENDS="desktop-file-utils, librsvg, ttf-dejavu"
 TERMUX_PKG_DISABLE_GIR=false
+TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--Dintrospection=enabled
--Dwayland-backend=false
--Ddemos=false
--Dbuild-testsuite=false
+-Dbuild-demos=false
 -Dbuild-examples=false
 -Dbuild-tests=false
--Dvulkan=disabled
--Dprint-cups=disabled
+-Dbuild-testsuite=false
+-Dintrospection=enabled
 -Dmedia-gstreamer=disabled
+-Dprint-cups=disabled
+-Dvulkan=disabled
+-Dwayland-backend=true
 "
 
 termux_step_pre_configure() {
+	termux_setup_cmake
 	termux_setup_gir
+	termux_setup_ninja
+
+	local _WRAPPER_BIN="${TERMUX_PKG_BUILDDIR}/_wrapper/bin"
+	mkdir -p "${_WRAPPER_BIN}"
+	if [[ "${TERMUX_ON_DEVICE_BUILD}" == "false" ]]; then
+		sed \
+			-e "s|^export PKG_CONFIG_LIBDIR=|export PKG_CONFIG_LIBDIR=${TERMUX_PREFIX}/opt/glib/cross/lib/x86_64-linux-gnu/pkgconfig:|" \
+			-e "s|^export PKG_CONFIG_LIBDIR=|export PKG_CONFIG_LIBDIR=${TERMUX_PREFIX}/opt/libwayland/cross/lib/x86_64-linux-gnu/pkgconfig:|" \
+			"${TERMUX_STANDALONE_TOOLCHAIN}/bin/pkg-config" \
+			> "${_WRAPPER_BIN}/pkg-config"
+		chmod +x "${_WRAPPER_BIN}/pkg-config"
+		export PKG_CONFIG="${_WRAPPER_BIN}/pkg-config"
+	fi
+	export PATH="${_WRAPPER_BIN}:${PATH}"
 }
diff --git a/x11-packages/gtk4/gdkdisplay-wayland.c.patch b/x11-packages/gtk4/gdkdisplay-wayland.c.patch
new file mode 100644
index 0000000000..8da4b3cb53
--- /dev/null
+++ b/x11-packages/gtk4/gdkdisplay-wayland.c.patch
@@ -0,0 +1,68 @@
+--- a/gdk/wayland/gdkdisplay-wayland.c
++++ b/gdk/wayland/gdkdisplay-wayland.c
+@@ -89,6 +89,65 @@
+ #define XDG_ACTIVATION_VERSION   1
+ #endif
+ 
++static int shm_open(const char *name, int oflag, mode_t mode) {
++    size_t namelen;
++    char *fname;
++    int fd;
++
++    /* Construct the filename.  */
++    while (name[0] == '/') ++name;
++
++    if (name[0] == '\0') {
++        /* The name "/" is not supported.  */
++        errno = EINVAL;
++        return -1;
++    }
++
++    namelen = strlen(name);
++    fname = (char *) alloca(sizeof("@TERMUX_PREFIX@/tmp/") - 1 + namelen + 1);
++    memcpy(fname, "@TERMUX_PREFIX@/tmp/", sizeof("@TERMUX_PREFIX@/tmp/") - 1);
++    memcpy(fname + sizeof("@TERMUX_PREFIX@/tmp/") - 1, name, namelen + 1);
++
++    fd = open(fname, oflag, mode);
++    if (fd != -1) {
++        /* We got a descriptor.  Now set the FD_CLOEXEC bit.  */
++        int flags = fcntl(fd, F_GETFD, 0);
++        flags |= FD_CLOEXEC;
++        flags = fcntl(fd, F_SETFD, flags);
++
++        if (flags == -1) {
++            /* Something went wrong.  We cannot return the descriptor.  */
++            int save_errno = errno;
++            close(fd);
++            fd = -1;
++            errno = save_errno;
++        }
++    }
++
++    return fd;
++}
++
++static int shm_unlink(const char *name) {
++    size_t namelen;
++    char *fname;
++
++    /* Construct the filename.  */
++    while (name[0] == '/') ++name;
++
++    if (name[0] == '\0') {
++        /* The name "/" is not supported.  */
++        errno = EINVAL;
++        return -1;
++    }
++
++    namelen = strlen(name);
++    fname = (char *) alloca(sizeof("@TERMUX_PREFIX@/tmp/") - 1 + namelen + 1);
++    memcpy(fname, "@TERMUX_PREFIX@/tmp/", sizeof("@TERMUX_PREFIX@/tmp/") - 1);
++    memcpy(fname + sizeof("@TERMUX_PREFIX@/tmp/") - 1, name, namelen + 1);
++
++    return unlink(fname);
++}
++
+ static void _gdk_wayland_display_load_cursor_theme (GdkWaylandDisplay *display_wayland);
+ 
+ G_DEFINE_TYPE (GdkWaylandDisplay, gdk_wayland_display, GDK_TYPE_DISPLAY)
diff --git a/x11-packages/gtk4/gir/4.10.4/Gdk-4.0.xml b/x11-packages/gtk4/gir/4.12.4/Gdk-4.0.xml
similarity index 94%
rename from x11-packages/gtk4/gir/4.10.4/Gdk-4.0.xml
rename to x11-packages/gtk4/gir/4.12.4/Gdk-4.0.xml
index 1a37ffe38b..011a83dcad 100644
--- a/x11-packages/gtk4/gir/4.10.4/Gdk-4.0.xml
+++ b/x11-packages/gtk4/gir/4.12.4/Gdk-4.0.xml
@@ -3,14 +3,6 @@
   <class name="GdkAppLaunchContext" get-type="gdk_app_launch_context_get_type" parents="GAppLaunchContext,GObject">
     <property name="display" type="GdkDisplay" flags="235"/>
   </class>
-  <boxed name="GdkRGBA" get-type="gdk_rgba_get_type"/>
-  <class name="GdkTexture" get-type="gdk_texture_get_type" parents="GObject" abstract="1">
-    <implements name="GdkPaintable"/>
-    <implements name="GIcon"/>
-    <implements name="GLoadableIcon"/>
-    <property name="width" type="gint" flags="1073742059" default-value="1"/>
-    <property name="height" type="gint" flags="1073742059" default-value="1"/>
-  </class>
   <class name="GdkCairoContext" get-type="gdk_cairo_context_get_type" parents="GdkDrawContext,GObject" abstract="1">
   </class>
   <class name="GdkClipboard" get-type="gdk_clipboard_get_type" parents="GObject">
@@ -137,7 +129,6 @@
     <signal name="resume-events" return="void" when="last">
     </signal>
   </class>
-  <boxed name="GdkRectangle" get-type="gdk_rectangle_get_type"/>
   <class name="GdkMonitor" get-type="gdk_monitor_get_type" parents="GObject">
     <property name="description" type="gchararray" flags="225" default-value="NULL"/>
     <property name="display" type="GdkDisplay" flags="235"/>
@@ -163,6 +154,7 @@
     <property name="width" type="gint" flags="225" default-value="0"/>
     <property name="height" type="gint" flags="225" default-value="0"/>
     <property name="scale-factor" type="gint" flags="225" default-value="1"/>
+    <property name="scale" type="gdouble" flags="225" default-value="1.000000"/>
     <signal name="layout" return="void" when="first">
       <param type="gint"/>
       <param type="gint"/>
@@ -222,6 +214,9 @@
   </class>
   <interface name="GdkDragSurface" get-type="gdk_drag_surface_get_type">
     <prerequisite name="GdkSurface"/>
+    <signal name="compute-size" return="void" when="last">
+      <param type="GdkDragSurfaceSize"/>
+    </signal>
   </interface>
   <class name="GdkDrawContext" get-type="gdk_draw_context_get_type" parents="GObject" abstract="1">
     <property name="display" type="GdkDisplay" flags="235"/>
@@ -260,7 +255,11 @@
     <member name="GDK_DRAG_CANCEL_NO_TARGET" nick="no-target" value="0"/>
     <member name="GDK_DRAG_CANCEL_USER_CANCELLED" nick="user-cancelled" value="1"/>
     <member name="GDK_DRAG_CANCEL_ERROR" nick="error" value="2"/>
-  </enum>  <enum name="GdkGravity" get-type="gdk_gravity_get_type">
+  </enum>  <flags name="GdkGLAPI" get-type="gdk_gl_api_get_type">
+    <member name="GDK_GL_API_GL" nick="gl" value="1"/>
+    <member name="GDK_GL_API_GLES" nick="gles" value="2"/>
+  </flags>
+  <enum name="GdkGravity" get-type="gdk_gravity_get_type">
     <member name="GDK_GRAVITY_NORTH_WEST" nick="north-west" value="1"/>
     <member name="GDK_GRAVITY_NORTH" nick="north" value="2"/>
     <member name="GDK_GRAVITY_NORTH_EAST" nick="north-east" value="3"/>
@@ -346,7 +345,17 @@
     <member name="GDK_MEMORY_R32G32B32_FLOAT" nick="r32g32b32-float" value="15"/>
     <member name="GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED" nick="r32g32b32a32-float-premultiplied" value="16"/>
     <member name="GDK_MEMORY_R32G32B32A32_FLOAT" nick="r32g32b32a32-float" value="17"/>
-    <member name="GDK_MEMORY_N_FORMATS" nick="n-formats" value="18"/>
+    <member name="GDK_MEMORY_G8A8_PREMULTIPLIED" nick="g8a8-premultiplied" value="18"/>
+    <member name="GDK_MEMORY_G8A8" nick="g8a8" value="19"/>
+    <member name="GDK_MEMORY_G8" nick="g8" value="20"/>
+    <member name="GDK_MEMORY_G16A16_PREMULTIPLIED" nick="g16a16-premultiplied" value="21"/>
+    <member name="GDK_MEMORY_G16A16" nick="g16a16" value="22"/>
+    <member name="GDK_MEMORY_G16" nick="g16" value="23"/>
+    <member name="GDK_MEMORY_A8" nick="a8" value="24"/>
+    <member name="GDK_MEMORY_A16" nick="a16" value="25"/>
+    <member name="GDK_MEMORY_A16_FLOAT" nick="a16-float" value="26"/>
+    <member name="GDK_MEMORY_A32_FLOAT" nick="a32-float" value="27"/>
+    <member name="GDK_MEMORY_N_FORMATS" nick="n-formats" value="28"/>
   </enum>  <enum name="GdkEventType" get-type="gdk_event_type_get_type">
     <member name="GDK_DELETE" nick="delete" value="0"/>
     <member name="GDK_MOTION_NOTIFY" nick="motion-notify" value="1"/>
@@ -423,10 +432,6 @@
     <member name="GDK_FRAME_CLOCK_PHASE_RESUME_EVENTS" nick="resume-events" value="32"/>
     <member name="GDK_FRAME_CLOCK_PHASE_AFTER_PAINT" nick="after-paint" value="64"/>
   </flags>
-  <flags name="GdkGLAPI" get-type="gdk_gl_api_get_type">
-    <member name="GDK_GL_API_GL" nick="gl" value="1"/>
-    <member name="GDK_GL_API_GLES" nick="gles" value="2"/>
-  </flags>
   <enum name="GdkSubpixelLayout" get-type="gdk_subpixel_layout_get_type">
     <member name="GDK_SUBPIXEL_LAYOUT_UNKNOWN" nick="unknown" value="0"/>
     <member name="GDK_SUBPIXEL_LAYOUT_NONE" nick="none" value="1"/>
@@ -457,7 +462,7 @@
     <member name="GDK_SEAT_CAPABILITY_KEYBOARD" nick="keyboard" value="8"/>
     <member name="GDK_SEAT_CAPABILITY_TABLET_PAD" nick="tablet-pad" value="16"/>
     <member name="GDK_SEAT_CAPABILITY_ALL_POINTING" nick="all-pointing" value="7"/>
-    <member name="GDK_SEAT_CAPABILITY_ALL" nick="all" value="15"/>
+    <member name="GDK_SEAT_CAPABILITY_ALL" nick="all" value="31"/>
   </flags>
   <enum name="GdkTextureError" get-type="gdk_texture_error_get_type">
     <member name="GDK_TEXTURE_ERROR_TOO_LARGE" nick="too-large" value="0"/>
@@ -493,6 +498,7 @@
     <member name="GDK_TOPLEVEL_STATE_BOTTOM_RESIZABLE" nick="bottom-resizable" value="8192"/>
     <member name="GDK_TOPLEVEL_STATE_LEFT_TILED" nick="left-tiled" value="16384"/>
     <member name="GDK_TOPLEVEL_STATE_LEFT_RESIZABLE" nick="left-resizable" value="32768"/>
+    <member name="GDK_TOPLEVEL_STATE_SUSPENDED" nick="suspended" value="65536"/>
   </flags>
   <enum name="GdkTitlebarGesture" get-type="gdk_titlebar_gesture_get_type">
     <member name="GDK_TITLEBAR_GESTURE_DOUBLE_CLICK" nick="double-click" value="1"/>
@@ -503,11 +509,29 @@
     <property name="api" type="GdkGLAPI" flags="1073742049" default-value="0"/>
     <property name="shared-context" type="GdkGLContext" flags="-2147483413"/>
   </class>
+  <class name="GdkTexture" get-type="gdk_texture_get_type" parents="GObject" abstract="1">
+    <implements name="GdkPaintable"/>
+    <implements name="GIcon"/>
+    <implements name="GLoadableIcon"/>
+    <property name="width" type="gint" flags="1073742059" default-value="1"/>
+    <property name="height" type="gint" flags="1073742059" default-value="1"/>
+  </class>
   <class name="GdkGLTexture" get-type="gdk_gl_texture_get_type" parents="GdkTexture,GObject">
     <implements name="GdkPaintable"/>
     <implements name="GIcon"/>
     <implements name="GLoadableIcon"/>
   </class>
+  <class name="GdkGLTextureBuilder" get-type="gdk_gl_texture_builder_get_type" parents="GObject">
+    <property name="context" type="GdkGLContext" flags="1073742051"/>
+    <property name="format" type="GdkMemoryFormat" flags="1073742051" default-value="GDK_MEMORY_R8G8B8A8_PREMULTIPLIED"/>
+    <property name="has-mipmap" type="gboolean" flags="1073742051" default-value="FALSE"/>
+    <property name="height" type="gint" flags="1073742051" default-value="0"/>
+    <property name="id" type="guint" flags="1073742051" default-value="0"/>
+    <property name="sync" type="gpointer" flags="1073742051"/>
+    <property name="update-region" type="CairoRegion" flags="1073742051"/>
+    <property name="update-texture" type="GdkTexture" flags="1073742051"/>
+    <property name="width" type="gint" flags="1073742051" default-value="0"/>
+  </class>
   <class name="GdkMemoryTexture" get-type="gdk_memory_texture_get_type" parents="GdkTexture,GObject">
     <implements name="GdkPaintable"/>
     <implements name="GIcon"/>
@@ -524,6 +548,8 @@
     <property name="autohide" type="gboolean" flags="235" default-value="FALSE"/>
     <property name="parent" type="GdkSurface" flags="235"/>
   </interface>
+  <boxed name="GdkRectangle" get-type="gdk_rectangle_get_type"/>
+  <boxed name="GdkRGBA" get-type="gdk_rgba_get_type"/>
   <class name="GdkSnapshot" get-type="gdk_snapshot_get_type" parents="GObject" abstract="1">
   </class>
   <boxed name="GdkTextureDownloader" get-type="gdk_texture_downloader_get_type"/>
@@ -549,7 +575,7 @@
     <signal name="images-updated" return="void" when="last">
     </signal>
   </class>
-  <error-quark function="gdk_texture_error_quark" domain="gdk-texture-error-quark"/>
   <error-quark function="gdk_gl_error_quark" domain="gdk-gl-error-quark"/>
+  <error-quark function="gdk_texture_error_quark" domain="gdk-texture-error-quark"/>
   <error-quark function="gdk_vulkan_error_quark" domain="gdk-vulkan-error-quark"/>
 </dump>
diff --git a/x11-packages/gtk4/gir/4.12.4/GdkWayland-4.0.xml b/x11-packages/gtk4/gir/4.12.4/GdkWayland-4.0.xml
new file mode 100644
index 0000000000..70fdf22a41
--- /dev/null
+++ b/x11-packages/gtk4/gir/4.12.4/GdkWayland-4.0.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<dump>
+  <class name="GdkWaylandDevice" get-type="gdk_wayland_device_get_type" parents="GdkDevice,GObject">
+  </class>
+  <class name="GdkWaylandDisplay" get-type="gdk_wayland_display_get_type" parents="GdkDisplay,GObject">
+  </class>
+  <class name="GdkWaylandGLContext" get-type="gdk_wayland_gl_context_get_type" parents="GdkGLContext,GdkDrawContext,GObject">
+  </class>
+  <class name="GdkWaylandMonitor" get-type="gdk_wayland_monitor_get_type" parents="GdkMonitor,GObject">
+  </class>
+  <class name="GdkWaylandSurface" get-type="gdk_wayland_surface_get_type" parents="GdkSurface,GObject">
+  </class>
+  <class name="GdkWaylandPopup" get-type="gdk_wayland_popup_get_type" parents="GdkWaylandSurface,GdkSurface,GObject">
+    <implements name="GdkPopup"/>
+  </class>
+  <class name="GdkWaylandSeat" get-type="gdk_wayland_seat_get_type" parents="GdkSeat,GObject">
+  </class>
+  <class name="GdkWaylandToplevel" get-type="gdk_wayland_toplevel_get_type" parents="GdkWaylandSurface,GdkSurface,GObject">
+    <implements name="GdkToplevel"/>
+  </class>
+</dump>
diff --git a/x11-packages/gtk4/gir/4.10.4/GdkX11-4.0.xml b/x11-packages/gtk4/gir/4.12.4/GdkX11-4.0.xml
similarity index 100%
rename from x11-packages/gtk4/gir/4.10.4/GdkX11-4.0.xml
rename to x11-packages/gtk4/gir/4.12.4/GdkX11-4.0.xml
diff --git a/x11-packages/gtk4/gir/4.10.4/Gsk-4.0.xml b/x11-packages/gtk4/gir/4.12.4/Gsk-4.0.xml
similarity index 98%
rename from x11-packages/gtk4/gir/4.10.4/Gsk-4.0.xml
rename to x11-packages/gtk4/gir/4.12.4/Gsk-4.0.xml
index 1ace0ec244..6a8eb2ce1f 100644
--- a/x11-packages/gtk4/gir/4.10.4/Gsk-4.0.xml
+++ b/x11-packages/gtk4/gir/4.12.4/Gsk-4.0.xml
@@ -68,10 +68,6 @@
   <class name="GskCairoRenderer" get-type="gsk_cairo_renderer_get_type" parents="GskRenderer,GObject">
   </class>
   <boxed name="GskTransform" get-type="gsk_transform_get_type"/>
-  <class name="GskGLRenderer" get-type="gsk_gl_renderer_get_type" parents="GskRenderer,GObject">
-  </class>
-  <class name="GskNglRenderer" get-type="gsk_ngl_renderer_get_type" parents="GskRenderer,GObject">
-  </class>
   <enum name="GskRenderNodeType" get-type="gsk_render_node_type_get_type">
     <member name="GSK_NOT_A_RENDER_NODE" nick="not-a-render-node" value="0"/>
     <member name="GSK_CONTAINER_NODE" nick="container-node" value="1"/>
@@ -153,5 +149,9 @@
     <member name="GSK_MASK_MODE_INVERTED_ALPHA" nick="inverted-alpha" value="1"/>
     <member name="GSK_MASK_MODE_LUMINANCE" nick="luminance" value="2"/>
     <member name="GSK_MASK_MODE_INVERTED_LUMINANCE" nick="inverted-luminance" value="3"/>
-  </enum>  <error-quark function="gsk_serialization_error_quark" domain="gsk-serialization-error-quark"/>
+  </enum>  <class name="GskGLRenderer" get-type="gsk_gl_renderer_get_type" parents="GskRenderer,GObject">
+  </class>
+  <class name="GskNglRenderer" get-type="gsk_ngl_renderer_get_type" parents="GskRenderer,GObject">
+  </class>
+  <error-quark function="gsk_serialization_error_quark" domain="gsk-serialization-error-quark"/>
 </dump>
diff --git a/x11-packages/gtk4/gir/4.10.4/Gtk-4.0.xml b/x11-packages/gtk4/gir/4.12.4/Gtk-4.0.xml
similarity index 96%
rename from x11-packages/gtk4/gir/4.10.4/Gtk-4.0.xml
rename to x11-packages/gtk4/gir/4.12.4/Gtk-4.0.xml
index b1852582d1..80b727fa9d 100644
--- a/x11-packages/gtk4/gir/4.10.4/Gtk-4.0.xml
+++ b/x11-packages/gtk4/gir/4.12.4/Gtk-4.0.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <dump>
   <boxed name="GtkCssSection" get-type="gtk_css_section_get_type"/>
-  <boxed name="GtkBorder" get-type="gtk_border_get_type"/>
   <class name="GtkShortcut" get-type="gtk_shortcut_get_type" parents="GObject">
     <property name="action" type="GtkShortcutAction" flags="1073742051"/>
     <property name="arguments" type="GVariant" flags="1073742051"/>
@@ -140,6 +139,7 @@
     <property name="titlebar" type="GtkWidget" flags="1073742051"/>
     <property name="handle-menubar-accel" type="gboolean" flags="1073742051" default-value="TRUE"/>
     <property name="is-active" type="gboolean" flags="225" default-value="FALSE"/>
+    <property name="suspended" type="gboolean" flags="1073742049" default-value="FALSE"/>
     <property name="startup-id" type="gchararray" flags="226" default-value="NULL"/>
     <property name="mnemonics-visible" type="gboolean" flags="1073742051" default-value="FALSE"/>
     <property name="focus-visible" type="gboolean" flags="1073742051" default-value="TRUE"/>
@@ -306,6 +306,7 @@
     <property name="expression" type="GtkExpression" flags="1073742051"/>
     <property name="invert" type="gboolean" flags="1073742051" default-value="FALSE"/>
   </class>
+  <boxed name="GtkBorder" get-type="gtk_border_get_type"/>
   <class name="GtkBox" get-type="gtk_box_get_type" parents="GtkWidget,GInitiallyUnowned,GObject">
     <implements name="GtkAccessible"/>
     <implements name="GtkBuildable"/>
@@ -313,12 +314,14 @@
     <implements name="GtkOrientable"/>
     <property name="spacing" type="gint" flags="1073742051" default-value="0"/>
     <property name="homogeneous" type="gboolean" flags="1073742051" default-value="FALSE"/>
+    <property name="baseline-child" type="gint" flags="1073742051" default-value="-1"/>
     <property name="baseline-position" type="GtkBaselinePosition" flags="1073742051" default-value="GTK_BASELINE_POSITION_CENTER"/>
   </class>
   <class name="GtkBoxLayout" get-type="gtk_box_layout_get_type" parents="GtkLayoutManager,GObject">
     <implements name="GtkOrientable"/>
     <property name="homogeneous" type="gboolean" flags="1073742051" default-value="FALSE"/>
     <property name="spacing" type="gint" flags="1073742051" default-value="0"/>
+    <property name="baseline-child" type="gint" flags="1073742051" default-value="-1"/>
     <property name="baseline-position" type="GtkBaselinePosition" flags="1073742051" default-value="GTK_BASELINE_POSITION_CENTER"/>
   </class>
   <interface name="GtkBuilderScope" get-type="gtk_builder_scope_get_type">
@@ -350,6 +353,7 @@
     <property name="use-underline" type="gboolean" flags="1073742051" default-value="FALSE"/>
     <property name="icon-name" type="gchararray" flags="1073742051" default-value="NULL"/>
     <property name="child" type="GtkWidget" flags="1073742051"/>
+    <property name="can-shrink" type="gboolean" flags="1073742051" default-value="FALSE"/>
     <signal name="activate" return="void" when="first" action="1">
     </signal>
     <signal name="clicked" return="void" when="first" action="1">
@@ -385,8 +389,10 @@
     <property name="center-widget" type="GtkWidget" flags="1073742051"/>
     <property name="end-widget" type="GtkWidget" flags="1073742051"/>
     <property name="baseline-position" type="GtkBaselinePosition" flags="1073742051" default-value="GTK_BASELINE_POSITION_CENTER"/>
+    <property name="shrink-center-last" type="gboolean" flags="1073742051" default-value="TRUE"/>
   </class>
   <class name="GtkCenterLayout" get-type="gtk_center_layout_get_type" parents="GtkLayoutManager,GObject">
+    <property name="shrink-center-last" type="gboolean" flags="1073742051" default-value="TRUE"/>
   </class>
   <class name="GtkToggleButton" get-type="gtk_toggle_button_get_type" parents="GtkButton,GtkWidget,GInitiallyUnowned,GObject">
     <implements name="GtkAccessible"/>
@@ -425,6 +431,8 @@
     <implements name="GtkConstraintTarget"/>
     <property name="dialog" type="GtkColorDialog" flags="1073742051"/>
     <property name="rgba" type="GdkRGBA" flags="1073742051"/>
+    <signal name="activate" return="void" when="first" action="1">
+    </signal>
   </class>
   <class name="GtkSorter" get-type="gtk_sorter_get_type" parents="GObject">
     <signal name="changed" return="void" when="last">
@@ -433,11 +441,13 @@
   </class>
   <class name="GtkSortListModel" get-type="gtk_sort_list_model_get_type" parents="GObject">
     <implements name="GListModel"/>
+    <implements name="GtkSectionModel"/>
     <property name="incremental" type="gboolean" flags="1073742051" default-value="FALSE"/>
     <property name="item-type" type="GType" flags="225"/>
     <property name="model" type="GListModel" flags="1073742051"/>
     <property name="n-items" type="guint" flags="225" default-value="0"/>
     <property name="pending" type="guint" flags="1073742049" default-value="0"/>
+    <property name="section-sorter" type="GtkSorter" flags="1073742051"/>
     <property name="sorter" type="GtkSorter" flags="1073742051"/>
   </class>
   <interface name="GtkSelectionModel" get-type="gtk_selection_model_get_type">
@@ -453,17 +463,38 @@
     <implements name="GtkConstraintTarget"/>
     <implements name="GtkScrollable"/>
     <property name="columns" type="GListModel" flags="1073742049"/>
+    <property name="enable-rubberband" type="gboolean" flags="1073741827" default-value="FALSE"/>
+    <property name="header-factory" type="GtkListItemFactory" flags="1073742051"/>
     <property name="model" type="GtkSelectionModel" flags="1073742051"/>
+    <property name="reorderable" type="gboolean" flags="1073742051" default-value="TRUE"/>
+    <property name="row-factory" type="GtkListItemFactory" flags="1073742051"/>
     <property name="show-row-separators" type="gboolean" flags="1073741827" default-value="FALSE"/>
     <property name="show-column-separators" type="gboolean" flags="1073741827" default-value="FALSE"/>
-    <property name="sorter" type="GtkSorter" flags="1073742049"/>
     <property name="single-click-activate" type="gboolean" flags="1073741827" default-value="FALSE"/>
-    <property name="reorderable" type="gboolean" flags="1073742051" default-value="TRUE"/>
-    <property name="enable-rubberband" type="gboolean" flags="1073741827" default-value="FALSE"/>
+    <property name="sorter" type="GtkSorter" flags="1073742049"/>
+    <property name="tab-behavior" type="GtkListTabBehavior" flags="1073741827" default-value="GTK_LIST_TAB_ALL"/>
     <signal name="activate" return="void" when="last">
       <param type="guint"/>
     </signal>
   </class>
+  <class name="GtkListItem" get-type="gtk_list_item_get_type" parents="GObject">
+    <property name="accessible-description" type="gchararray" flags="1073742051" default-value="NULL"/>
+    <property name="accessible-label" type="gchararray" flags="1073742051" default-value="NULL"/>
+    <property name="activatable" type="gboolean" flags="1073742051" default-value="TRUE"/>
+    <property name="child" type="GtkWidget" flags="1073742051"/>
+    <property name="focusable" type="gboolean" flags="1073742051" default-value="TRUE"/>
+    <property name="item" type="GObject" flags="1073742049"/>
+    <property name="position" type="guint" flags="1073742049" default-value="4294967295"/>
+    <property name="selectable" type="gboolean" flags="1073742051" default-value="TRUE"/>
+    <property name="selected" type="gboolean" flags="1073742049" default-value="FALSE"/>
+  </class>
+  <class name="GtkColumnViewCell" get-type="gtk_column_view_cell_get_type" parents="GtkListItem,GObject">
+    <property name="child" type="GtkWidget" flags="1073742051"/>
+    <property name="focusable" type="gboolean" flags="1073742051" default-value="FALSE"/>
+    <property name="item" type="GObject" flags="1073742049"/>
+    <property name="position" type="guint" flags="1073742049" default-value="4294967295"/>
+    <property name="selected" type="gboolean" flags="1073742049" default-value="FALSE"/>
+  </class>
   <class name="GtkColumnViewColumn" get-type="gtk_column_view_column_get_type" parents="GObject">
     <property name="column-view" type="GtkColumnView" flags="1073742049"/>
     <property name="factory" type="GtkListItemFactory" flags="1073742051"/>
@@ -476,6 +507,16 @@
     <property name="fixed-width" type="gint" flags="1073742051" default-value="-1"/>
     <property name="id" type="gchararray" flags="1073741827" default-value="NULL"/>
   </class>
+  <class name="GtkColumnViewRow" get-type="gtk_column_view_row_get_type" parents="GObject">
+    <property name="accessible-description" type="gchararray" flags="1073742051" default-value="NULL"/>
+    <property name="accessible-label" type="gchararray" flags="1073742051" default-value="NULL"/>
+    <property name="activatable" type="gboolean" flags="1073742051" default-value="TRUE"/>
+    <property name="focusable" type="gboolean" flags="1073742051" default-value="TRUE"/>
+    <property name="item" type="GObject" flags="1073742049"/>
+    <property name="position" type="guint" flags="1073742049" default-value="4294967295"/>
+    <property name="selectable" type="gboolean" flags="1073742051" default-value="TRUE"/>
+    <property name="selected" type="gboolean" flags="1073742049" default-value="FALSE"/>
+  </class>
   <class name="GtkColumnViewSorter" get-type="gtk_column_view_sorter_get_type" parents="GtkSorter,GObject">
     <property name="primary-sort-column" type="GtkColumnViewColumn" flags="225"/>
     <property name="primary-sort-order" type="GtkSortType" flags="225" default-value="GTK_SORT_ASCENDING"/>
@@ -629,7 +670,6 @@
     <member name="GTK_DEBUG_SIZE_REQUEST" nick="size-request" value="256"/>
     <member name="GTK_DEBUG_NO_CSS_CACHE" nick="no-css-cache" value="512"/>
     <member name="GTK_DEBUG_INTERACTIVE" nick="interactive" value="1024"/>
-    <member name="GTK_DEBUG_TOUCHSCREEN" nick="touchscreen" value="2048"/>
     <member name="GTK_DEBUG_ACTIONS" nick="actions" value="4096"/>
     <member name="GTK_DEBUG_LAYOUT" nick="layout" value="8192"/>
     <member name="GTK_DEBUG_SNAPSHOT" nick="snapshot" value="16384"/>
@@ -661,7 +701,9 @@
     <member name="GTK_ALIGN_START" nick="start" value="1"/>
     <member name="GTK_ALIGN_END" nick="end" value="2"/>
     <member name="GTK_ALIGN_CENTER" nick="center" value="3"/>
+    <member name="GTK_ALIGN_BASELINE_FILL" nick="baseline-fill" value="4"/>
     <member name="GTK_ALIGN_BASELINE" nick="baseline" value="4"/>
+    <member name="GTK_ALIGN_BASELINE_CENTER" nick="baseline-center" value="5"/>
   </enum>  <enum name="GtkArrowType" get-type="gtk_arrow_type_get_type">
     <member name="GTK_ARROW_UP" nick="up" value="0"/>
     <member name="GTK_ARROW_DOWN" nick="down" value="1"/>
@@ -710,7 +752,16 @@
     <member name="GTK_JUSTIFY_RIGHT" nick="right" value="1"/>
     <member name="GTK_JUSTIFY_CENTER" nick="center" value="2"/>
     <member name="GTK_JUSTIFY_FILL" nick="fill" value="3"/>
-  </enum>  <enum name="GtkMessageType" get-type="gtk_message_type_get_type">
+  </enum>  <enum name="GtkListTabBehavior" get-type="gtk_list_tab_behavior_get_type">
+    <member name="GTK_LIST_TAB_ALL" nick="all" value="0"/>
+    <member name="GTK_LIST_TAB_ITEM" nick="item" value="1"/>
+    <member name="GTK_LIST_TAB_CELL" nick="cell" value="2"/>
+  </enum>  <flags name="GtkListScrollFlags" get-type="gtk_list_scroll_flags_get_type">
+    <member name="GTK_LIST_SCROLL_NONE" nick="none" value="0"/>
+    <member name="GTK_LIST_SCROLL_FOCUS" nick="focus" value="1"/>
+    <member name="GTK_LIST_SCROLL_SELECT" nick="select" value="2"/>
+  </flags>
+  <enum name="GtkMessageType" get-type="gtk_message_type_get_type">
     <member name="GTK_MESSAGE_INFO" nick="info" value="0"/>
     <member name="GTK_MESSAGE_WARNING" nick="warning" value="1"/>
     <member name="GTK_MESSAGE_QUESTION" nick="question" value="2"/>
@@ -1045,6 +1096,7 @@
     <member name="GTK_ACCESSIBLE_ROLE_WIDGET" nick="widget" value="76"/>
     <member name="GTK_ACCESSIBLE_ROLE_WINDOW" nick="window" value="77"/>
     <member name="GTK_ACCESSIBLE_ROLE_TOGGLE_BUTTON" nick="toggle-button" value="78"/>
+    <member name="GTK_ACCESSIBLE_ROLE_APPLICATION" nick="application" value="79"/>
   </enum>  <enum name="GtkAccessibleState" get-type="gtk_accessible_state_get_type">
     <member name="GTK_ACCESSIBLE_STATE_BUSY" nick="busy" value="0"/>
     <member name="GTK_ACCESSIBLE_STATE_CHECKED" nick="checked" value="1"/>
@@ -1054,6 +1106,7 @@
     <member name="GTK_ACCESSIBLE_STATE_INVALID" nick="invalid" value="5"/>
     <member name="GTK_ACCESSIBLE_STATE_PRESSED" nick="pressed" value="6"/>
     <member name="GTK_ACCESSIBLE_STATE_SELECTED" nick="selected" value="7"/>
+    <member name="GTK_ACCESSIBLE_STATE_VISITED" nick="visited" value="8"/>
   </enum>  <enum name="GtkAccessibleProperty" get-type="gtk_accessible_property_get_type">
     <member name="GTK_ACCESSIBLE_PROPERTY_AUTOCOMPLETE" nick="autocomplete" value="0"/>
     <member name="GTK_ACCESSIBLE_PROPERTY_DESCRIPTION" nick="description" value="1"/>
@@ -1161,32 +1214,7 @@
   </enum>  <flags name="GtkPopoverMenuFlags" get-type="gtk_popover_menu_flags_get_type">
     <member name="GTK_POPOVER_MENU_NESTED" nick="nested" value="1"/>
   </flags>
-  <enum name="GtkPrintStatus" get-type="gtk_print_status_get_type">
-    <member name="GTK_PRINT_STATUS_INITIAL" nick="initial" value="0"/>
-    <member name="GTK_PRINT_STATUS_PREPARING" nick="preparing" value="1"/>
-    <member name="GTK_PRINT_STATUS_GENERATING_DATA" nick="generating-data" value="2"/>
-    <member name="GTK_PRINT_STATUS_SENDING_DATA" nick="sending-data" value="3"/>
-    <member name="GTK_PRINT_STATUS_PENDING" nick="pending" value="4"/>
-    <member name="GTK_PRINT_STATUS_PENDING_ISSUE" nick="pending-issue" value="5"/>
-    <member name="GTK_PRINT_STATUS_PRINTING" nick="printing" value="6"/>
-    <member name="GTK_PRINT_STATUS_FINISHED" nick="finished" value="7"/>
-    <member name="GTK_PRINT_STATUS_FINISHED_ABORTED" nick="finished-aborted" value="8"/>
-  </enum>  <enum name="GtkPrintOperationResult" get-type="gtk_print_operation_result_get_type">
-    <member name="GTK_PRINT_OPERATION_RESULT_ERROR" nick="error" value="0"/>
-    <member name="GTK_PRINT_OPERATION_RESULT_APPLY" nick="apply" value="1"/>
-    <member name="GTK_PRINT_OPERATION_RESULT_CANCEL" nick="cancel" value="2"/>
-    <member name="GTK_PRINT_OPERATION_RESULT_IN_PROGRESS" nick="in-progress" value="3"/>
-  </enum>  <enum name="GtkPrintOperationAction" get-type="gtk_print_operation_action_get_type">
-    <member name="GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG" nick="print-dialog" value="0"/>
-    <member name="GTK_PRINT_OPERATION_ACTION_PRINT" nick="print" value="1"/>
-    <member name="GTK_PRINT_OPERATION_ACTION_PREVIEW" nick="preview" value="2"/>
-    <member name="GTK_PRINT_OPERATION_ACTION_EXPORT" nick="export" value="3"/>
-  </enum>  <enum name="GtkPrintError" get-type="gtk_print_error_get_type">
-    <member name="GTK_PRINT_ERROR_GENERAL" nick="general" value="0"/>
-    <member name="GTK_PRINT_ERROR_INTERNAL_ERROR" nick="internal-error" value="1"/>
-    <member name="GTK_PRINT_ERROR_NOMEM" nick="nomem" value="2"/>
-    <member name="GTK_PRINT_ERROR_INVALID_FILE" nick="invalid-file" value="3"/>
-  </enum>  <enum name="GtkRecentManagerError" get-type="gtk_recent_manager_error_get_type">
+  <enum name="GtkRecentManagerError" get-type="gtk_recent_manager_error_get_type">
     <member name="GTK_RECENT_MANAGER_ERROR_NOT_FOUND" nick="not-found" value="0"/>
     <member name="GTK_RECENT_MANAGER_ERROR_INVALID_URI" nick="invalid-uri" value="1"/>
     <member name="GTK_RECENT_MANAGER_ERROR_INVALID_ENCODING" nick="invalid-encoding" value="2"/>
@@ -1299,6 +1327,31 @@
   </enum>  <enum name="GtkTextExtendSelection" get-type="gtk_text_extend_selection_get_type">
     <member name="GTK_TEXT_EXTEND_SELECTION_WORD" nick="word" value="0"/>
     <member name="GTK_TEXT_EXTEND_SELECTION_LINE" nick="line" value="1"/>
+  </enum>  <enum name="GtkPrintStatus" get-type="gtk_print_status_get_type">
+    <member name="GTK_PRINT_STATUS_INITIAL" nick="initial" value="0"/>
+    <member name="GTK_PRINT_STATUS_PREPARING" nick="preparing" value="1"/>
+    <member name="GTK_PRINT_STATUS_GENERATING_DATA" nick="generating-data" value="2"/>
+    <member name="GTK_PRINT_STATUS_SENDING_DATA" nick="sending-data" value="3"/>
+    <member name="GTK_PRINT_STATUS_PENDING" nick="pending" value="4"/>
+    <member name="GTK_PRINT_STATUS_PENDING_ISSUE" nick="pending-issue" value="5"/>
+    <member name="GTK_PRINT_STATUS_PRINTING" nick="printing" value="6"/>
+    <member name="GTK_PRINT_STATUS_FINISHED" nick="finished" value="7"/>
+    <member name="GTK_PRINT_STATUS_FINISHED_ABORTED" nick="finished-aborted" value="8"/>
+  </enum>  <enum name="GtkPrintOperationResult" get-type="gtk_print_operation_result_get_type">
+    <member name="GTK_PRINT_OPERATION_RESULT_ERROR" nick="error" value="0"/>
+    <member name="GTK_PRINT_OPERATION_RESULT_APPLY" nick="apply" value="1"/>
+    <member name="GTK_PRINT_OPERATION_RESULT_CANCEL" nick="cancel" value="2"/>
+    <member name="GTK_PRINT_OPERATION_RESULT_IN_PROGRESS" nick="in-progress" value="3"/>
+  </enum>  <enum name="GtkPrintOperationAction" get-type="gtk_print_operation_action_get_type">
+    <member name="GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG" nick="print-dialog" value="0"/>
+    <member name="GTK_PRINT_OPERATION_ACTION_PRINT" nick="print" value="1"/>
+    <member name="GTK_PRINT_OPERATION_ACTION_PREVIEW" nick="preview" value="2"/>
+    <member name="GTK_PRINT_OPERATION_ACTION_EXPORT" nick="export" value="3"/>
+  </enum>  <enum name="GtkPrintError" get-type="gtk_print_error_get_type">
+    <member name="GTK_PRINT_ERROR_GENERAL" nick="general" value="0"/>
+    <member name="GTK_PRINT_ERROR_INTERNAL_ERROR" nick="internal-error" value="1"/>
+    <member name="GTK_PRINT_ERROR_NOMEM" nick="nomem" value="2"/>
+    <member name="GTK_PRINT_ERROR_INVALID_FILE" nick="invalid-file" value="3"/>
   </enum>  <class name="GtkConstraintGuide" get-type="gtk_constraint_guide_get_type" parents="GObject">
     <implements name="GtkConstraintTarget"/>
     <property name="min-width" type="gint" flags="1073741827" default-value="0"/>
@@ -1461,11 +1514,18 @@
       <param type="GdkDrop"/>
     </signal>
   </class>
+  <class name="GtkStringFilter" get-type="gtk_string_filter_get_type" parents="GtkFilter,GObject">
+    <property name="expression" type="GtkExpression" flags="1073742051"/>
+    <property name="ignore-case" type="gboolean" flags="1073742051" default-value="TRUE"/>
+    <property name="match-mode" type="GtkStringFilterMatchMode" flags="1073742051" default-value="GTK_STRING_FILTER_MATCH_MODE_SUBSTRING"/>
+    <property name="search" type="gchararray" flags="1073742051" default-value="NULL"/>
+  </class>
   <class name="GtkDropDown" get-type="gtk_drop_down_get_type" parents="GtkWidget,GInitiallyUnowned,GObject">
     <implements name="GtkAccessible"/>
     <implements name="GtkBuildable"/>
     <implements name="GtkConstraintTarget"/>
     <property name="factory" type="GtkListItemFactory" flags="1073742051"/>
+    <property name="header-factory" type="GtkListItemFactory" flags="1073742051"/>
     <property name="list-factory" type="GtkListItemFactory" flags="1073742051"/>
     <property name="model" type="GListModel" flags="1073742051"/>
     <property name="selected" type="guint" flags="1073742051" default-value="4294967295"/>
@@ -1473,6 +1533,7 @@
     <property name="enable-search" type="gboolean" flags="1073742051" default-value="FALSE"/>
     <property name="expression" type="GtkExpression" flags="1073742051"/>
     <property name="show-arrow" type="gboolean" flags="1073742051" default-value="TRUE"/>
+    <property name="search-match-mode" type="GtkStringFilterMatchMode" flags="1073742051" default-value="GTK_STRING_FILTER_MATCH_MODE_PREFIX"/>
     <signal name="activate" return="void" when="first" action="1">
     </signal>
   </class>
@@ -1835,9 +1896,9 @@
     <property name="label" type="gchararray" flags="231" default-value="NULL"/>
     <property name="use-underline" type="gboolean" flags="1073742055" default-value="FALSE"/>
     <property name="use-markup" type="gboolean" flags="1073742055" default-value="FALSE"/>
-    <property name="label-widget" type="GtkWidget" flags="227"/>
+    <property name="label-widget" type="GtkWidget" flags="1073742051"/>
     <property name="resize-toplevel" type="gboolean" flags="1073742051" default-value="FALSE"/>
-    <property name="child" type="GtkWidget" flags="227"/>
+    <property name="child" type="GtkWidget" flags="1073742051"/>
     <signal name="activate" return="void" when="last" action="1">
     </signal>
   </class>
@@ -1860,9 +1921,11 @@
   </class>
   <class name="GtkFileLauncher" get-type="gtk_file_launcher_get_type" parents="GObject">
     <property name="file" type="GFile" flags="1073742051"/>
+    <property name="always-ask" type="gboolean" flags="1073742051" default-value="FALSE"/>
   </class>
   <class name="GtkFilterListModel" get-type="gtk_filter_list_model_get_type" parents="GObject">
     <implements name="GListModel"/>
+    <implements name="GtkSectionModel"/>
     <property name="filter" type="GtkFilter" flags="1073742051"/>
     <property name="incremental" type="gboolean" flags="1073742051" default-value="FALSE"/>
     <property name="item-type" type="GType" flags="225"/>
@@ -1882,6 +1945,7 @@
   </class>
   <class name="GtkFlattenListModel" get-type="gtk_flatten_list_model_get_type" parents="GObject">
     <implements name="GListModel"/>
+    <implements name="GtkSectionModel"/>
     <property name="item-type" type="GType" flags="225"/>
     <property name="model" type="GListModel" flags="1073742051"/>
     <property name="n-items" type="guint" flags="225" default-value="0"/>
@@ -1945,6 +2009,8 @@
     <property name="language" type="PangoLanguage" flags="1073742051"/>
     <property name="use-font" type="gboolean" flags="1073742051" default-value="FALSE"/>
     <property name="use-size" type="gboolean" flags="1073742051" default-value="FALSE"/>
+    <signal name="activate" return="void" when="first" action="1">
+    </signal>
   </class>
   <class name="GtkFrame" get-type="gtk_frame_get_type" parents="GtkWidget,GInitiallyUnowned,GObject">
     <implements name="GtkAccessible"/>
@@ -1952,8 +2018,8 @@
     <implements name="GtkConstraintTarget"/>
     <property name="label" type="gchararray" flags="1073742051" default-value="NULL"/>
     <property name="label-xalign" type="gfloat" flags="1073742051" default-value="0.000000"/>
-    <property name="label-widget" type="GtkWidget" flags="227"/>
-    <property name="child" type="GtkWidget" flags="227"/>
+    <property name="label-widget" type="GtkWidget" flags="1073742051"/>
+    <property name="child" type="GtkWidget" flags="1073742051"/>
   </class>
   <class name="GtkGesture" get-type="gtk_gesture_get_type" parents="GtkEventController,GObject" abstract="1">
     <property name="n-points" type="guint" flags="235" default-value="1"/>
@@ -2073,6 +2139,8 @@
     <property name="has-depth-buffer" type="gboolean" flags="1073742051" default-value="FALSE"/>
     <property name="has-stencil-buffer" type="gboolean" flags="1073742051" default-value="FALSE"/>
     <property name="use-es" type="gboolean" flags="1073742051" default-value="FALSE"/>
+    <property name="allowed-apis" type="GdkGLAPI" flags="1073742051" default-value="GDK_GL_API_GL | GDK_GL_API_GLES"/>
+    <property name="api" type="GdkGLAPI" flags="1073742049" default-value="0"/>
     <property name="auto-render" type="gboolean" flags="1073742051" default-value="TRUE"/>
     <signal name="resize" return="void" when="last">
       <param type="gint"/>
@@ -2122,12 +2190,13 @@
     <implements name="GtkConstraintTarget"/>
     <implements name="GtkOrientable"/>
     <implements name="GtkScrollable"/>
+    <property name="enable-rubberband" type="gboolean" flags="1073741827" default-value="FALSE"/>
     <property name="factory" type="GtkListItemFactory" flags="1073742051"/>
     <property name="max-columns" type="guint" flags="1073742051" default-value="7"/>
     <property name="min-columns" type="guint" flags="1073742051" default-value="1"/>
     <property name="model" type="GtkSelectionModel" flags="1073742051"/>
     <property name="single-click-activate" type="gboolean" flags="1073741827" default-value="FALSE"/>
-    <property name="enable-rubberband" type="gboolean" flags="1073741827" default-value="FALSE"/>
+    <property name="tab-behavior" type="GtkListTabBehavior" flags="1073741827" default-value="GTK_LIST_TAB_ALL"/>
     <signal name="activate" return="void" when="last">
       <param type="guint"/>
     </signal>
@@ -2136,7 +2205,7 @@
     <implements name="GtkAccessible"/>
     <implements name="GtkBuildable"/>
     <implements name="GtkConstraintTarget"/>
-    <property name="title-widget" type="GtkWidget" flags="227"/>
+    <property name="title-widget" type="GtkWidget" flags="1073742051"/>
     <property name="show-title-buttons" type="gboolean" flags="1073742051" default-value="TRUE"/>
     <property name="decoration-layout" type="gchararray" flags="227" default-value="NULL"/>
   </class>
@@ -2736,7 +2805,7 @@
     <property name="natural-wrap-mode" type="GtkNaturalWrapMode" flags="1073742051" default-value="GTK_NATURAL_WRAP_INHERIT"/>
     <property name="selectable" type="gboolean" flags="1073742051" default-value="FALSE"/>
     <property name="mnemonic-keyval" type="guint" flags="225" default-value="16777215"/>
-    <property name="mnemonic-widget" type="GtkWidget" flags="227"/>
+    <property name="mnemonic-widget" type="GtkWidget" flags="1073742051"/>
     <property name="ellipsize" type="PangoEllipsizeMode" flags="1073742051" default-value="PANGO_ELLIPSIZE_NONE"/>
     <property name="width-chars" type="gint" flags="1073742051" default-value="-1"/>
     <property name="single-line-mode" type="gboolean" flags="1073742051" default-value="FALSE"/>
@@ -2826,13 +2895,12 @@
     <signal name="activate-cursor-row" return="void" when="last" action="1">
     </signal>
   </class>
-  <class name="GtkListItem" get-type="gtk_list_item_get_type" parents="GObject">
-    <property name="activatable" type="gboolean" flags="1073742051" default-value="TRUE"/>
+  <class name="GtkListHeader" get-type="gtk_list_header_get_type" parents="GObject">
     <property name="child" type="GtkWidget" flags="1073742051"/>
+    <property name="end" type="guint" flags="1073742049" default-value="4294967295"/>
     <property name="item" type="GObject" flags="1073742049"/>
-    <property name="position" type="guint" flags="1073742049" default-value="4294967295"/>
-    <property name="selectable" type="gboolean" flags="1073742051" default-value="TRUE"/>
-    <property name="selected" type="gboolean" flags="1073742049" default-value="FALSE"/>
+    <property name="n-items" type="guint" flags="1073742049" default-value="0"/>
+    <property name="start" type="guint" flags="1073742049" default-value="4294967295"/>
   </class>
   <class name="GtkListView" get-type="gtk_list_view_get_type" parents="GtkListBase,GtkWidget,GInitiallyUnowned,GObject">
     <implements name="GtkAccessible"/>
@@ -2840,11 +2908,13 @@
     <implements name="GtkConstraintTarget"/>
     <implements name="GtkOrientable"/>
     <implements name="GtkScrollable"/>
+    <property name="enable-rubberband" type="gboolean" flags="1073741827" default-value="FALSE"/>
     <property name="factory" type="GtkListItemFactory" flags="1073742051"/>
+    <property name="header-factory" type="GtkListItemFactory" flags="1073742051"/>
     <property name="model" type="GtkSelectionModel" flags="1073742051"/>
     <property name="show-separators" type="gboolean" flags="1073741827" default-value="FALSE"/>
     <property name="single-click-activate" type="gboolean" flags="1073741827" default-value="FALSE"/>
-    <property name="enable-rubberband" type="gboolean" flags="1073741827" default-value="FALSE"/>
+    <property name="tab-behavior" type="GtkListTabBehavior" flags="1073741827" default-value="GTK_LIST_TAB_ALL"/>
     <signal name="activate" return="void" when="last">
       <param type="guint"/>
     </signal>
@@ -2863,6 +2933,7 @@
   </class>
   <class name="GtkMapListModel" get-type="gtk_map_list_model_get_type" parents="GObject">
     <implements name="GListModel"/>
+    <implements name="GtkSectionModel"/>
     <property name="has-map" type="gboolean" flags="1073742049" default-value="FALSE"/>
     <property name="item-type" type="GType" flags="225"/>
     <property name="model" type="GListModel" flags="1073742059"/>
@@ -2929,6 +3000,7 @@
     <property name="primary" type="gboolean" flags="1073742051" default-value="FALSE"/>
     <property name="child" type="GtkWidget" flags="1073742051"/>
     <property name="active" type="gboolean" flags="1073742051" default-value="FALSE"/>
+    <property name="can-shrink" type="gboolean" flags="1073742051" default-value="FALSE"/>
     <signal name="activate" return="void" when="first" action="1">
     </signal>
   </class>
@@ -2968,6 +3040,7 @@
   </class>
   <class name="GtkMultiSelection" get-type="gtk_multi_selection_get_type" parents="GObject">
     <implements name="GListModel"/>
+    <implements name="GtkSectionModel"/>
     <implements name="GtkSelectionModel"/>
     <property name="item-type" type="GType" flags="225"/>
     <property name="model" type="GListModel" flags="1073742051"/>
@@ -2984,9 +3057,10 @@
   </interface>
   <class name="GtkNoSelection" get-type="gtk_no_selection_get_type" parents="GObject">
     <implements name="GListModel"/>
+    <implements name="GtkSectionModel"/>
     <implements name="GtkSelectionModel"/>
     <property name="item-type" type="GType" flags="225"/>
-    <property name="model" type="GListModel" flags="227"/>
+    <property name="model" type="GListModel" flags="1073742051"/>
     <property name="n-items" type="guint" flags="225" default-value="0"/>
   </class>
   <class name="GtkNotebook" get-type="gtk_notebook_get_type" parents="GtkWidget,GInitiallyUnowned,GObject">
@@ -3167,24 +3241,24 @@
   </interface>
   <class name="GtkPrintOperation" get-type="gtk_print_operation_get_type" parents="GObject">
     <implements name="GtkPrintOperationPreview"/>
-    <property name="default-page-setup" type="GtkPageSetup" flags="227"/>
-    <property name="print-settings" type="GtkPrintSettings" flags="227"/>
-    <property name="job-name" type="gchararray" flags="227" default-value=""/>
-    <property name="n-pages" type="gint" flags="1073742051" default-value="-1"/>
-    <property name="current-page" type="gint" flags="1073742051" default-value="-1"/>
-    <property name="use-full-page" type="gboolean" flags="1073742051" default-value="FALSE"/>
-    <property name="track-print-status" type="gboolean" flags="1073742051" default-value="FALSE"/>
-    <property name="unit" type="GtkUnit" flags="1073742051" default-value="GTK_UNIT_NONE"/>
-    <property name="show-progress" type="gboolean" flags="1073742051" default-value="FALSE"/>
-    <property name="allow-async" type="gboolean" flags="1073742051" default-value="FALSE"/>
-    <property name="export-filename" type="gchararray" flags="227" default-value="NULL"/>
-    <property name="status" type="GtkPrintStatus" flags="1073742049" default-value="GTK_PRINT_STATUS_INITIAL"/>
-    <property name="status-string" type="gchararray" flags="225" default-value=""/>
-    <property name="custom-tab-label" type="gchararray" flags="227" default-value="NULL"/>
-    <property name="embed-page-setup" type="gboolean" flags="1073742051" default-value="FALSE"/>
-    <property name="has-selection" type="gboolean" flags="1073742051" default-value="FALSE"/>
-    <property name="support-selection" type="gboolean" flags="1073742051" default-value="FALSE"/>
-    <property name="n-pages-to-print" type="gint" flags="1073742049" default-value="-1"/>
+    <property name="default-page-setup" type="GtkPageSetup" flags="3"/>
+    <property name="print-settings" type="GtkPrintSettings" flags="3"/>
+    <property name="job-name" type="gchararray" flags="3" default-value=""/>
+    <property name="n-pages" type="gint" flags="1073741827" default-value="-1"/>
+    <property name="current-page" type="gint" flags="1073741827" default-value="-1"/>
+    <property name="use-full-page" type="gboolean" flags="1073741827" default-value="FALSE"/>
+    <property name="track-print-status" type="gboolean" flags="1073741827" default-value="FALSE"/>
+    <property name="unit" type="GtkUnit" flags="1073741827" default-value="GTK_UNIT_NONE"/>
+    <property name="show-progress" type="gboolean" flags="1073741827" default-value="FALSE"/>
+    <property name="allow-async" type="gboolean" flags="1073741827" default-value="FALSE"/>
+    <property name="export-filename" type="gchararray" flags="3" default-value="NULL"/>
+    <property name="status" type="GtkPrintStatus" flags="1073741825" default-value="GTK_PRINT_STATUS_INITIAL"/>
+    <property name="status-string" type="gchararray" flags="1" default-value=""/>
+    <property name="custom-tab-label" type="gchararray" flags="3" default-value="NULL"/>
+    <property name="embed-page-setup" type="gboolean" flags="1073741827" default-value="FALSE"/>
+    <property name="has-selection" type="gboolean" flags="1073741827" default-value="FALSE"/>
+    <property name="support-selection" type="gboolean" flags="1073741827" default-value="FALSE"/>
+    <property name="n-pages-to-print" type="gint" flags="1073741825" default-value="-1"/>
     <signal name="done" return="void" when="last">
       <param type="GtkPrintOperationResult"/>
     </signal>
@@ -3243,7 +3317,7 @@
     <implements name="GtkConstraintTarget"/>
     <implements name="GtkAccessibleRange"/>
     <implements name="GtkOrientable"/>
-    <property name="adjustment" type="GtkAdjustment" flags="231"/>
+    <property name="adjustment" type="GtkAdjustment" flags="1073742055"/>
     <property name="inverted" type="gboolean" flags="1073742051" default-value="FALSE"/>
     <property name="show-fill-level" type="gboolean" flags="1073742051" default-value="FALSE"/>
     <property name="restrict-to-fill-level" type="gboolean" flags="1073742051" default-value="TRUE"/>
@@ -3303,7 +3377,7 @@
     <implements name="GtkAccessibleRange"/>
     <implements name="GtkOrientable"/>
     <property name="value" type="gdouble" flags="1073742051" default-value="0.000000"/>
-    <property name="adjustment" type="GtkAdjustment" flags="227"/>
+    <property name="adjustment" type="GtkAdjustment" flags="1073742051"/>
     <property name="icons" type="GStrv" flags="227"/>
     <property name="active" type="gboolean" flags="225" default-value="FALSE"/>
     <signal name="value-changed" return="void" when="last">
@@ -3325,14 +3399,15 @@
     <implements name="GtkBuildable"/>
     <implements name="GtkConstraintTarget"/>
     <implements name="GtkOrientable"/>
-    <property name="adjustment" type="GtkAdjustment" flags="231"/>
+    <property name="adjustment" type="GtkAdjustment" flags="1073742055"/>
   </class>
+  <boxed name="GtkScrollInfo" get-type="gtk_scroll_info_get_type"/>
   <class name="GtkScrolledWindow" get-type="gtk_scrolled_window_get_type" parents="GtkWidget,GInitiallyUnowned,GObject">
     <implements name="GtkAccessible"/>
     <implements name="GtkBuildable"/>
     <implements name="GtkConstraintTarget"/>
-    <property name="hadjustment" type="GtkAdjustment" flags="231"/>
-    <property name="vadjustment" type="GtkAdjustment" flags="231"/>
+    <property name="hadjustment" type="GtkAdjustment" flags="1073742055"/>
+    <property name="vadjustment" type="GtkAdjustment" flags="1073742055"/>
     <property name="hscrollbar-policy" type="GtkPolicyType" flags="1073742051" default-value="GTK_POLICY_AUTOMATIC"/>
     <property name="vscrollbar-policy" type="GtkPolicyType" flags="1073742051" default-value="GTK_POLICY_AUTOMATIC"/>
     <property name="window-placement" type="GtkCornerType" flags="1073742051" default-value="GTK_CORNER_TOP_LEFT"/>
@@ -3390,6 +3465,13 @@
     <signal name="search-started" return="void" when="last">
     </signal>
   </class>
+  <interface name="GtkSectionModel" get-type="gtk_section_model_get_type">
+    <prerequisite name="GListModel"/>
+    <signal name="sections-changed" return="void" when="last">
+      <param type="guint"/>
+      <param type="guint"/>
+    </signal>
+  </interface>
   <class name="GtkSelectionFilterModel" get-type="gtk_selection_filter_model_get_type" parents="GObject">
     <implements name="GListModel"/>
     <property name="item-type" type="GType" flags="225"/>
@@ -3544,17 +3626,19 @@
   </class>
   <class name="GtkSingleSelection" get-type="gtk_single_selection_get_type" parents="GObject">
     <implements name="GListModel"/>
+    <implements name="GtkSectionModel"/>
     <implements name="GtkSelectionModel"/>
     <property name="autoselect" type="gboolean" flags="1073742051" default-value="TRUE"/>
     <property name="can-unselect" type="gboolean" flags="1073742051" default-value="FALSE"/>
     <property name="item-type" type="GType" flags="225"/>
-    <property name="model" type="GListModel" flags="227"/>
+    <property name="model" type="GListModel" flags="1073742051"/>
     <property name="n-items" type="guint" flags="225" default-value="0"/>
     <property name="selected" type="guint" flags="1073742051" default-value="4294967295"/>
     <property name="selected-item" type="GObject" flags="225"/>
   </class>
   <class name="GtkSliceListModel" get-type="gtk_slice_list_model_get_type" parents="GObject">
     <implements name="GListModel"/>
+    <implements name="GtkSectionModel"/>
     <property name="item-type" type="GType" flags="225"/>
     <property name="model" type="GListModel" flags="1073742051"/>
     <property name="n-items" type="guint" flags="225" default-value="0"/>
@@ -3603,7 +3687,7 @@
     <implements name="GtkAccessibleRange"/>
     <implements name="GtkEditable"/>
     <implements name="GtkCellEditable"/>
-    <property name="adjustment" type="GtkAdjustment" flags="227"/>
+    <property name="adjustment" type="GtkAdjustment" flags="1073742051"/>
     <property name="climb-rate" type="gdouble" flags="1073742051" default-value="0.000000"/>
     <property name="digits" type="guint" flags="1073742051" default-value="0"/>
     <property name="snap-to-ticks" type="gboolean" flags="1073742051" default-value="FALSE"/>
@@ -3650,12 +3734,6 @@
       <param type="gchararray"/>
     </signal>
   </class>
-  <class name="GtkStringFilter" get-type="gtk_string_filter_get_type" parents="GtkFilter,GObject">
-    <property name="expression" type="GtkExpression" flags="1073742051"/>
-    <property name="ignore-case" type="gboolean" flags="1073742051" default-value="TRUE"/>
-    <property name="match-mode" type="GtkStringFilterMatchMode" flags="1073742051" default-value="GTK_STRING_FILTER_MATCH_MODE_SUBSTRING"/>
-    <property name="search" type="gchararray" flags="1073742051" default-value="NULL"/>
-  </class>
   <class name="GtkStringObject" get-type="gtk_string_object_get_type" parents="GObject">
     <property name="string" type="gchararray" flags="225" default-value="NULL"/>
   </class>
@@ -4055,7 +4133,7 @@
     <implements name="GtkConstraintTarget"/>
     <implements name="GtkScrollable"/>
     <property name="scroll-to-focus" type="gboolean" flags="1073742051" default-value="TRUE"/>
-    <property name="child" type="GtkWidget" flags="227"/>
+    <property name="child" type="GtkWidget" flags="1073742051"/>
   </class>
   <class name="GtkVolumeButton" get-type="gtk_volume_button_get_type" parents="GtkScaleButton,GtkWidget,GInitiallyUnowned,GObject">
     <implements name="GtkAccessible"/>
@@ -4106,27 +4184,27 @@
     <member name="GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT" nick="number-up-layout" value="512"/>
   </flags>
   <class name="GtkPrinter" get-type="gtk_printer_get_type" parents="GObject">
-    <property name="name" type="gchararray" flags="235" default-value=""/>
-    <property name="backend" type="GtkPrintBackend" flags="235"/>
-    <property name="is-virtual" type="gboolean" flags="235" default-value="FALSE"/>
-    <property name="state-message" type="gchararray" flags="225" default-value=""/>
-    <property name="location" type="gchararray" flags="225" default-value=""/>
-    <property name="icon-name" type="gchararray" flags="225" default-value="printer"/>
-    <property name="job-count" type="gint" flags="225" default-value="0"/>
-    <property name="accepts-pdf" type="gboolean" flags="235" default-value="FALSE"/>
-    <property name="accepts-ps" type="gboolean" flags="235" default-value="TRUE"/>
-    <property name="paused" type="gboolean" flags="225" default-value="FALSE"/>
-    <property name="accepting-jobs" type="gboolean" flags="225" default-value="TRUE"/>
+    <property name="name" type="gchararray" flags="11" default-value=""/>
+    <property name="backend" type="GtkPrintBackend" flags="11"/>
+    <property name="is-virtual" type="gboolean" flags="11" default-value="FALSE"/>
+    <property name="state-message" type="gchararray" flags="1" default-value=""/>
+    <property name="location" type="gchararray" flags="1" default-value=""/>
+    <property name="icon-name" type="gchararray" flags="1" default-value="printer"/>
+    <property name="job-count" type="gint" flags="1" default-value="0"/>
+    <property name="accepts-pdf" type="gboolean" flags="11" default-value="FALSE"/>
+    <property name="accepts-ps" type="gboolean" flags="11" default-value="TRUE"/>
+    <property name="paused" type="gboolean" flags="1" default-value="FALSE"/>
+    <property name="accepting-jobs" type="gboolean" flags="1" default-value="TRUE"/>
     <signal name="details-acquired" return="void" when="last">
       <param type="gboolean"/>
     </signal>
   </class>
   <class name="GtkPrintJob" get-type="gtk_print_job_get_type" parents="GObject">
-    <property name="title" type="gchararray" flags="235" default-value="NULL"/>
-    <property name="printer" type="GtkPrinter" flags="235"/>
-    <property name="page-setup" type="GtkPageSetup" flags="235"/>
-    <property name="settings" type="GtkPrintSettings" flags="235"/>
-    <property name="track-print-status" type="gboolean" flags="227" default-value="FALSE"/>
+    <property name="title" type="gchararray" flags="11" default-value="NULL"/>
+    <property name="printer" type="GtkPrinter" flags="11"/>
+    <property name="page-setup" type="GtkPageSetup" flags="11"/>
+    <property name="settings" type="GtkPrintSettings" flags="11"/>
+    <property name="track-print-status" type="gboolean" flags="3" default-value="FALSE"/>
     <signal name="status-changed" return="void" when="last">
     </signal>
   </class>
@@ -4137,14 +4215,14 @@
     <implements name="GtkNative"/>
     <implements name="GtkShortcutManager"/>
     <implements name="GtkRoot"/>
-    <property name="page-setup" type="GtkPageSetup" flags="227"/>
-    <property name="current-page" type="gint" flags="227" default-value="-1"/>
-    <property name="print-settings" type="GtkPrintSettings" flags="227"/>
-    <property name="selected-printer" type="GtkPrinter" flags="225"/>
-    <property name="manual-capabilities" type="GtkPrintCapabilities" flags="227" default-value="0"/>
-    <property name="support-selection" type="gboolean" flags="227" default-value="FALSE"/>
-    <property name="has-selection" type="gboolean" flags="227" default-value="FALSE"/>
-    <property name="embed-page-setup" type="gboolean" flags="227" default-value="FALSE"/>
+    <property name="page-setup" type="GtkPageSetup" flags="3"/>
+    <property name="current-page" type="gint" flags="3" default-value="-1"/>
+    <property name="print-settings" type="GtkPrintSettings" flags="3"/>
+    <property name="selected-printer" type="GtkPrinter" flags="1"/>
+    <property name="manual-capabilities" type="GtkPrintCapabilities" flags="3" default-value="0"/>
+    <property name="support-selection" type="gboolean" flags="3" default-value="FALSE"/>
+    <property name="has-selection" type="gboolean" flags="3" default-value="FALSE"/>
+    <property name="embed-page-setup" type="gboolean" flags="3" default-value="FALSE"/>
   </class>
   <error-quark function="gtk_css_parser_error_quark" domain="gtk-css-parser-error-quark"/>
   <error-quark function="gtk_builder_error_quark" domain="gtk-builder-error-quark"/>