From 1be4b1a82509b0129f4b3cb4b37ae8e57055f17a Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Aug 08 2023 15:56:18 +0000
Subject: Revert "Revert "compositor: Do not repick after effects finish""


This reverts commit 3a625b6481516ad72603826afcffd839279a8d08.
We're not sure yet if it's needed - we need to backport a
different fix first to get the tests to reach the point where
we'll find out if we still have the 'lost clicks in installer'
bug that reverting this may fix. If so, we'll re-apply this
then.

---

diff --git a/0001-Revert-compositor-Do-not-repick-after-effects-finish.patch b/0001-Revert-compositor-Do-not-repick-after-effects-finish.patch
deleted file mode 100644
index fa0e7ef..0000000
--- a/0001-Revert-compositor-Do-not-repick-after-effects-finish.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 3bb8445dbdd5600a8ce115a2e82a527f32246c13 Mon Sep 17 00:00:00 2001
-From: Kalev Lember <klember@redhat.com>
-Date: Tue, 8 Aug 2023 17:15:34 +0200
-Subject: [PATCH] Revert "compositor: Do not repick after effects finish"
-
-Revert a change that likely caused mouse clicks to go missing in openQA
-tests.
-
-https://gitlab.gnome.org/GNOME/mutter/-/issues/2918#note_1810692
-
-This reverts commit 281d896f6ad30b114f17b0ac6eb1eaf6f394e956.
----
- src/compositor/meta-window-actor.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
-index f5bed5166..07d005cef 100644
---- a/src/compositor/meta-window-actor.c
-+++ b/src/compositor/meta-window-actor.c
-@@ -683,6 +683,11 @@ meta_window_actor_after_effects (MetaWindowActor *self)
- {
-   MetaWindowActorPrivate *priv =
-     meta_window_actor_get_instance_private (self);
-+  ClutterStage *stage;
-+  ClutterSeat *seat;
-+
-+  stage = CLUTTER_STAGE (clutter_actor_get_stage (CLUTTER_ACTOR (self)));
-+  seat = clutter_backend_get_default_seat (clutter_get_default_backend ());
- 
-   if (priv->needs_destroy)
-     {
-@@ -694,6 +699,8 @@ meta_window_actor_after_effects (MetaWindowActor *self)
-       meta_window_actor_sync_visibility (self);
-       meta_window_actor_sync_actor_geometry (self, FALSE);
-     }
-+
-+  clutter_stage_repick_device (stage, clutter_seat_get_pointer (seat));
- }
- 
- void
--- 
-2.41.0
-
diff --git a/mutter.spec b/mutter.spec
index d8f2873..4907406 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -30,9 +30,6 @@ Patch1:        mutter-42.alpha-disable-tegra.patch
 # https://pagure.io/fedora-workstation/issue/79
 Patch2:        0001-place-Always-center-initial-setup-fedora-welcome.patch
 
-# https://gitlab.gnome.org/GNOME/mutter/-/issues/2918#note_1810692
-Patch3:        0001-Revert-compositor-Do-not-repick-after-effects-finish.patch
-
 BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.41.0
 BuildRequires: pkgconfig(sm)
 BuildRequires: pkgconfig(libwacom)