Update to 3.22.10

4 files changed, 7 insertions, 45 deletions

diff --git a/.gitignore b/.gitignore
index 18d332f..380f913 100644
--- a/.gitignore
+++ b/.gitignore
@@ -152,3 +152,4 @@ gtk+-2.90.5.tar.bz2
 /gtk+-3.22.7.tar.xz
 /gtk+-3.22.8.tar.xz
 /gtk+-3.22.9.tar.xz
+/gtk+-3.22.10.tar.xz
diff --git a/0001-wayland-make-sure-to-clear-up-the-number-of-keys.patch b/0001-wayland-make-sure-to-clear-up-the-number-of-keys.patch
deleted file mode 100644
index d7996bd..0000000
--- a/0001-wayland-make-sure-to-clear-up-the-number-of-keys.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From aebe3a74ec9c2da5fe6eb0826274d4b971068b8f Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Tue, 28 Feb 2017 18:17:39 +0100
-Subject: [PATCH] wayland: make sure to clear up the number of keys
-
-Make sure to clear up the number of keys being pressed on enter/leave so
-that we don't end up with leftovers if a new window is mapped by a
-keyboard shortcut.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=779374
----
- gdk/wayland/gdkdevice-wayland.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
-index 815fa9a..947ef44 100644
---- a/gdk/wayland/gdkdevice-wayland.c
-+++ b/gdk/wayland/gdkdevice-wayland.c
-@@ -1869,6 +1869,7 @@ keyboard_handle_enter (void               *data,
- 
-   seat->keyboard_focus = wl_surface_get_user_data (surface);
-   g_object_ref (seat->keyboard_focus);
-+  seat->nkeys = 0;
- 
-   event = gdk_event_new (GDK_FOCUS_CHANGE);
-   event->focus_change.window = g_object_ref (seat->keyboard_focus);
-@@ -1925,6 +1926,7 @@ keyboard_handle_leave (void               *data,
- 
-   g_object_unref (seat->keyboard_focus);
-   seat->keyboard_focus = NULL;
-+  seat->nkeys = 0;
- 
-   GDK_NOTE (EVENTS,
-             g_message ("focus out, seat %p surface %p",
--- 
-1.8.3.1
-
diff --git a/gtk3.spec b/gtk3.spec
index a2ca3ec..6d62147 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -18,18 +18,14 @@
 %global _changelog_trimtime %(date +%s -d "1 year ago")
 
 Name: gtk3
-Version: 3.22.9
-Release: 2%{?dist}
+Version: 3.22.10
+Release: 1%{?dist}
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 
 License: LGPLv2+
 URL: http://www.gtk.org
 Source0: http://download.gnome.org/sources/gtk+/3.22/gtk+-%{version}.tar.xz
 
-# Backported from upstream
-# https://bugzilla.redhat.com/show_bug.cgi?id=1428280
-Patch0: 0001-wayland-make-sure-to-clear-up-the-number-of-keys.patch
-
 BuildRequires: pkgconfig(atk) >= %{atk_version}
 BuildRequires: pkgconfig(atk-bridge-2.0)
 BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
@@ -167,7 +163,6 @@ the functionality of the installed %{name} package.
 
 %prep
 %setup -q -n gtk+-%{version}
-%patch0 -p1
 
 %build
 export CFLAGS='-fno-strict-aliasing %optflags'
@@ -341,6 +336,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 %{_datadir}/installed-tests
 
 %changelog
+* Tue Mar 14 2017 Kalev Lember <klember@redhat.com> - 3.22.10-1
+- Update to 3.22.10
+
 * Thu Mar 02 2017 Kalev Lember <klember@redhat.com> - 3.22.9-2
 - Backport a patch to fix spurious key repeat in gnome-terminal (#1428280)
 
diff --git a/sources b/sources
index 72f37e8..3852bec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gtk+-3.22.9.tar.xz) = cfed67a6263172cdef5a8d5f1548017f2e241667779d810ed84aa14ecdd18b917b213b3e71ac97f8d7099ba97a6829b45322ab15c8540ff406247d1519a08550
+SHA512 (gtk+-3.22.10.tar.xz) = f3b378c14da9978a382b8e52e4e710c4ae946e472c117bbc0b9775465e6cc45d7209d5dcdaf2ddd602accba148ca3f4347f2cbfb8160b0f73814391154e690e2