CVS commit: pkgsrc/x11/gtk4

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Aug 27 18:16:08 UTC 2022

Modified Files:
        pkgsrc/x11/gtk4: Makefile distinfo
Added Files:
        pkgsrc/x11/gtk4/patches: patch-gtk_gtkfilechooserwidget.c

Log Message:
gtk4: add upstream bug fix for 'save' dialogs

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/gtk4/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/gtk4/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/gtk4/patches/patch-gtk_gtkfilechooserwidget.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.14 pkgsrc/x11/gtk4/Makefile:1.15
--- pkgsrc/x11/gtk4/Makefile:1.14       Fri Aug 26 22:32:33 2022
+++ pkgsrc/x11/gtk4/Makefile    Sat Aug 27 18:16:08 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2022/08/26 22:32:33 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2022/08/27 18:16:08 wiz Exp $
 
 DISTNAME=      gtk-4.6.6
 PKGNAME=       ${DISTNAME:S/gtk/gtk4/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gtk/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/x11/gtk4/distinfo
diff -u pkgsrc/x11/gtk4/distinfo:1.7 pkgsrc/x11/gtk4/distinfo:1.8
--- pkgsrc/x11/gtk4/distinfo:1.7        Mon Aug 15 00:01:41 2022
+++ pkgsrc/x11/gtk4/distinfo    Sat Aug 27 18:16:08 2022
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.7 2022/08/15 00:01:41 tnn Exp $
+$NetBSD: distinfo,v 1.8 2022/08/27 18:16:08 wiz Exp $
 
 BLAKE2s (gtk-4.6.6.tar.xz) = 520d6e0edc306ef03691c57e499f1a98ea094bbe30bfe3d731487e8833776758
 SHA512 (gtk-4.6.6.tar.xz) = b743d99029d7d51db19396641023eefd5d25bbacbd89ad6660d43e382b26fe6cc5e9ce8f0dbb3f4ac7d2143db617ea0c2e2d3cc8926fc93d735eb76ffb2f8309
 Size (gtk-4.6.6.tar.xz) = 23085304 bytes
 SHA1 (patch-demos_gtk-demo_gtkgears.c) = f09912bb4bef8589f694d4ed1a4744afe422ccbd
+SHA1 (patch-gtk_gtkfilechooserwidget.c) = 49230fa59d244c55bf2caf9dd44dc96e062c6964
 SHA1 (patch-meson.build) = 89b91ba48b35baafb35598d3dd82577de8fc424c
 SHA1 (patch-tests_gtkgears.c) = 2af0628eb8c8286c85cd5c64a9da561fa375e8b3

Added files:

Index: pkgsrc/x11/gtk4/patches/patch-gtk_gtkfilechooserwidget.c
diff -u /dev/null pkgsrc/x11/gtk4/patches/patch-gtk_gtkfilechooserwidget.c:1.1
--- /dev/null   Sat Aug 27 18:16:08 2022
+++ pkgsrc/x11/gtk4/patches/patch-gtk_gtkfilechooserwidget.c    Sat Aug 27 18:16:08 2022
@@ -0,0 +1,22 @@
+$NetBSD: patch-gtk_gtkfilechooserwidget.c,v 1.1 2022/08/27 18:16:08 wiz Exp $
+
+GtkFileChooserWidget: Propagate captured key events when the location entry is focused
+https://gitlab.gnome.org/GNOME/gtk/-/commit/2b131f09a8403c9ba3d7288901a3c918840df2c3
+
+--- gtk/gtkfilechooserwidget.c.orig    2022-07-02 18:38:25.000000000 +0000
++++ gtk/gtkfilechooserwidget.c
+@@ -7763,6 +7763,14 @@ captured_key (GtkEventControllerKey *con
+   if (keyval == GDK_KEY_slash)
+     return GDK_EVENT_PROPAGATE;
+ 
++  if (impl->location_entry)
++    {
++      GtkWidget *focus = gtk_root_get_focus (gtk_widget_get_root (GTK_WIDGET (impl)));
++
++      if (focus && gtk_widget_is_ancestor (focus, impl->location_entry))
++        return GDK_EVENT_PROPAGATE;
++    }
++
+   handled = gtk_event_controller_key_forward (controller, GTK_WIDGET (impl->search_entry));
+   if (handled == GDK_EVENT_STOP)
+     operation_mode_set (impl, OPERATION_MODE_SEARCH);