CVS commit: pkgsrc/x11/gtk4

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jan  5 14:08:24 UTC 2026

Modified Files:
        pkgsrc/x11/gtk4: Makefile PLIST buildlink3.mk distinfo
Added Files:
        pkgsrc/x11/gtk4/patches: patch-testsuite_gdk_colorstate.c

Log Message:
gtk4: updated to 4.20.3

Overview of Changes in 4.20.3, 20-11-2025

* Bugs fixed:
  - Change in scrolling behavior (lbaudin, Carlos Garnacho)
  - Unaligned access in gdk/gdkmemoryformat.c causes testsuite crashes on
    SPARC (Benjamin Otte)
  - Shaper: Cannot parse SVG (Matthias Clasen)
  - svg not scaled with display scale since switch to librsvg (Matthias
    Clasen)
  - GTK 4.18: Default GdkDisplay gets unreferenced when offscreen
    rendering via secondary display, causing crash (Benjamin Otte)
  - Feature: Add Win32 impl for gtk_file_launcher_open_containing_folder()
    (Sergey Bugaev)
  - Vulkan: Validation: vkQueuePresentKHR(): PRESENT_AFTER_WRITE hazard
    detected. (Benjamin Otte)
  - ModelButton: Increasingly long hang when switching AdwMultiLayoutView
    (Emmanuele Bassi)

* Changes:
  - ci: Update Rust to 1.89.0 (René de Hesselle)
  - [4.20] vulkan: Disable YCbCr to RGB conversions for fallback formats
    (Robert Mader)
  - backport non-smooth scrolling fixes to 4.20 (lbaudin, Carlos Garnacho)
  - [4.20] vulkan: Fix YUYV values when uploading images (Benjamin Otte,
    Matthias Clasen)
  - [4.20] Fix touch dropdown selection (!8041) properly (Alice)
  - [4.20] emoji: Update data to CLDR 48 (Jeremy Bícha)

* Translation updates:
  - Basque (Asier Saratsua Garmendia)
  - English (United Kingdom) (Bruce Cowan)
  - German (Christian Kirbach)
  - Serbian (Милош Поповић)
  - Thai (Aefgh Threenine)
  - Uighur (Abduqadir Abliz)


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 pkgsrc/x11/gtk4/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/x11/gtk4/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/gtk4/buildlink3.mk
cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/gtk4/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/gtk4/patches/patch-testsuite_gdk_colorstate.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/gtk4/Makefile
diff -u pkgsrc/x11/gtk4/Makefile:1.65 pkgsrc/x11/gtk4/Makefile:1.66
--- pkgsrc/x11/gtk4/Makefile:1.65       Thu Oct 23 20:39:56 2025
+++ pkgsrc/x11/gtk4/Makefile    Mon Jan  5 14:08:23 2026
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2025/10/23 20:39:56 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2026/01/05 14:08:23 adam Exp $
 
-DISTNAME=      gtk-4.18.6
+DISTNAME=      gtk-4.20.3
 PKGNAME=       ${DISTNAME:S/gtk/gtk4/}
-PKGREVISION=   3
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gtk/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
@@ -57,8 +56,7 @@ BUILDLINK_API_DEPENDS.cairo+= cairo>=1.1
 .include "../../graphics/graphene/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/libepoxy/buildlink3.mk"
-# librsvg is required by a demo only.
-#.include "../../graphics/librsvg/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-bad/buildlink3.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../lang/python/tool.mk"

Index: pkgsrc/x11/gtk4/PLIST
diff -u pkgsrc/x11/gtk4/PLIST:1.25 pkgsrc/x11/gtk4/PLIST:1.26
--- pkgsrc/x11/gtk4/PLIST:1.25  Mon Jul  7 08:28:55 2025
+++ pkgsrc/x11/gtk4/PLIST       Mon Jan  5 14:08:23 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2025/07/07 08:28:55 adam Exp $
+@comment $NetBSD: PLIST,v 1.26 2026/01/05 14:08:23 adam Exp $
 bin/gtk4-builder-tool
 bin/gtk4-demo
 bin/gtk4-demo-application
@@ -100,6 +100,7 @@ include/gtk-4.0/gsk/gpu/gskglrenderer.h
 include/gtk-4.0/gsk/gpu/gskvulkanrenderer.h
 include/gtk-4.0/gsk/gsk.h
 include/gtk-4.0/gsk/gskcairorenderer.h
+include/gtk-4.0/gsk/gskcomponenttransfer.h
 include/gtk-4.0/gsk/gskenums.h
 include/gtk-4.0/gsk/gskenumtypes.h
 include/gtk-4.0/gsk/gskglshader.h
@@ -279,6 +280,7 @@ include/gtk-4.0/gtk/gtkgrid.h
 include/gtk-4.0/gtk/gtkgridlayout.h
 include/gtk-4.0/gtk/gtkgridview.h
 include/gtk-4.0/gtk/gtkheaderbar.h
+include/gtk-4.0/gtk/gtkiconpaintable.h
 include/gtk-4.0/gtk/gtkicontheme.h
 include/gtk-4.0/gtk/gtkimage.h
 include/gtk-4.0/gtk/gtkimcontext.h
@@ -409,11 +411,9 @@ ${PLIST.quartz}lib/girepository-1.0/GdkM
 ${PLIST.x11}lib/girepository-1.0/GdkX11-4.0.typelib
 lib/girepository-1.0/Gsk-4.0.typelib
 lib/girepository-1.0/Gtk-4.0.typelib
-${PLIST.cups}lib/gtk-4.0/4.0.0/printbackends/libprintbackend-cups.so
-lib/gtk-4.0/4.0.0/printbackends/libprintbackend-file.so
 lib/libgtk-4.so
 lib/libgtk-4.so.1
-lib/libgtk-4.so.1.1800.6
+lib/libgtk-4.so.1.2000.3
 lib/pkgconfig/gtk4-atspi.pc
 ${PLIST.quartz}lib/pkgconfig/gtk4-macos.pc
 lib/pkgconfig/gtk4-unix-print.pc
@@ -423,6 +423,14 @@ share/applications/org.gtk.Demo4.desktop
 share/applications/org.gtk.PrintEditor4.desktop
 share/applications/org.gtk.WidgetFactory4.desktop
 share/applications/org.gtk.gtk4.NodeEditor.desktop
+share/bash-completion/completions/gtk4-builder-tool
+share/bash-completion/completions/gtk4-demo
+share/bash-completion/completions/gtk4-image-tool
+share/bash-completion/completions/gtk4-node-editor
+share/bash-completion/completions/gtk4-path-tool
+share/bash-completion/completions/gtk4-print-editor
+share/bash-completion/completions/gtk4-rendernode-tool
+share/bash-completion/completions/gtk4-widget-factory
 share/gettext/its/gtk4builder.its
 share/gettext/its/gtk4builder.loc
 share/gir-1.0/Gdk-4.0.gir
@@ -527,7 +535,6 @@ share/locale/it/LC_MESSAGES/gtk40.mo
 share/locale/ja/LC_MESSAGES/gtk40.mo
 share/locale/ka/LC_MESSAGES/gtk40.mo
 share/locale/kab/LC_MESSAGES/gtk40.mo
-share/locale/kg/LC_MESSAGES/gtk40.mo
 share/locale/kk/LC_MESSAGES/gtk40.mo
 share/locale/km/LC_MESSAGES/gtk40.mo
 share/locale/kn/LC_MESSAGES/gtk40.mo
@@ -575,7 +582,6 @@ share/locale/ta/LC_MESSAGES/gtk40.mo
 share/locale/te/LC_MESSAGES/gtk40.mo
 share/locale/tg/LC_MESSAGES/gtk40.mo
 share/locale/th/LC_MESSAGES/gtk40.mo
-share/locale/tk/LC_MESSAGES/gtk40.mo
 share/locale/tr/LC_MESSAGES/gtk40.mo
 share/locale/tt/LC_MESSAGES/gtk40.mo
 share/locale/ug/LC_MESSAGES/gtk40.mo

Index: pkgsrc/x11/gtk4/buildlink3.mk
diff -u pkgsrc/x11/gtk4/buildlink3.mk:1.17 pkgsrc/x11/gtk4/buildlink3.mk:1.18
--- pkgsrc/x11/gtk4/buildlink3.mk:1.17  Thu Oct 23 20:39:56 2025
+++ pkgsrc/x11/gtk4/buildlink3.mk       Mon Jan  5 14:08:23 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2025/10/23 20:39:56 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2026/01/05 14:08:23 adam Exp $
 
 BUILDLINK_TREE+=       gtk4
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        gtk4
 GTK4_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gtk4+=   gtk4>=4.0.3
-BUILDLINK_ABI_DEPENDS.gtk4+=   gtk4>=4.18.6nb3
+BUILDLINK_ABI_DEPENDS.gtk4+=   gtk4>=4.20.3
 BUILDLINK_PKGSRCDIR.gtk4?=     ../../x11/gtk4
 
 .include "../../devel/glib2/buildlink3.mk"
@@ -15,6 +15,7 @@ BUILDLINK_PKGSRCDIR.gtk4?=    ../../x11/gtk
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .include "../../graphics/graphene/buildlink3.mk"
 .include "../../graphics/libepoxy/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 
 pkgbase := gtk4
 .include "../../mk/pkg-build-options.mk"

Index: pkgsrc/x11/gtk4/distinfo
diff -u pkgsrc/x11/gtk4/distinfo:1.29 pkgsrc/x11/gtk4/distinfo:1.30
--- pkgsrc/x11/gtk4/distinfo:1.29       Mon Jul  7 08:28:55 2025
+++ pkgsrc/x11/gtk4/distinfo    Mon Jan  5 14:08:23 2026
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.29 2025/07/07 08:28:55 adam Exp $
+$NetBSD: distinfo,v 1.30 2026/01/05 14:08:23 adam Exp $
 
-BLAKE2s (gtk-4.18.6.tar.xz) = a263b558b9cfc9ec92c5f36f3a8cdde1f44285ee1eeb2fcc6adb86f80b6ef56d
-SHA512 (gtk-4.18.6.tar.xz) = 636bc3adf01f444dfbf10a3fdce82cdd7b2914b9ff251e98e006a987c3216ef22f5ae8759aa5f2385d1e82813ab8bf2c8adc4f8d6db230e9f507b44fac10e359
-Size (gtk-4.18.6.tar.xz) = 17710412 bytes
+BLAKE2s (gtk-4.20.3.tar.xz) = ded1e613ce985ec1723496fe9a3d6a78dbf727047242e2e389de183c148a5baa
+SHA512 (gtk-4.20.3.tar.xz) = 9ae8d2fb6fc6b3780587e70cbf4bff972dd36eedce79d91de874cc813ba3cb100ce6cce076e063e4606e0e32aa51d05c625dd272d5766190045f32b3754368f1
+Size (gtk-4.20.3.tar.xz) = 16003020 bytes
 SHA1 (patch-meson.build) = a9db17787c70631896315fb2c825e62977cfbb9b
+SHA1 (patch-testsuite_gdk_colorstate.c) = 7a6d441f91332bffbd4e170809d8ad7ec51773bd

Added files:

Index: pkgsrc/x11/gtk4/patches/patch-testsuite_gdk_colorstate.c
diff -u /dev/null pkgsrc/x11/gtk4/patches/patch-testsuite_gdk_colorstate.c:1.1
--- /dev/null   Mon Jan  5 14:08:24 2026
+++ pkgsrc/x11/gtk4/patches/patch-testsuite_gdk_colorstate.c    Mon Jan  5 14:08:23 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-testsuite_gdk_colorstate.c,v 1.1 2026/01/05 14:08:23 adam Exp $
+
+Fix build.
+
+--- testsuite/gdk/colorstate.c.orig    2026-01-05 13:26:22.141849124 +0000
++++ testsuite/gdk/colorstate.c
+@@ -166,7 +166,7 @@ test_convert (gconstpointer testdata,
+                                         gdk_color_state_get_srgb ()));
+   if (method == TEXTURE_METHOD_DMABUF)
+     {
+-#ifdef HAVE_DRM_FOURCC_H
++#if 0
+       texture = udmabuf_texture_from_texture (texture, &error);
+ #else
+       g_assert_not_reached ();