diff options
author | Jeija | 2017-10-11 08:01:29 +0200 |
---|---|---|
committer | Jeija | 2017-10-11 08:01:29 +0200 |
commit | d6714caf639682f64e1a0409fe025b199cb919f9 (patch) | |
tree | c5e2c238f704ac251cc4e235b7ae314c3b680246 | |
parent | c1b6f1b916cec3dfc35496be9ecfcbacd14b289f (diff) | |
download | aur-d6714caf639682f64e1a0409fe025b199cb919f9.tar.gz |
Update to GTK+ 3.22.24
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 10 | ||||
-rw-r--r-- | typeahead.patch | 16 |
3 files changed, 16 insertions, 20 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sun Sep 10 07:06:15 UTC 2017 +# Wed Oct 11 05:59:52 UTC 2017 pkgbase = gtk3-typeahead pkgdesc = GTK+ 3 with typeahead feature enabled for the file chooser widget - pkgver = 3.22.19 + pkgver = 3.22.24 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.19 + provides = gtk3=3.22.24 conflicts = gtk3 - source = git://git.gnome.org/gtk+#commit=efbf6f183ecd24cddea743a02fe8ce545f1b55f8 + source = git://git.gnome.org/gtk+#commit=e72d54c8a7bdf5f41feccbcc0b78522a8b50d79e source = settings.ini source = gtk-query-immodules-3.0.hook source = typeahead.patch sha256sums = SKIP sha256sums = 01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202 sha256sums = de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845 - sha256sums = c43995d57b1ac1b280cc04084fdb77be8f477483c7cbada646f12d3364768865 + sha256sums = 5006fa1dcea9aa74766196ec5c18e5172d7287195c2a49ffcd0adc13bc6e62c1 pkgname = gtk3-typeahead install = gtk3.install @@ -1,7 +1,7 @@ # Maintainer: twilinx <twilinx@mesecons.net> pkgname=gtk3-typeahead -pkgver=3.22.19 +pkgver=3.22.24 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=efbf6f183ecd24cddea743a02fe8ce545f1b55f8 # tags/3.22.19^0 +_commit=e72d54c8a7bdf5f41feccbcc0b78522a8b50d79e # tags/3.22.24^0 source=("git://git.gnome.org/gtk+#commit=$_commit" settings.ini gtk-query-immodules-3.0.hook @@ -26,15 +26,11 @@ source=("git://git.gnome.org/gtk+#commit=$_commit" sha256sums=('SKIP' '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202' 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845' - 'c43995d57b1ac1b280cc04084fdb77be8f477483c7cbada646f12d3364768865') + '5006fa1dcea9aa74766196ec5c18e5172d7287195c2a49ffcd0adc13bc6e62c1') 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 13d8baec1105..1b3961888780 100644 --- a/typeahead.patch +++ b/typeahead.patch @@ -1,4 +1,4 @@ -@@ -1380,6 +1380,12 @@ +@@ -1391,6 +1391,12 @@ GtkFileChooserWidget *impl = (GtkFileChooserWidget *) widget; GtkFileChooserWidgetPrivate *priv = impl->priv; @@ -11,7 +11,7 @@ if (should_trigger_location_entry (impl, event)) { if (priv->action == GTK_FILE_CHOOSER_ACTION_OPEN || -@@ -1389,12 +1395,6 @@ +@@ -1400,12 +1406,6 @@ return TRUE; } } @@ -24,7 +24,7 @@ if (GTK_WIDGET_CLASS (gtk_file_chooser_widget_parent_class)->key_press_event (widget, event)) return TRUE; -@@ -2461,7 +2461,7 @@ +@@ -2477,7 +2477,7 @@ { GtkFileChooserWidgetPrivate *priv = impl->priv; @@ -33,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); -@@ -4357,6 +4357,7 @@ +@@ -4391,6 +4391,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")); @@ -41,7 +41,7 @@ file_list_set_sort_column_ids (impl); set_sort_column (impl); profile_msg (" gtk_tree_view_set_model end", NULL); -@@ -7102,10 +7103,6 @@ +@@ -7151,10 +7152,6 @@ { GList *l, *files, *files_with_info, *infos; GFile *file; @@ -52,7 +52,7 @@ files = NULL; files_with_info = NULL; -@@ -7133,8 +7130,6 @@ +@@ -7182,8 +7179,6 @@ g_list_free_full (infos, g_object_unref); gtk_stack_set_visible_child_name (GTK_STACK (impl->priv->browse_files_stack), "list"); @@ -61,7 +61,7 @@ } /* Callback used from GtkSearchEngine when the query is done running */ -@@ -7431,6 +7426,7 @@ +@@ -7480,6 +7475,7 @@ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (priv->recent_model), GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_DESCENDING); @@ -69,7 +69,7 @@ } typedef struct -@@ -7448,7 +7444,7 @@ +@@ -7497,7 +7493,7 @@ gtk_tree_view_set_model (GTK_TREE_VIEW (priv->browse_files_tree_view), GTK_TREE_MODEL (priv->recent_model)); |