Accepting request 261071 from home:Zaitor:branches:GNOME:Factory

Stable update

OBS-URL: https://build.opensuse.org/request/show/261071
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=169

gtk+-3.14.4.tar.xz

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

gtk+-3.14.5.tar.xz

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

gtk3-fix-screen-changes-csd.patch

@@ -1,58 +0,0 @@
-From d7bff60140225dff76befacf6eb2136c6723b794 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Fri, 24 Oct 2014 13:30:19 -0400
-Subject: Fix a problem with screen changes and csd
-
-When a new screen is set on a window, we unrealize it, to
-recreate all the resources. But we don't reset the client_decorated
-flag, so realize() doesn't call create_decoration() - which makes
-sense, since the decoration already exists. But the side-effect
-of create_decoration() is to select the rgba visual, and visuals
-are per-screen.
-
-Fix this by looking for the rgba visual in set_screen(), and
-replacing it with the rgba visual for the new screen, if necessary.
-
-diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
-index 367d88c..e846c41 100644
---- a/gtk/gtkwindow.c
-+++ b/gtk/gtkwindow.c
-@@ -10272,6 +10272,7 @@ gtk_window_set_screen (GtkWindow *window,
-   GtkWindowPrivate *priv;
-   GtkWidget *widget;
-   GdkScreen *previous_screen;
-+  gboolean was_rgba;
-   gboolean was_mapped;
- 
-   g_return_if_fail (GTK_IS_WINDOW (window));
-@@ -10285,6 +10286,12 @@ gtk_window_set_screen (GtkWindow *window,
-   widget = GTK_WIDGET (window);
- 
-   previous_screen = priv->screen;
-+
-+  if (gdk_screen_get_rgba_visual (previous_screen) == gtk_widget_get_visual (widget))
-+    was_rgba = TRUE;
-+  else
-+    was_rgba = FALSE;
-+
-   was_mapped = gtk_widget_get_mapped (widget);
- 
-   if (was_mapped)
-@@ -10318,6 +10325,15 @@ gtk_window_set_screen (GtkWindow *window,
-     }
-   g_object_notify (G_OBJECT (window), "screen");
- 
-+  if (was_rgba)
-+    {
-+      GdkVisual *visual;
-+
-+      visual = gdk_screen_get_rgba_visual (screen);
-+      if (visual)
-+        gtk_widget_set_visual (widget, visual);
-+    }
-+
-   if (was_mapped)
-     gtk_widget_map (widget);
- 
--- 
-cgit v0.10.1

gtk3.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Nov 11 19:09:28 UTC 2014 - zaitor@opensuse.org
+
+- Update to version 3.14.5:
+  + Bugs fixed: bgo#726316, bgo#737561, bgo#737891, bgo#738321,
+    bgo#738648, bgo#738650, bgo#738886, bgo#738955, bgo#739005,
+    bgo#739111.
+  + Updated translations.
+- Drop gtk3-fix-screen-changes-csd.patch: Fixed upstream.
+
 -------------------------------------------------------------------
 Sun Nov 09 04:21:00 UTC 2014 - Led <ledest@gmail.com>
 

gtk3.spec

@@ -25,7 +25,7 @@
 
 Name:           gtk3
 %define _name gtk+
-Version:        3.14.4
+Version:        3.14.5
 Release:        0
 Summary:        The GTK+ toolkit library (version 3)
 License:        LGPL-2.1+
@@ -44,8 +44,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-fix-screen-changes-csd.patch bgo#739812 badshah400@gmail.com -- Fix a problem with screen changes and csd that caused some applications to launch with ugly black borders
-Patch5:         gtk3-fix-screen-changes-csd.patch
 BuildRequires:  cups-devel >= 1.2
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
@@ -334,7 +332,6 @@ cp -a %{S:1} .
 %if %{build_wayland_backend}
 %patch4 -p1
 %endif
-%patch5 -p1
 
 %build
 # Needed for patch1 and patch4