diff options
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 10 | ||||
-rw-r--r-- | typeahead.patch | 27 |
3 files changed, 27 insertions, 20 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sat Aug 12 19:54:35 UTC 2017 +# Sun Sep 10 07:06:15 UTC 2017 pkgbase = gtk3-typeahead pkgdesc = GTK+ 3 with typeahead feature enabled for the file chooser widget - pkgver = 3.22.18 + pkgver = 3.22.19 pkgrel = 1 url = http://www.gtk.org/ install = gtk3.install @@ -44,16 +44,16 @@ pkgbase = gtk3-typeahead depends = gtk-update-icon-cache optdepends = libcanberra: gtk3-widget-factory demo optdepends = gtk3-print-backends: Printing - provides = gtk3=3.22.18 + provides = gtk3=3.22.19 conflicts = gtk3 - source = git://git.gnome.org/gtk+#commit=e1cf6281fe800c070d599aef0681ef4f776e1775 + source = git://git.gnome.org/gtk+#commit=efbf6f183ecd24cddea743a02fe8ce545f1b55f8 source = settings.ini source = gtk-query-immodules-3.0.hook source = typeahead.patch sha256sums = SKIP sha256sums = 01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202 sha256sums = de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845 - sha256sums = 405fd37cc8929b9f9dfd78cb4f9e7cdd1b02ecfde7ef82e3ad28173defccb8d5 + sha256sums = c43995d57b1ac1b280cc04084fdb77be8f477483c7cbada646f12d3364768865 pkgname = gtk3-typeahead install = gtk3.install @@ -1,7 +1,7 @@ # Maintainer: twilinx <twilinx@mesecons.net> pkgname=gtk3-typeahead -pkgver=3.22.18 +pkgver=3.22.19 pkgrel=1 conflicts=(gtk3) provides=("gtk3=$pkgver") @@ -18,7 +18,7 @@ optdepends=('libcanberra: gtk3-widget-factory demo' makedepends=(gobject-introspection libcanberra gtk-doc git colord rest libcups glib2-docs sassc) license=(LGPL) -_commit=e1cf6281fe800c070d599aef0681ef4f776e1775 # tags/3.22.18^0 +_commit=efbf6f183ecd24cddea743a02fe8ce545f1b55f8 # tags/3.22.19^0 source=("git://git.gnome.org/gtk+#commit=$_commit" settings.ini gtk-query-immodules-3.0.hook @@ -26,11 +26,15 @@ source=("git://git.gnome.org/gtk+#commit=$_commit" sha256sums=('SKIP' '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202' 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845' - '405fd37cc8929b9f9dfd78cb4f9e7cdd1b02ecfde7ef82e3ad28173defccb8d5') + 'c43995d57b1ac1b280cc04084fdb77be8f477483c7cbada646f12d3364768865') prepare() { cd gtk+ + # menu: Avoid cancelling the menu on GTK+ grabs inside the GtkMenu + # https://bugzilla.gnome.org/show_bug.cgi?id=786029 + git cherry-pick -n 26d8a6dfbac5180dce71d1f2edc7029cfa2773ef + # Typeahead-specific changes patch gtk/gtkfilechooserwidget.c -i $srcdir/typeahead.patch diff --git a/typeahead.patch b/typeahead.patch index 97befb22f85f..13d8baec1105 100644 --- a/typeahead.patch +++ b/typeahead.patch @@ -1,14 +1,17 @@ -@@ -1391,6 +1391,9 @@ - { +@@ -1380,6 +1380,12 @@ GtkFileChooserWidget *impl = (GtkFileChooserWidget *) widget; GtkFileChooserWidgetPrivate *priv = impl->priv; -+ gtk_widget_grab_focus (priv->browse_files_tree_view); -+ gboolean ret; -+ g_signal_emit_by_name (priv->browse_files_tree_view, "key-press-event", event, &ret); ++ if (!event->is_modifier) { ++ gtk_widget_grab_focus (priv->browse_files_tree_view); ++ gboolean ret; ++ g_signal_emit_by_name (priv->browse_files_tree_view, "key-press-event", event, &ret); ++ } ++ if (should_trigger_location_entry (impl, event)) { -@@ -1401,12 +1404,6 @@ + if (priv->action == GTK_FILE_CHOOSER_ACTION_OPEN || +@@ -1389,12 +1395,6 @@ return TRUE; } } @@ -21,7 +24,7 @@ if (GTK_WIDGET_CLASS (gtk_file_chooser_widget_parent_class)->key_press_event (widget, event)) return TRUE; -@@ -2478,7 +2475,7 @@ +@@ -2461,7 +2461,7 @@ { GtkFileChooserWidgetPrivate *priv = impl->priv; @@ -30,7 +33,7 @@ gtk_tree_view_column_set_sort_column_id (priv->list_name_column, MODEL_COL_NAME); gtk_tree_view_column_set_sort_column_id (priv->list_time_column, MODEL_COL_TIME); -@@ -4392,6 +4389,7 @@ +@@ -4357,6 +4357,7 @@ gtk_tree_view_set_model (GTK_TREE_VIEW (priv->browse_files_tree_view), GTK_TREE_MODEL (priv->browse_files_model)); update_columns (impl, FALSE, _("Modified")); @@ -38,7 +41,7 @@ file_list_set_sort_column_ids (impl); set_sort_column (impl); profile_msg (" gtk_tree_view_set_model end", NULL); -@@ -7152,10 +7150,6 @@ +@@ -7102,10 +7103,6 @@ { GList *l, *files, *files_with_info, *infos; GFile *file; @@ -49,7 +52,7 @@ files = NULL; files_with_info = NULL; -@@ -7183,8 +7177,6 @@ +@@ -7133,8 +7130,6 @@ g_list_free_full (infos, g_object_unref); gtk_stack_set_visible_child_name (GTK_STACK (impl->priv->browse_files_stack), "list"); @@ -58,7 +61,7 @@ } /* Callback used from GtkSearchEngine when the query is done running */ -@@ -7481,6 +7473,7 @@ +@@ -7431,6 +7426,7 @@ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (priv->recent_model), GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_DESCENDING); @@ -66,7 +69,7 @@ } typedef struct -@@ -7498,7 +7491,7 @@ +@@ -7448,7 +7444,7 @@ gtk_tree_view_set_model (GTK_TREE_VIEW (priv->browse_files_tree_view), GTK_TREE_MODEL (priv->recent_model)); |