Accepting request 281036 from GNOME:Factory

1

OBS-URL: https://build.opensuse.org/request/show/281036
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk3?expand=0&rev=73

gtk+-3.14.6.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cfc424e6e10ffeb34a33762aeb77905c3ed938f0b4006ddb7e880aad234ef119
-size 15680832

gtk+-3.14.7.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb9914b04f218c1afb4820ea492f3c6ab6d6993cc6634ecade8303678d05a46e
+size 15664532

gtk3-Dont-crash-if-invisible-files-are-deleted.patch

@@ -1,53 +0,0 @@
-From 23eeb44beb72cc1027dc6ede3e0b7347b465a727 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Thu, 11 Dec 2014 22:52:59 -0500
-Subject: GtkFileChooser: Don't crash if invisible files are deleted
-
-This is a crash that has been around for a long time, as
-can be seen here:
-https://bugzilla.redhat.com/show_bug.cgi?id=1048388
-https://bugzilla.redhat.com/show_bug.cgi?id=984375
-https://bugzilla.redhat.com/show_bug.cgi?id=1159015
-https://bugzilla.redhat.com/show_bug.cgi?id=1059187
-https://bugzilla.redhat.com/show_bug.cgi?id=1122172
-https://bugzilla.redhat.com/show_bug.cgi?id=1016895
-https://bugzilla.redhat.com/show_bug.cgi?id=1133235
-https://bugzilla.redhat.com/show_bug.cgi?id=1077500
-https://bugzilla.redhat.com/show_bug.cgi?id=1054378
-https://bugzilla.redhat.com/show_bug.cgi?id=1173212
-
-Fix suggested by Benjamin Otte.
-
-diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c
-index 909359a..5a5fc7f 100644
---- a/gtk/gtkfilesystemmodel.c
-+++ b/gtk/gtkfilesystemmodel.c
-@@ -1886,6 +1886,7 @@ remove_file (GtkFileSystemModel *model,
- 	     GFile              *file)
- {
-   FileModelNode *node;
-+  gboolean was_visible;
-   guint id;
-   guint row;
- 
-@@ -1897,6 +1898,7 @@ remove_file (GtkFileSystemModel *model,
-     return;
- 
-   node = get_node (model, id);
-+  was_visible = node->visible;
-   row = node_get_tree_row (model, id);
- 
-   node_invalidate_index (model, id);
-@@ -1912,7 +1914,8 @@ remove_file (GtkFileSystemModel *model,
- 
-   /* We don't need to resort, as removing a row doesn't change the sorting order of the other rows */
- 
--  emit_row_deleted_for_row (model, row);
-+  if (was_visible)
-+    emit_row_deleted_for_row (model, row);
- }
- 
- /**
--- 
-cgit v0.10.1
-

gtk3.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sun Jan 11 17:37:30 UTC 2015 - zaitor@opensuse.org
+
+- Update to version 3.14.7:
+  + GtkFileChooser: Don't crash if invisible files are deleted.
+  + Bugs fixed: bgo#477454, bgo#705582, bgo#735122, bgo#739038,
+    bgo#739729, bgo#741130, bgo#741652, bgo#741702, bgo#741827,
+    bgo#741897, bgo#741969, bgo#742010, bgo#742170, bgo#742311,
+    bgo#742343, bgo#742631, bgo#742653, bgo#742664.
+  + Updated translations.
+- Drop gtk3-Dont-crash-if-invisible-files-are-deleted.patch: Fixed
+  upstream.
+
 -------------------------------------------------------------------
 Fri Dec 12 20:04:34 UTC 2014 - zaitor@opensuse.org
 

gtk3.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gtk3
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Dominique Leuenebrger, Amsterdam, Netherlands
 #
 # All modifications and additions to the file contributed by third parties
@@ -29,7 +29,7 @@
 
 Name:           gtk3
 %define _name gtk+
-Version:        3.14.6
+Version:        3.14.7
 Release:        0
 Summary:        The GTK+ toolkit library (version 3)
 License:        LGPL-2.1+
@@ -48,8 +48,6 @@ Patch1:         gtk3-path-local.patch
 Patch3:         gtk3-bnc130159-bgo319483-async-font-selection.patch
 # PATCH-FIX-UPSTREAM gtk3-find-wayland-includedir.patch bgo#696507 zaitor@opensuse.org -- Make configure find wayland include files.
 Patch4:         gtk3-find-wayland-includedir.patch
-# PATCH-FIX-UPSTREAM gtk3-Dont-crash-if-invisible-files-are-deleted.patch zaitor@opensuse.org -- GtkFileChooser: Don't crash if invisible files are deleted
-Patch5:         gtk3-Dont-crash-if-invisible-files-are-deleted.patch
 BuildRequires:  cups-devel >= 1.2
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
@@ -338,7 +336,6 @@ cp -a %{S:1} .
 %if %{build_wayland_backend}
 %patch4 -p1
 %endif
-%patch5 -p1
 
 %build
 # Needed for patch1 and patch4