diff --git a/.gitignore b/.gitignore index b6d4fe7..cf9ba35 100644 --- a/.gitignore +++ b/.gitignore @@ -115,3 +115,4 @@ mutter-2.31.5.tar.bz2 /mutter-3.21.91.tar.xz /mutter-3.21.92.tar.xz /mutter-3.22.0.tar.xz +/mutter-3.22.1.tar.xz diff --git a/0001-wayland-pointer-Unset-pointer-focus-when-disabled.patch b/0001-wayland-pointer-Unset-pointer-focus-when-disabled.patch deleted file mode 100644 index 832c089..0000000 --- a/0001-wayland-pointer-Unset-pointer-focus-when-disabled.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ce6d952fa15aea5dae34204582fbf1472f01330b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonas=20=C3=85dahl?= -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 46b5af1..c5ba55b 100644 --- a/mutter.spec +++ b/mutter.spec @@ -4,8 +4,8 @@ %global libinput_version 1.4 Name: mutter -Version: 3.22.0 -Release: 2%{?dist} +Version: 3.22.1 +Release: 1%{?dist} Summary: Window and compositing manager based on Clutter License: GPLv2+ @@ -13,8 +13,6 @@ 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 @@ -105,7 +103,6 @@ the functionality of the installed %{name} package. %prep %setup -q -%patch1 -p1 -b .unset-pointer-focus-when-disabled %build autoreconf -f -i @@ -180,6 +177,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/mutter/tests %changelog +* Tue Oct 11 2016 Florian Müllner - 3.22.1-1 +- Update to 3.22.1 + * Wed Sep 28 2016 Florian Müllner - 3.22.0-2 - Include fix for crash on VT switch diff --git a/sources b/sources index 97e678f..8736df6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e448039015b355e7e2b9f86087e2f399 mutter-3.22.0.tar.xz +fb17f4d451a40ebfa962af92f1aaf5d2 mutter-3.22.1.tar.xz