Date: Wednesday, February 24, 2016 @ 19:12:28 Author: heftig Revision: 260226
3.18.8 Modified: gtk3/trunk/PKGBUILD Deleted: gtk3/trunk/0001-file-chooser-Avoid-a-crash.patch gtk3/trunk/0001-file-chooser-Use-the-right-model-when-getting-the-se.patch -----------------------------------------------------------------+ 0001-file-chooser-Avoid-a-crash.patch | 46 ---------- 0001-file-chooser-Use-the-right-model-when-getting-the-se.patch | 42 --------- PKGBUILD | 16 --- 3 files changed, 3 insertions(+), 101 deletions(-) Deleted: 0001-file-chooser-Avoid-a-crash.patch =================================================================== --- 0001-file-chooser-Avoid-a-crash.patch 2016-02-24 17:19:05 UTC (rev 260225) +++ 0001-file-chooser-Avoid-a-crash.patch 2016-02-24 18:12:28 UTC (rev 260226) @@ -1,46 +0,0 @@ -From f793da54a992d87da42c1f98e3cd5e9556c670ab Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mcla...@redhat.com> -Date: Sat, 30 Jan 2016 23:07:56 -0500 -Subject: [PATCH] file chooser: Avoid a crash - -Since 39c2d12330b6d4405ca8a5599c12017c58626fcf, -priv->operation_mode == OPERATION_MODE_BROWSE no longer -guarantees that priv->browse_files_model is the current -model of the list - we are only switching the models after -loading the new directory. Avoid triggering the assertion -in show_and_select_files by checking if we have right model -before calling it. - -https://bugzilla.gnome.org/show_bug.cgi?id=761209 ---- - gtk/gtkfilechooserwidget.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c -index 127e18b..d1a2ed8 100644 ---- a/gtk/gtkfilechooserwidget.c -+++ b/gtk/gtkfilechooserwidget.c -@@ -5630,15 +5630,19 @@ gtk_file_chooser_widget_select_file (GtkFileChooser *chooser, - GtkFileChooserWidgetPrivate *priv = impl->priv; - GFile *parent_file; - gboolean same_path; -+ GtkFileSystemModel *fsmodel; - - parent_file = g_file_get_parent (file); - - if (!parent_file) - return gtk_file_chooser_set_current_folder_file (chooser, file, error); - -+ fsmodel = GTK_FILE_SYSTEM_MODEL (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->browse_files_tree_view))); -+ - if (priv->operation_mode == OPERATION_MODE_SEARCH || - priv->operation_mode == OPERATION_MODE_RECENT || -- priv->load_state == LOAD_EMPTY) -+ priv->load_state == LOAD_EMPTY || -+ priv->browse_files_model != fsmodel) - { - same_path = FALSE; - } --- -2.7.1 - Deleted: 0001-file-chooser-Use-the-right-model-when-getting-the-se.patch =================================================================== --- 0001-file-chooser-Use-the-right-model-when-getting-the-se.patch 2016-02-24 17:19:05 UTC (rev 260225) +++ 0001-file-chooser-Use-the-right-model-when-getting-the-se.patch 2016-02-24 18:12:28 UTC (rev 260226) @@ -1,42 +0,0 @@ -From 811a9b21c1bb226236d2a880f9cbbcbcf6028c2e Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mcla...@redhat.com> -Date: Fri, 12 Feb 2016 20:35:26 -0500 -Subject: [PATCH] file chooser: Use the right model when getting the selection - -We don't need to make assumptions about which model is currently -used since gtk_tree_selection_get_selection hands us the model. - -https://bugzilla.gnome.org/show_bug.cgi?id=761757 ---- - gtk/gtkfilechooserwidget.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c -index c77a8b7..6ef25b6 100644 ---- a/gtk/gtkfilechooserwidget.c -+++ b/gtk/gtkfilechooserwidget.c -@@ -6266,10 +6266,11 @@ get_selected_file_info_from_file_list (GtkFileChooserWidget *impl, - GtkTreeSelection *selection; - GtkTreeIter iter; - GFileInfo *info; -+ GtkTreeModel *model; - - g_assert (!priv->select_multiple); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->browse_files_tree_view)); -- if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) -+ if (!gtk_tree_selection_get_selected (selection, &model, &iter)) - { - *had_selection = FALSE; - return NULL; -@@ -6277,7 +6278,7 @@ get_selected_file_info_from_file_list (GtkFileChooserWidget *impl, - - *had_selection = TRUE; - -- info = _gtk_file_system_model_get_info (priv->browse_files_model, &iter); -+ info = _gtk_file_system_model_get_info (GTK_FILE_SYSTEM_MODEL (model), &iter); - return info; - } - --- -2.7.1 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-02-24 17:19:05 UTC (rev 260225) +++ PKGBUILD 2016-02-24 18:12:28 UTC (rev 260226) @@ -4,8 +4,8 @@ pkgbase=gtk3 pkgname=(gtk3 gtk-update-icon-cache) -pkgver=3.18.7 -pkgrel=2 +pkgver=3.18.8 +pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit" arch=(i686 x86_64) url="http://www.gtk.org/" @@ -15,23 +15,13 @@ makedepends=(gobject-introspection libcanberra gtk-doc) license=(LGPL) source=(https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz - 0001-file-chooser-Avoid-a-crash.patch - 0001-file-chooser-Use-the-right-model-when-getting-the-se.patch settings.ini) -sha256sums=('a76e1cb0ac45ce5c2734f6778f2731a5c6a23d1ff6bd4db357774f014ee68820' - '36058e522839bcae775cbafef8d4ad21cba98265b5cf9e90d5b46b874ddbf79f' - '22c0272fdbb048ec8fe62d71bcb1ab6765050de3eb04e833ba7303750782d0a7' +sha256sums=('1c53ef1bb55364698f7183ecd185b547f92f4a3a7abfafd531400232e2e052f8' '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202') prepare() { cd gtk+-$pkgver NOCONFIGURE=1 ./autogen.sh - - # https://bugzilla.gnome.org/show_bug.cgi?id=761209 - patch -Np1 -i ../0001-file-chooser-Avoid-a-crash.patch - - # https://bugzilla.gnome.org/show_bug.cgi?id=761757 - patch -Np1 -i ../0001-file-chooser-Use-the-right-model-when-getting-the-se.patch } build() {