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?= +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/SOURCES/0001-workspace-Downgrade-assert-to-warning-when-adding-wi.patch b/SOURCES/0001-workspace-Downgrade-assert-to-warning-when-adding-wi.patch new file mode 100644 index 0000000..7df90fd --- /dev/null +++ b/SOURCES/0001-workspace-Downgrade-assert-to-warning-when-adding-wi.patch @@ -0,0 +1,33 @@ +From d33a244603d1dd63e2e25255af98f489c65645f6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jonas=20=C3=85dahl?= +Date: Mon, 29 Aug 2022 16:01:48 +0200 +Subject: [PATCH] workspace: Downgrade assert to warning when adding window + +An extension can by accident cause us to end up in a state where we try +to add the same window to a workspace twice. When this happens we +shouldn't crash, but instead complain loudly. + +Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/992 +Related: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/157 +Part-of: +--- + src/core/workspace.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/core/workspace.c b/src/core/workspace.c +index 58fcfa78c5..ed16a83098 100644 +--- a/src/core/workspace.c ++++ b/src/core/workspace.c +@@ -370,7 +370,8 @@ void + meta_workspace_add_window (MetaWorkspace *workspace, + MetaWindow *window) + { +- g_assert (g_list_find (workspace->mru_list, window) == NULL); ++ g_return_if_fail (g_list_find (workspace->mru_list, window) == NULL); ++ + workspace->mru_list = g_list_prepend (workspace->mru_list, window); + + workspace->windows = g_list_prepend (workspace->windows, window); +-- +2.37.1 + diff --git a/SPECS/mutter.spec b/SPECS/mutter.spec index 5bccd3d..d1877de 100644 --- a/SPECS/mutter.spec +++ b/SPECS/mutter.spec @@ -8,7 +8,7 @@ Name: mutter Version: 3.32.2 -Release: 64%{?dist} +Release: 66%{?dist} Summary: Window and compositing manager based on Clutter License: GPLv2+ @@ -198,9 +198,15 @@ Patch525: monitor-config-policy.patch # Backport EGLStream overview fixes (#1977721) Patch526: eglstream-overview-fixes.patch -# Backport fix for stuck _NET_WM_FRAME_DRAWN handling (#2090329) +# Backport fix for stuck _NET_WM_FRAME_DRAWN handling (#2060305) Patch527: 0001-compositor-Make-sure-_NET_WM_FRAME_DRAWN-timestamp-h.patch +# Fix race condition causing stuck pointer grabs (#2090168) +Patch528: 0001-events-Pass-CurrentTime-to-XIAllowEvents-when-unfree.patch + +# Downgrade assert to warning (#2089311) +Patch529: 0001-workspace-Downgrade-assert-to-warning-when-adding-wi.patch + BuildRequires: chrpath BuildRequires: pango-devel BuildRequires: startup-notification-devel @@ -342,9 +348,17 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_datadir}/mutter-%{mutter_api_version}/tests %changelog -* Thu Jun 09 2022 Jonas Ådahl - 3.32.2-64 +* Mon Aug 29 2022 Jonas Ådahl ) - 3.32.2-66 +- Downgrade assert to warning + Resolves: #2089311 + +* Mon Jun 27 2022 Jonas Ådahl ) - 3.32.2-65 +- Fix race condition causing stuck pointer grabs + Resolves: #2090168 + +* Fri Mar 18 2022 Jonas Ådahl - 3.32.2-64 - Backport fix for stuck _NET_WM_FRAME_DRAWN handling - Resolves: #2090329 + Resolves: #2060305 * Thu Feb 24 2022 Jonas Ådahl - 3.32.2-63 - Fix EGLStream overview fixes backport