Accepting request 265374 from GNOME:Factory

1

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

gtk+-3.14.5.tar.xz

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

gtk+-3.14.6.tar.xz

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

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

@@ -0,0 +1,53 @@
+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,24 @@
+-------------------------------------------------------------------
+Fri Dec 12 20:04:34 UTC 2014 - zaitor@opensuse.org
+
+- Update to version 3.14.6:
+  + Redraw problems with cairo 1.14.
+  + Avoid excessive redraws due to CSD shadows.
+  + Bugs fixed: bgo#364566, bgo#461249, bgo#721939, bgo#722781,
+    bgo#730232, bgo#739453, bgo#739885, bgo#739977, bgo#740287,
+    bgo#740374, bgo#740612, bgo#740613, bgo#740642, bgo#740742,
+    bgo#740770, bgo#740896, bgo#741249, bgo#741250, bgo#741251,
+    bgo#741252, bgo#741254, bgo#741314.
+  + Updated translations.
+- Add gtk3-Dont-crash-if-invisible-files-are-deleted.patch: Do not
+  crash application using gtk file chooser when deleting file via
+  an other app (patch from upstream git).
+
+-------------------------------------------------------------------
+Fri Dec 12 15:07:40 UTC 2014 - fcrozat@suse.com
+
+- Disable wayland on SLE12.
+
 -------------------------------------------------------------------
 Tue Nov 11 19:09:28 UTC 2014 - zaitor@opensuse.org
 

gtk3.spec

@@ -18,14 +18,18 @@
 
 
 %define build_broadway_backend 1
+%if 0%{?suse_version} == 1315
+%define build_wayland_backend 0
+%else
 %define build_wayland_backend 1
+%endif
 
 # When updating the binary version, do not forget to also update baselibs.conf
 %define gtk_binary_version 3.0.0
 
 Name:           gtk3
 %define _name gtk+
-Version:        3.14.5
+Version:        3.14.6
 Release:        0
 Summary:        The GTK+ toolkit library (version 3)
 License:        LGPL-2.1+
@@ -44,6 +48,8 @@ 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
@@ -332,6 +338,7 @@ cp -a %{S:1} .
 %if %{build_wayland_backend}
 %patch4 -p1
 %endif
+%patch5 -p1
 
 %build
 # Needed for patch1 and patch4