Accepting request 531576 from GNOME:Factory

(forwarded request 531421 from Zaitor)

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

gtk+-3.22.21.tar.xz

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

gtk+-3.22.24.tar.xz

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

gtk3-silence-log-spew-blank-cursors.patch

@@ -0,0 +1,54 @@
+From 56714ffa0d61512bc249b481fc43e0bc118f47d7 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Wed, 12 Apr 2017 13:56:49 -0400
+Subject: [PATCH] wayland: Don't spew warnings for blank cursors
+
+We were unnecessarily spewing warnings when blank cursors
+were getting a new scale set. Standardize on "none" as the
+name for blank cursors, and avoid the warning.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=775217
+---
+ gdk/wayland/gdkcursor-wayland.c | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/gdk/wayland/gdkcursor-wayland.c b/gdk/wayland/gdkcursor-wayland.c
+index ab50755873..bffeff8884 100644
+--- a/gdk/wayland/gdkcursor-wayland.c
++++ b/gdk/wayland/gdkcursor-wayland.c
+@@ -308,6 +308,10 @@ _gdk_wayland_cursor_set_scale (GdkCursor *cursor,
+ 
+   wayland_cursor->scale = scale;
+ 
++  /* Blank cursor case */
++  if (g_str_equal (wayland_cursor->name, "none"))
++    return;
++
+   _gdk_wayland_cursor_update (display_wayland, wayland_cursor);
+ }
+ 
+@@ -345,12 +349,18 @@ _gdk_wayland_display_get_cursor_for_name_with_scale (GdkDisplay  *display,
+                           "cursor-type", GDK_CURSOR_IS_PIXMAP,
+                           "display", display,
+                           NULL);
+-  private->name = g_strdup (name);
+-  private->scale = scale;
+ 
+   /* Blank cursor case */
+   if (!name || g_str_equal (name, "none") || g_str_equal (name, "blank_cursor"))
+-    return GDK_CURSOR (private);
++    {
++      private->name = g_strdup ("none");
++      private->scale = scale;
++
++      return GDK_CURSOR (private);
++    }
++
++  private->name = g_strdup (name);
++  private->scale = scale;
+ 
+   if (!_gdk_wayland_cursor_update (display_wayland, private))
+     {
+-- 
+2.12.2
+

gtk3.changes

@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Wed Oct  4 17:25:48 UTC 2017 - zaitor@opensuse.org
+
+- Update to version 3.22.24:
+  + Combobox: Don't try to remove grabs on NULL devices.
+  + Fix some issues with the new resizable tiling.
+
+-------------------------------------------------------------------
+Wed Oct  4 12:15:48 UTC 2017 - zaitor@opensuse.org
+
+- Update to version 3.22.23:
+  + Bugs fixed: bgo#783669, bgo#784562.
+
+-------------------------------------------------------------------
+Tue Oct  3 18:23:04 UTC 2017 - zaitor@opensuse.org
+
+- Update to version 3.22.22:
+  + Bugs fixed: bgo#639931, bgo#644248, bgo#775126, bgo#780758,
+    bgo#781757, bgo#787021, bgo#787302, bgo#787303, bgo#787444,
+    bgo#787531, bgo#787600, bgo#787757.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Fri Sep 15 23:34:32 UTC 2017 - zaitor@opensuse.org
+
+- Add gtk3-silence-log-spew-blank-cursors.patch wayland: Don't spew
+  warnings for blank cursors. Patch from upstream bug (bgo#775217).
+
 -------------------------------------------------------------------
 Mon Sep 11 16:44:02 UTC 2017 - zaitor@opensuse.org
 

gtk3.spec

@@ -29,13 +29,13 @@
 
 Name:           gtk3
 %define _name gtk+
-Version:        3.22.21
+Version:        3.22.24
 Release:        0
 Summary:        The GTK+ toolkit library (version 3)
 License:        LGPL-2.1+
 Group:          System/Libraries
 Url:            http://www.gtk.org/
-Source:         https://download.gnome.org/sources/gtk+/3.22/%{_name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gtk+/3.22/%{_name}-%{version}.tar.xz
 Source1:        README.SUSE
 Source2:        settings.ini
 Source3:        macros.gtk3
@@ -44,6 +44,8 @@ Source99:       baselibs.conf
 Patch0:         gtk3-GTK_PATH64.patch
 # PATCH-NEEDS-REBASE gtk3-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474 -- Was PATCH-FIX-OPENSUSE
 Patch1:         gtk3-path-local.patch
+# PATCH-FIX-UPSTREAM gtk3-silence-log-spew-blank-cursors.patch bgo#775217 zaitor@opensuse.org -- wayland: Don't spew warnings for blank cursors
+Patch2:         gtk3-silence-log-spew-blank-cursors.patch
 BuildRequires:  cups-devel >= 1.2
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
@@ -363,6 +365,7 @@ cp -a %{S:1} .
 %endif
 # Patch disabled, needs rebase.
 #patch1 -p0
+%patch2 -p1
 
 %build
 # Disabled since patch 1 is in need of rebase