CVS commit: pkgsrc/x11/gtk4

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Jan  6 20:06:35 UTC 2026

Modified Files:
        pkgsrc/x11/gtk4: Makefile PLIST distinfo
        pkgsrc/x11/gtk4/patches: patch-meson.build

Log Message:
gtk4: skip installation of bash-completion for demo programs


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/x11/gtk4/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/gtk4/PLIST
cvs rdiff -u -r1.30 -r1.31 pkgsrc/x11/gtk4/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/gtk4/patches/patch-meson.build

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.66 pkgsrc/x11/gtk4/Makefile:1.67
--- pkgsrc/x11/gtk4/Makefile:1.66       Mon Jan  5 14:08:23 2026
+++ pkgsrc/x11/gtk4/Makefile    Tue Jan  6 20:06:35 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2026/01/05 14:08:23 adam Exp $
+# $NetBSD: Makefile,v 1.67 2026/01/06 20:06:35 adam Exp $
 
 DISTNAME=      gtk-4.20.3
 PKGNAME=       ${DISTNAME:S/gtk/gtk4/}
@@ -26,7 +26,6 @@ USE_TOOLS+=   gdbus-codegen msgfmt msgmerg
 USE_LANGUAGES= c c++
 # meson.build only mentions c++11 to build harfbuzz as a subproject
 
-
 MESON_REQD+=           1.5.0
 MESON_ARGS+=           -Dintrospection=enabled
 # needs gstreamer-gl

Index: pkgsrc/x11/gtk4/PLIST
diff -u pkgsrc/x11/gtk4/PLIST:1.26 pkgsrc/x11/gtk4/PLIST:1.27
--- pkgsrc/x11/gtk4/PLIST:1.26  Mon Jan  5 14:08:23 2026
+++ pkgsrc/x11/gtk4/PLIST       Tue Jan  6 20:06:35 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2026/01/05 14:08:23 adam Exp $
+@comment $NetBSD: PLIST,v 1.27 2026/01/06 20:06:35 adam Exp $
 bin/gtk4-builder-tool
 bin/gtk4-demo
 bin/gtk4-demo-application
@@ -423,14 +423,6 @@ 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

Index: pkgsrc/x11/gtk4/distinfo
diff -u pkgsrc/x11/gtk4/distinfo:1.30 pkgsrc/x11/gtk4/distinfo:1.31
--- pkgsrc/x11/gtk4/distinfo:1.30       Mon Jan  5 14:08:23 2026
+++ pkgsrc/x11/gtk4/distinfo    Tue Jan  6 20:06:35 2026
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.30 2026/01/05 14:08:23 adam Exp $
+$NetBSD: distinfo,v 1.31 2026/01/06 20:06:35 adam Exp $
 
 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-meson.build) = ed697477ebfa2b06559877170cc5b05079c61ceb
 SHA1 (patch-testsuite_gdk_colorstate.c) = 7a6d441f91332bffbd4e170809d8ad7ec51773bd

Index: pkgsrc/x11/gtk4/patches/patch-meson.build
diff -u pkgsrc/x11/gtk4/patches/patch-meson.build:1.5 pkgsrc/x11/gtk4/patches/patch-meson.build:1.6
--- pkgsrc/x11/gtk4/patches/patch-meson.build:1.5       Tue Jan 16 10:00:16 2024
+++ pkgsrc/x11/gtk4/patches/patch-meson.build   Tue Jan  6 20:06:35 2026
@@ -1,12 +1,14 @@
-$NetBSD: patch-meson.build,v 1.5 2024/01/16 10:00:16 prlw1 Exp $
+$NetBSD: patch-meson.build,v 1.6 2026/01/06 20:06:35 adam Exp $
 
 Build fix for gcc 12 on NetBSD.
 It is the equivalent of the default PKGSRC_USE_RELRO=partial
 c.f., PR lib/57792
 
---- meson.build.orig   2023-11-17 20:29:11.000000000 +0000
+Don't look for bash. Don't install bash-completions.
+
+--- meson.build.orig   2025-11-20 05:08:31.000000000 +0000
 +++ meson.build
-@@ -362,7 +362,6 @@ common_cflags = cc.get_supported_argumen
+@@ -429,7 +429,6 @@ common_cflags = cc.get_supported_argumen
  common_ldflags = cc.get_supported_link_arguments([
    '-Wl,-Bsymbolic',
    '-Wl,-z,relro',
@@ -14,3 +16,12 @@ c.f., PR lib/57792
  ])
  
  confinc = include_directories('.')
+@@ -858,7 +857,7 @@ if os_unix
+ endif
+ 
+ # Shell completion
+-bash = find_program('bash', required : false)
++bash = find_program('nonexistent_bash', required : false)
+ 
+ if bash.found()
+   bash_comp_dep = dependency('bash-completion', version: '>=2.0', required: false)