From 63442ba593a6750dcb63bb2b46d8d65b2b027787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 28 Sep 2016 18:56:53 +0200
Subject: [PATCH] Include fix for crash on VT switch

---
 ...er-Unset-pointer-focus-when-disabled.patch | 30 +++++++++++++++++++
 mutter.spec                                   |  8 ++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 0001-wayland-pointer-Unset-pointer-focus-when-disabled.patch

diff --git a/0001-wayland-pointer-Unset-pointer-focus-when-disabled.patch b/0001-wayland-pointer-Unset-pointer-focus-when-disabled.patch
new file mode 100644
index 0000000..832c089
--- /dev/null
+++ b/0001-wayland-pointer-Unset-pointer-focus-when-disabled.patch
@@ -0,0 +1,30 @@
+From ce6d952fa15aea5dae34204582fbf1472f01330b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
+Date: Wed, 21 Sep 2016 13:42:59 +0800
+Subject: [PATCH] wayland/pointer: Unset pointer focus when disabled
+
+Previously the focus was reset implicitly by a memset() on the whole
+MetaWaylandPointer struct. When MetaWaylandPointer was turned into a
+GObject, this was not possible any more, and the focus was not updated
+properly.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=771646
+---
+ src/wayland/meta-wayland-pointer.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c
+index 107b77c..05a8684 100644
+--- a/src/wayland/meta-wayland-pointer.c
++++ b/src/wayland/meta-wayland-pointer.c
+@@ -494,6 +494,7 @@ meta_wayland_pointer_disable (MetaWaylandPointer *pointer)
+     }
+ 
+   meta_wayland_pointer_end_grab (pointer);
++  meta_wayland_pointer_set_focus (pointer, NULL);
+ 
+   g_clear_pointer (&pointer->pointer_clients, g_hash_table_unref);
+   pointer->cursor_surface = NULL;
+-- 
+2.9.3
+
diff --git a/mutter.spec b/mutter.spec
index d74fcc7..46b5af1 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -5,7 +5,7 @@
 
 Name:          mutter
 Version:       3.22.0
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Window and compositing manager based on Clutter
 
 License:       GPLv2+
@@ -13,6 +13,8 @@ License:       GPLv2+
 URL:           http://www.gnome.org
 Source0:       http://download.gnome.org/sources/%{name}/3.22/%{name}-%{version}.tar.xz
 
+Patch1:        0001-wayland-pointer-Unset-pointer-focus-when-disabled.patch
+
 BuildRequires: chrpath
 BuildRequires: pango-devel
 BuildRequires: startup-notification-devel
@@ -103,6 +105,7 @@ the functionality of the installed %{name} package.
 
 %prep
 %setup -q
+%patch1 -p1 -b .unset-pointer-focus-when-disabled
 
 %build
 autoreconf -f -i
@@ -177,6 +180,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/mutter/tests
 
 %changelog
+* Wed Sep 28 2016 Florian Müllner <fmuellner@redhat.com> - 3.22.0-2
+- Include fix for crash on VT switch
+
 * Mon Sep 19 2016 Florian Müllner <fmuellner@redhat.com> - 3.22.0-1
 - Update to 3.22.0