CVS commit: pkgsrc/x11/gtk4

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Thu Jul  3 14:30:30 UTC 2025

Modified Files:
        pkgsrc/x11/gtk4: Makefile PLIST distinfo

Log Message:
Update gtk4 to 4.18.5

Many bug fixes, speed improvemnts and translation updates including:
- Fix interactions between scaling and the cairo renderer
  that broke the mutter-x11-frame client
- #7407 Segfault on setting popover child of a MenuButton (Matthias Clasen)
- macOS: Make fractional scaling work again
- The Wayland cursor shape protocol is supported
- GtkBuilder allows inline definition for GMenu-valued properties
- Improve a11y representation of many widgets

also:
demos: Drop the icon-browser fully

and intriguingly:

This release introduces a new backend, which allows running
GTK applications on Android phones. It is still considered
experimental.

For the full release notes, see
https://gitlab.gnome.org/GNOME/gtk/-/blob/4.18.5/NEWS?ref_type=tags


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/x11/gtk4/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/gtk4/PLIST
cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/gtk4/distinfo

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.60 pkgsrc/x11/gtk4/Makefile:1.61
--- pkgsrc/x11/gtk4/Makefile:1.60       Mon Jun  2 11:18:50 2025
+++ pkgsrc/x11/gtk4/Makefile    Thu Jul  3 14:30:30 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2025/06/02 11:18:50 prlw1 Exp $
+# $NetBSD: Makefile,v 1.61 2025/07/03 14:30:30 prlw1 Exp $
 
-DISTNAME=      gtk-4.16.13
+DISTNAME=      gtk-4.18.5
 PKGNAME=       ${DISTNAME:S/gtk/gtk4/}
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gtk/${PKGVERSION_NOREV:R}/}
@@ -24,12 +24,15 @@ RELRO_SUPPORTED=    partial
 
 USE_TOOLS+=    gdbus-codegen msgfmt msgmerge pkg-config xgettext
 USE_LANGUAGES= c c++
+# meson.build only mentions c++11 to build harfbuzz as a subproject
 
-MESON_REQD+=           0.60.0
+
+MESON_REQD+=           1.5.0
 MESON_ARGS+=           -Dintrospection=enabled
 # needs gstreamer-gl
 MESON_ARGS+=           -Dmedia-gstreamer=disabled
 MESON_ARGS+=           -Dvulkan=disabled
+MESON_ARGS+=           -Df16c=disabled
 
 PKGCONFIG_OVERRIDE+=   output/meson-private/gtk4.pc
 PKGCONFIG_OVERRIDE+=   output/meson-private/gtk4-x11.pc
@@ -39,14 +42,15 @@ PKGCONFIG_OVERRIDE_STAGE=   post-configure
 
 BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--export-dynamic
 
+BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.80
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/libexecinfo/buildlink3.mk"
 .include "../../devel/meson/build.mk"
-BUILDLINK_API_DEPENDS.pango+=  pango>=1.47.0
+BUILDLINK_API_DEPENDS.pango+=  pango>=1.56
 .include "../../devel/pango/buildlink3.mk"
-BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18.2
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .include "../../graphics/graphene/buildlink3.mk"

Index: pkgsrc/x11/gtk4/PLIST
diff -u pkgsrc/x11/gtk4/PLIST:1.23 pkgsrc/x11/gtk4/PLIST:1.24
--- pkgsrc/x11/gtk4/PLIST:1.23  Mon Jun  2 11:18:50 2025
+++ pkgsrc/x11/gtk4/PLIST       Thu Jul  3 14:30:30 2025
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.23 2025/06/02 11:18:50 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.24 2025/07/03 14:30:30 prlw1 Exp $
 bin/gtk4-builder-tool
 bin/gtk4-demo
 bin/gtk4-demo-application
 bin/gtk4-encode-symbolic-svg
-bin/gtk4-icon-browser
 bin/gtk4-image-tool
 bin/gtk4-launch
 bin/gtk4-node-editor
@@ -97,6 +96,7 @@ ${PLIST.x11}include/gtk-4.0/gdk/x11/gdkx
 ${PLIST.x11}include/gtk-4.0/gdk/x11/gdkx11surface.h
 ${PLIST.x11}include/gtk-4.0/gdk/x11/gdkx11utils.h
 include/gtk-4.0/gsk/gl/gskglrenderer.h
+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
@@ -163,6 +163,11 @@ include/gtk-4.0/gtk/deprecated/gtklistst
 include/gtk-4.0/gtk/deprecated/gtklockbutton.h
 include/gtk-4.0/gtk/deprecated/gtkmessagedialog.h
 include/gtk-4.0/gtk/deprecated/gtkrender.h
+include/gtk-4.0/gtk/deprecated/gtkshortcutlabel.h
+include/gtk-4.0/gtk/deprecated/gtkshortcutsgroup.h
+include/gtk-4.0/gtk/deprecated/gtkshortcutssection.h
+include/gtk-4.0/gtk/deprecated/gtkshortcutsshortcut.h
+include/gtk-4.0/gtk/deprecated/gtkshortcutswindow.h
 include/gtk-4.0/gtk/deprecated/gtkshow.h
 include/gtk-4.0/gtk/deprecated/gtkstatusbar.h
 include/gtk-4.0/gtk/deprecated/gtkstylecontext.h
@@ -340,12 +345,7 @@ include/gtk-4.0/gtk/gtksettings.h
 include/gtk-4.0/gtk/gtkshortcut.h
 include/gtk-4.0/gtk/gtkshortcutaction.h
 include/gtk-4.0/gtk/gtkshortcutcontroller.h
-include/gtk-4.0/gtk/gtkshortcutlabel.h
 include/gtk-4.0/gtk/gtkshortcutmanager.h
-include/gtk-4.0/gtk/gtkshortcutsgroup.h
-include/gtk-4.0/gtk/gtkshortcutssection.h
-include/gtk-4.0/gtk/gtkshortcutsshortcut.h
-include/gtk-4.0/gtk/gtkshortcutswindow.h
 include/gtk-4.0/gtk/gtkshortcuttrigger.h
 include/gtk-4.0/gtk/gtksignallistitemfactory.h
 include/gtk-4.0/gtk/gtksingleselection.h
@@ -412,14 +412,13 @@ ${PLIST.cups}lib/gtk-4.0/4.0.0/printback
 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.1600.13
+lib/libgtk-4.so.1.1800.5
 lib/pkgconfig/gtk4-atspi.pc
 ${PLIST.quartz}lib/pkgconfig/gtk4-macos.pc
 lib/pkgconfig/gtk4-unix-print.pc
 ${PLIST.x11}lib/pkgconfig/gtk4-x11.pc
 lib/pkgconfig/gtk4.pc
 share/applications/org.gtk.Demo4.desktop
-share/applications/org.gtk.IconBrowser4.desktop
 share/applications/org.gtk.PrintEditor4.desktop
 share/applications/org.gtk.WidgetFactory4.desktop
 share/applications/org.gtk.gtk4.NodeEditor.desktop
@@ -430,6 +429,7 @@ ${PLIST.x11}share/gir-1.0/GdkX11-4.0.gir
 share/gir-1.0/Gsk-4.0.gir
 share/gir-1.0/Gtk-4.0.gir
 share/glib-2.0/schemas/org.gtk.Demo4.gschema.xml
+share/glib-2.0/schemas/org.gtk.gtk4.Inspector.gschema.xml
 share/glib-2.0/schemas/org.gtk.gtk4.Settings.ColorChooser.gschema.xml
 share/glib-2.0/schemas/org.gtk.gtk4.Settings.Debug.gschema.xml
 share/glib-2.0/schemas/org.gtk.gtk4.Settings.EmojiChooser.gschema.xml
@@ -460,14 +460,12 @@ share/gtk-4.0/emoji/zh.gresource
 share/gtk-4.0/gtk4builder.rng
 share/gtk-4.0/valgrind/gtk.supp
 share/icons/hicolor/scalable/apps/org.gtk.Demo4.svg
-share/icons/hicolor/scalable/apps/org.gtk.IconBrowser4.svg
 share/icons/hicolor/scalable/apps/org.gtk.PrintEditor4.Devel.svg
 share/icons/hicolor/scalable/apps/org.gtk.PrintEditor4.svg
 share/icons/hicolor/scalable/apps/org.gtk.WidgetFactory4.svg
 share/icons/hicolor/scalable/apps/org.gtk.gtk4.NodeEditor.Devel.svg
 share/icons/hicolor/scalable/apps/org.gtk.gtk4.NodeEditor.svg
 share/icons/hicolor/symbolic/apps/org.gtk.Demo4-symbolic.svg
-share/icons/hicolor/symbolic/apps/org.gtk.IconBrowser4-symbolic.svg
 share/icons/hicolor/symbolic/apps/org.gtk.PrintEditor4-symbolic.svg
 share/icons/hicolor/symbolic/apps/org.gtk.WidgetFactory4-symbolic.svg
 share/icons/hicolor/symbolic/apps/org.gtk.gtk4.NodeEditor-symbolic.svg
@@ -591,7 +589,6 @@ share/locale/zh_CN/LC_MESSAGES/gtk40.mo
 share/locale/zh_HK/LC_MESSAGES/gtk40.mo
 share/locale/zh_TW/LC_MESSAGES/gtk40.mo
 share/metainfo/org.gtk.Demo4.appdata.xml
-share/metainfo/org.gtk.IconBrowser4.appdata.xml
 share/metainfo/org.gtk.PrintEditor4.appdata.xml
 share/metainfo/org.gtk.WidgetFactory4.appdata.xml
 share/metainfo/org.gtk.gtk4.NodeEditor.appdata.xml

Index: pkgsrc/x11/gtk4/distinfo
diff -u pkgsrc/x11/gtk4/distinfo:1.27 pkgsrc/x11/gtk4/distinfo:1.28
--- pkgsrc/x11/gtk4/distinfo:1.27       Mon Jun  2 11:18:51 2025
+++ pkgsrc/x11/gtk4/distinfo    Thu Jul  3 14:30:30 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.27 2025/06/02 11:18:51 prlw1 Exp $
+$NetBSD: distinfo,v 1.28 2025/07/03 14:30:30 prlw1 Exp $
 
-BLAKE2s (gtk-4.16.13.tar.xz) = bf61b2fa9c78a8add9d0c0ef8772e0c0af476f10f7ee81b53bfadb6043aa8474
-SHA512 (gtk-4.16.13.tar.xz) = 6a220b716b0fdaa9c59d28e4923388f22a84bc4de5693555e5e78af7bcf2835768d6c92dea18dbc3905681d5936761dd402c6e51016ea4c4f23ab5512894f1d8
-Size (gtk-4.16.13.tar.xz) = 14625864 bytes
+BLAKE2s (gtk-4.18.5.tar.xz) = 79029980c0a98b769a51e40d6710d25b2f1f7939d8e696898d9f1b320c151908
+SHA512 (gtk-4.18.5.tar.xz) = 4a09188fdbeb532d8c2064199126eaf60d806118bb637d5182121f3d80d374acdf343568c3423effb9574c364279ded7d7cbd4e0331dc1fb647970f60c98bff0
+Size (gtk-4.18.5.tar.xz) = 17706144 bytes
 SHA1 (patch-meson.build) = a9db17787c70631896315fb2c825e62977cfbb9b