summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2022-08-27 18:16:08 +0000
committerwiz <wiz@pkgsrc.org>2022-08-27 18:16:08 +0000
commite1cc55445f93fd62a3b508fe830bdc60709161ac (patch)
treedafc55e996d95869e11ae5943adf7d69c07aa16d /x11
parent2f197756d5081bb71bde6aa7331805fb8a881f57 (diff)
downloadpkgsrc-e1cc55445f93fd62a3b508fe830bdc60709161ac.tar.gz
gtk4: add upstream bug fix for 'save' dialogs
Bump PKGREVISION.
Diffstat (limited to 'x11')
-rw-r--r--x11/gtk4/Makefile4
-rw-r--r--x11/gtk4/distinfo3
-rw-r--r--x11/gtk4/patches/patch-gtk_gtkfilechooserwidget.c22
3 files changed, 26 insertions, 3 deletions
diff --git a/x11/gtk4/Makefile b/x11/gtk4/Makefile
index 8c753b3bdcb..04654747474 100644
--- a/x11/gtk4/Makefile
+++ b/x11/gtk4/Makefile
@@ -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
diff --git a/x11/gtk4/distinfo b/x11/gtk4/distinfo
index be9dbe86159..deb3a057f0f 100644
--- a/x11/gtk4/distinfo
+++ b/x11/gtk4/distinfo
@@ -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
diff --git a/x11/gtk4/patches/patch-gtk_gtkfilechooserwidget.c b/x11/gtk4/patches/patch-gtk_gtkfilechooserwidget.c
new file mode 100644
index 00000000000..61510530756
--- /dev/null
+++ b/x11/gtk4/patches/patch-gtk_gtkfilechooserwidget.c
@@ -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);