Update GTK to 4.20.3 (#86)

Author: kleisauke

build/nip4.mk

@@ -12,6 +12,7 @@ $(PKG)_DEPS     := cc meson-wrapper gtk4 adwaita-icon-theme gsl vips-all
 define $(PKG)_PRE_CONFIGURE
     (printf '{\n'; \
      printf '  "adwaita-icon-theme": "$(adwaita-icon-theme_VERSION)",\n'; \
+     printf '  "directx-headers": "$(directx-headers_VERSION)",\n'; \
      printf '  "epoxy": "$(libepoxy_VERSION)",\n'; \
      printf '  "graphene": "$(graphene_VERSION)",\n'; \
      printf '  "gsl": "$(gsl_VERSION)",\n'; \

build/overrides.mk

@@ -564,9 +564,6 @@ define librsvg_BUILD
     # Enable networking while we build librsvg
     $(eval export MXE_ENABLE_NETWORK := 1)
 
-    # Ensure MXE's pkg-config wrapper finds librsvg-2.0-uninstalled.pc
-    $(SED) -i "s/PKG_CONFIG_PATH/&_$(subst .,_,$(subst -,_,$(TARGET)))/" '$(SOURCE_DIR)/meson/cargo_wrapper.py'
-
     $(MXE_MESON_WRAPPER) \
         --buildtype=plain \
         -Dintrospection=disabled \
@@ -578,7 +575,6 @@ define librsvg_BUILD
         -Dtests=false \
         -Dtriplet='$(PROCESSOR)-pc-windows-gnullvm' \
         -Dc_link_args='$(LDFLAGS) -lntdll -luserenv' \
-        $(PKG_MESON_OPTS) \
         '$(SOURCE_DIR)' \
         '$(BUILD_DIR)'
 

build/patches/gdk-pixbuf-2-fixes.patch

@@ -2,10 +2,49 @@ This file is part of MXE. See LICENSE.md for licensing information.
 
 Contains ad hoc patches for cross building.
 
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Kleis Auke Wolthuizen <[email protected]>
+Date: Tue, 13 Oct 2020 16:40:45 +0200
+Subject: [PATCH 1/2] Don't force relocation support on Windows
+
+We don't use loadable modules for gdk-pixbuf.
+
+diff --git a/meson.build b/meson.build
+index 1111111..2222222 100644
+--- a/meson.build
++++ b/meson.build
+@@ -394,15 +394,8 @@ if not tiff_opt.disabled() and not native_windows_loaders
+   endif
+ endif
+ 
+-# Determine whether we enable application bundle relocation support, and we use
+-# this always on Windows
+-if host_system == 'windows'
+-  relocatable = (get_option('default_library') != 'static')
+-else
+-  relocatable = get_option('relocatable')
+-endif
+-
+-if relocatable
++# Determine whether we enable application bundle relocation support
++if get_option('relocatable')
+   add_project_arguments([ '-DGDK_PIXBUF_RELOCATABLE' ], language: 'c')
+ endif
+ 
+@@ -483,7 +476,7 @@ summary({
+     'Introspection': build_gir,
+     'Documentation': build_docs,
+     'Manual pages': get_option('man'),
+-    'Relocatable': relocatable,
++    'Relocatable': get_option('relocatable'),
+     'Build tests': get_option('tests'),
+     'Installed tests': get_option('installed_tests'),
+   },
+
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kleis Auke Wolthuizen <[email protected]>
 Date: Mon, 7 Oct 2019 11:30:00 +0200
-Subject: [PATCH 1/1] Fix pkg-config file when using built-in loader(s)
+Subject: [PATCH 2/2] Fix pkg-config file when using built-in loader(s)
 
 See: https://gitlab.gnome.org/GNOME/gdk-pixbuf/merge_requests/50
 

build/patches/gdk-pixbuf-2-without-relocation.patch

@@ -0,0 +1,18 @@
+PKG             := directx-headers
+$(PKG)_WEBSITE  := https://github.com/microsoft/DirectX-Headers
+$(PKG)_DESCR    := Official DirectX headers available under an open source license
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.618.2
+$(PKG)_CHECKSUM := 62004f45e2ab00cbb5c7f03c47262632c22fbce0a237383fc458d9324c44cf36
+$(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
+$(PKG)_GH_CONF  := microsoft/DirectX-Headers/tags,v
+$(PKG)_DEPS     := cc meson-wrapper
+
+define $(PKG)_BUILD
+    $(MXE_MESON_WRAPPER) \
+        -Dbuild-test=false \
+        '$(SOURCE_DIR)' \
+        '$(BUILD_DIR)'
+
+    $(MXE_NINJA) -C '$(BUILD_DIR)' -j '$(JOBS)' install
+endef

build/plugins/gtk4/directx-headers.mk

@@ -2,13 +2,13 @@ PKG             := gtk4
 $(PKG)_WEBSITE  := https://gtk.org/
 $(PKG)_DESCR    := GTK4
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.18.6
-$(PKG)_CHECKSUM := e1817c650ddc3261f9a8345b3b22a26a5d80af154630dedc03cc7becefffd0fa
+$(PKG)_VERSION  := 4.20.3
+$(PKG)_CHECKSUM := 2873f2903088a66c71173ea2ed85ffae266a66b972c3a4842bbb2f6f187ec153
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/gtk-[0-9]*.patch)))
 $(PKG)_SUBDIR   := gtk-$($(PKG)_VERSION)
 $(PKG)_FILE     := gtk-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://download.gnome.org/sources/gtk/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
-$(PKG)_DEPS     := cc meson-wrapper glib gdk-pixbuf pango fontconfig cairo libepoxy graphene
+$(PKG)_DEPS     := cc meson-wrapper glib gdk-pixbuf pango fontconfig cairo libepoxy graphene librsvg directx-headers
 
 define $(PKG)_BUILD
     # Disable tools

build/plugins/gtk4/gtk4.mk

@@ -11,12 +11,6 @@ glib_MESON_OPTS = --force-fallback-for=libpcre2-8
 cairo_PATCHES := $(filter-out $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/../../patches/cairo-1-nanoserver-compat.patch))),$(cairo_PATCHES))
 cairo_MESON_OPTS = -Dzlib=enabled -Ddwrite=enabled
 
-# GTK requires a relocatable GDK-PixBuf plugin with SVG support.
-# TODO(kleisauke): Probably no longer needed in GTK >= 4.19.2.
-gdk-pixbuf_PATCHES := $(filter-out $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/../../patches/gdk-pixbuf-2-without-relocation.patch))),$(gdk-pixbuf_PATCHES))
-librsvg_DEPS := $(librsvg_DEPS) gdk-pixbuf
-librsvg_MESON_OPTS = -Dpixbuf=enabled -Dpixbuf-loader=enabled
-
 # nip4 needs -Doutput=enabled
 libxml2_MESON_OPTS := $(libxml2_MESON_OPTS) -Doutput=enabled
 

build/plugins/gtk4/overrides.mk

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kleis Auke Wolthuizen <[email protected]>
 Date: Thu, 26 Oct 2023 17:00:00 +0200
-Subject: [PATCH 1/2] Make gtk4-builder-tool optional
+Subject: [PATCH 1/4] Make gtk4-builder-tool optional
 
 
 diff --git a/docs/reference/gtk/images/meson.build b/docs/reference/gtk/images/meson.build
@@ -24,7 +24,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <[email protected]>
 Date: Sat, 7 Sep 2024 13:39:22 +0200
-Subject: [PATCH 2/2] Disable automatic font rendering settings
+Subject: [PATCH 2/4] Disable automatic font rendering settings
 
 To restore the old code taking Windows settings into account.
 
@@ -35,12 +35,62 @@ diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
 index 1111111..2222222 100644
 --- a/gtk/gtksettings.c
 +++ b/gtk/gtksettings.c
-@@ -973,7 +973,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
+@@ -980,7 +980,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
     */
    pspecs[PROP_FONT_RENDERING] = g_param_spec_enum ("gtk-font-rendering", NULL, NULL,
                                                     GTK_TYPE_FONT_RENDERING,
 -                                                   GTK_FONT_RENDERING_AUTOMATIC,
 +                                                   GTK_FONT_RENDERING_MANUAL,
                                                     GTK_PARAM_READWRITE);
 
-   g_object_class_install_properties (gobject_class, NUM_PROPERTIES, pspecs);
+   /**
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <[email protected]>
+Date: Mon, 1 Sep 2025 08:32:52 +0200
+Subject: [PATCH 3/4] Disable dcomp by default
+
+This is equivalent to setting the `GDK_DISABLE=dcomp` env.
+
+See:
+https://gitlab.gnome.org/GNOME/gtk/-/issues/7567
+https://github.com/msys2/MINGW-packages/pull/25319
+
+diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
+index 1111111..2222222 100644
+--- a/gdk/win32/gdkdisplay-win32.c
++++ b/gdk/win32/gdkdisplay-win32.c
+@@ -517,7 +517,7 @@
+   const GUID my_IID_IDCompositionDevice = { 0xC37EA93A,0xE7AA,0x450D,0xB1,0x6F,0x97,0x46,0xCB,0x04,0x07,0xF3 };
+   IDXGIDevice *dxgi_device;
+ 
+-  if (!gdk_has_feature (GDK_FEATURE_DCOMP))
++  if (!gdk_has_feature (GDK_FEATURE_DCOMP) || g_getenv ("GDK_WIN32_FORCE_DCOMP") == NULL)
+     return;
+   
+   hr_warn (ID3D11Device_QueryInterface (self->d3d11_device, &IID_IDXGIDevice, (void **) &dxgi_device));
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Dan Yeaw <[email protected]>
+Date: Sun, 23 Nov 2025 15:26:12 -0500
+Subject: [PATCH 4/4] Windows: fix cairo crash with dcomp disabled
+
+See: https://gitlab.gnome.org/GNOME/gtk/-/issues/7890
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gtk/-/commit/f071763fd69e8924c497b9b21e43ef8e80718eff]
+
+diff --git a/gdk/win32/gdkcairocontext-win32.c b/gdk/win32/gdkcairocontext-win32.c
+index 1111111..2222222 100644
+--- a/gdk/win32/gdkcairocontext-win32.c
++++ b/gdk/win32/gdkcairocontext-win32.c
+@@ -134,8 +134,9 @@ gdk_win32_cairo_context_surface_detach (GdkDrawContext *context)
+ {
+   GdkWin32CairoContext *self = GDK_WIN32_CAIRO_CONTEXT (context);
+   GdkSurface *surface = gdk_draw_context_get_surface (context);
++  GdkWin32Display *display = GDK_WIN32_DISPLAY (gdk_draw_context_get_display (context));
+ 
+-  if (!GDK_SURFACE_DESTROYED (surface))
++  if (!GDK_SURFACE_DESTROYED (surface) && gdk_win32_display_get_dcomp_device (display))
+     gdk_win32_surface_set_dcomp_content (GDK_WIN32_SURFACE (surface), NULL);
+ 
+   gdk_win32_com_clear (&self->staging_texture);