From b4253e85d1eb7c1bdfe8167d72fab09b0743d38e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 28 2022 07:54:08 +0000
Subject: import mutter-3.28.3-31.el7_9


---

diff --git a/SOURCES/0001-events-Pass-CurrentTime-to-XIAllowEvents-when-unfree.patch b/SOURCES/0001-events-Pass-CurrentTime-to-XIAllowEvents-when-unfree.patch
new file mode 100644
index 0000000..24a5bcd
--- /dev/null
+++ b/SOURCES/0001-events-Pass-CurrentTime-to-XIAllowEvents-when-unfree.patch
@@ -0,0 +1,26 @@
+From 65ffd7e4df42cd62633f93107644f87208881578 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
+Date: Thu, 14 Apr 2022 18:07:41 +0200
+Subject: [PATCH] events: Pass CurrentTime to XIAllowEvents() when unfreezing
+ pointer
+
+---
+ src/core/events.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/events.c b/src/core/events.c
+index 0dc3a73222..dd9b4ec981 100644
+--- a/src/core/events.c
++++ b/src/core/events.c
+@@ -205,7 +205,7 @@ maybe_unfreeze_pointer_events (MetaBackend          *backend,
+     }
+ 
+   xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend));
+-  XIAllowEvents (xdisplay, device_id, event_mode, event->button.time);
++  XIAllowEvents (xdisplay, device_id, event_mode, CurrentTime);
+ }
+ 
+ static gboolean
+-- 
+2.34.1
+
diff --git a/SPECS/mutter.spec b/SPECS/mutter.spec
index a6810cf..27ac60a 100644
--- a/SPECS/mutter.spec
+++ b/SPECS/mutter.spec
@@ -10,7 +10,7 @@
 
 Name:          mutter
 Version:       3.28.3
-Release:       30%{?dist}
+Release:       31%{?dist}
 Summary:       Window and compositing manager based on Clutter
 
 License:       GPLv2+
@@ -174,6 +174,9 @@ Patch602: 0002-clutter-actor-Don-t-emit-property-changes-after-dest.patch
 
 Patch701: 0001-idle-monitor-NULL-check-cached-InhibitedActions-prop.patch
 
+# Fix race condition causing stuck pointer grabs (rhbz#2054507)
+Patch702: 0001-events-Pass-CurrentTime-to-XIAllowEvents-when-unfree.patch
+
 BuildRequires: chrpath
 BuildRequires: pango-devel
 BuildRequires: startup-notification-devel
@@ -329,6 +332,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Apr 25 2022 Jonas Ådahl <jadahl@redhat.com>) - 3.28.3-31
+- Fix race condition causing stuck pointer grabs
+  Resolves: #2054507
+
 * Thu Nov 12 2020 Jonas Ådahl <jadahl@redhat.com>) - 3.28.3-30
 - Try to fix leaks even more and a log spew fix
   Resolves: #1897063