diff --git a/_service b/_service index 4730be3..5fcaf28 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ git https://gitlab.gnome.org/GNOME/mutter.git - 82bd40dcbcc3601da755678778f033bd9a30286d + e7ed2bf85700a2ff33b69826f6f0fff6e2f28e69 @PARENT_TAG@+@TAG_OFFSET@ (.*)\+0 \1 diff --git a/_servicedata b/_servicedata index 07f62df..602396f 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://gitlab.gnome.org/GNOME/mutter.git - 82bd40dcbcc3601da755678778f033bd9a30286d \ No newline at end of file + e7ed2bf85700a2ff33b69826f6f0fff6e2f28e69 \ No newline at end of file diff --git a/mutter-44.1+2.obscpio b/mutter-44.1+2.obscpio deleted file mode 100644 index 9c1eec6..0000000 --- a/mutter-44.1+2.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b39302a34c8598da2164133f193127686a26b906c851b4423ca6e97cd85faf8 -size 25993229 diff --git a/mutter-44.2.obscpio b/mutter-44.2.obscpio new file mode 100644 index 0000000..ff08d4f --- /dev/null +++ b/mutter-44.2.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:667026219b9c7416113a5375ee738d64412fb1d4511eb6c86284d8db3207a875 +size 26001421 diff --git a/mutter-do-not-unminimize-windows-with-initial-iconic.patch b/mutter-do-not-unminimize-windows-with-initial-iconic.patch deleted file mode 100644 index ab72797..0000000 --- a/mutter-do-not-unminimize-windows-with-initial-iconic.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 3218626d7e1c1c9466ad5c64558cf9ace5b68926 Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho -Date: Wed, 1 Mar 2023 17:43:24 +0100 -Subject: [PATCH] x11: Do not unminimize windows with initial IconicState - -This is a revert of commit be5c2ebc, adapted to this day and age. -While this worked around issues in wine/proton, it did contravene -icccm in the interpretation of initially iconic windows. - -Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2043 -Part-of: ---- - src/x11/events.c | 34 ++++++++++++---------------------- - 1 file changed, 12 insertions(+), 22 deletions(-) - -diff --git a/src/x11/events.c b/src/x11/events.c -index 90d07cb5ecd..00f34e22118 100644 ---- a/src/x11/events.c -+++ b/src/x11/events.c -@@ -1528,32 +1528,22 @@ handle_other_xevent (MetaX11Display *x11_display, - - window = meta_window_x11_new (display, event->xmaprequest.window, - FALSE, META_COMP_EFFECT_CREATE); -- /* The window might have initial iconic state, but this is a -- * MapRequest, fall through to ensure it is unminimized in -- * that case. -- */ - } -- else if (frame_was_receiver) -+ else - { -- break; -- } -+ meta_verbose ("MapRequest on %s mapped = %d minimized = %d", -+ window->desc, window->mapped, window->minimized); - -- /* Double check that creating the MetaWindow succeeded */ -- if (window == NULL) -- break; -- -- meta_verbose ("MapRequest on %s mapped = %d minimized = %d", -- window->desc, window->mapped, window->minimized); -- -- if (window->minimized) -- { -- meta_window_unminimize (window); -- if (window->workspace != workspace_manager->active_workspace) -+ if (window->minimized && !frame_was_receiver) - { -- meta_verbose ("Changing workspace due to MapRequest mapped = %d minimized = %d", -- window->mapped, window->minimized); -- meta_window_change_workspace (window, -- workspace_manager->active_workspace); -+ meta_window_unminimize (window); -+ if (window->workspace != workspace_manager->active_workspace) -+ { -+ meta_verbose ("Changing workspace due to MapRequest mapped = %d minimized = %d", -+ window->mapped, window->minimized); -+ meta_window_change_workspace (window, -+ workspace_manager->active_workspace); -+ } - } - } - break; --- -GitLab - diff --git a/mutter-fix-wacom-tablet-crash.patch b/mutter-fix-wacom-tablet-crash.patch deleted file mode 100644 index 772cade..0000000 --- a/mutter-fix-wacom-tablet-crash.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff --unified --recursive --text --new-file --color mutter-44.1+2.old/src/backends/x11/meta-input-settings-x11.c mutter-44.1+2.new/src/backends/x11/meta-input-settings-x11.c ---- mutter-44.1+2.old/src/backends/x11/meta-input-settings-x11.c 2023-05-05 03:08:50.000000000 +0800 -+++ mutter-44.1+2.new/src/backends/x11/meta-input-settings-x11.c 2023-05-17 12:08:22.732865538 +0800 -@@ -58,28 +58,18 @@ - return meta_input_settings_get_backend (settings); - } - --static MetaDisplay * --get_display (MetaInputSettings *settings) --{ -- MetaBackend *backend = get_backend (settings); -- MetaContext *context = meta_backend_get_context (backend); -- -- return meta_context_get_display (context); --} -- - static void - device_handle_free (gpointer user_data) - { - DeviceHandle *handle = user_data; - MetaInputSettings *settings = handle->settings; -- MetaDisplay *display = get_display (settings); - MetaBackend *backend = get_backend (settings); - Display *xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend)); - XDevice *xdev = user_data; - -- meta_x11_error_trap_push (display->x11_display); -+ meta_clutter_x11_trap_x_errors (); - XCloseDevice (xdisplay, xdev); -- meta_x11_error_trap_pop (display->x11_display); -+ meta_clutter_x11_untrap_x_errors (); - - g_free (handle); - } -@@ -88,7 +78,6 @@ - device_ensure_xdevice (MetaInputSettings *settings, - ClutterInputDevice *device) - { -- MetaDisplay *display = get_display (settings); - MetaBackend *backend = get_backend (settings); - Display *xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend)); - int device_id = meta_input_device_x11_get_device_id (device); -@@ -98,9 +87,9 @@ - if (xdev) - return xdev; - -- meta_x11_error_trap_push (display->x11_display); -+ meta_clutter_x11_trap_x_errors (); - xdev = XOpenDevice (xdisplay, device_id); -- meta_x11_error_trap_pop (display->x11_display); -+ meta_clutter_x11_untrap_x_errors (); - - if (xdev) - { -@@ -619,16 +608,12 @@ - ClutterInputDevice *device, - GDesktopTabletMapping mapping) - { -- MetaDisplay *display = get_display (settings); - MetaBackend *backend = get_backend (settings); - Display *xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend)); - XDevice *xdev; - -- if (!display) -- return; -- - /* Grab the puke bucket! */ -- meta_x11_error_trap_push (display->x11_display); -+ meta_clutter_x11_trap_x_errors (); - xdev = device_ensure_xdevice (settings, device); - if (xdev) - { -@@ -637,11 +622,7 @@ - Absolute : Relative); - } - -- if (meta_x11_error_trap_pop_with_return (display->x11_display)) -- { -- g_warning ("Could not set tablet mapping for %s", -- clutter_input_device_get_device_name (device)); -- } -+ meta_clutter_x11_untrap_x_errors (); - } - - static gboolean -@@ -776,16 +757,12 @@ - GDesktopStylusButtonAction secondary, - GDesktopStylusButtonAction tertiary) - { -- MetaDisplay *display = get_display (settings); - MetaBackend *backend = get_backend (settings); - Display *xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend)); - XDevice *xdev; - -- if (!display) -- return; -- - /* Grab the puke bucket! */ -- meta_x11_error_trap_push (display->x11_display); -+ meta_clutter_x11_trap_x_errors (); - xdev = device_ensure_xdevice (settings, device); - if (xdev) - { -@@ -803,11 +780,7 @@ - XSetDeviceButtonMapping (xdisplay, xdev, map, G_N_ELEMENTS (map)); - } - -- if (meta_x11_error_trap_pop_with_return (display->x11_display)) -- { -- g_warning ("Could not set stylus button map for %s", -- clutter_input_device_get_device_name (device)); -- } -+ meta_clutter_x11_untrap_x_errors (); - } - - static void diff --git a/mutter.changes b/mutter.changes index c1f84a5..5168e02 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Mon Jun 05 07:34:52 UTC 2023 - bjorn.lie@gmail.com + +- Update to version 44.2: + + Fix DND in some server-side decorated windows + + Fix redrawing regression in non-DMA remote sessions + + Avoid race condition in xwayland-on-demand + + Do not unminimize windows with initial IconicState + + Fix mispositioning of some X11 fullscreen windows + + Fix legacy fullscreen windows appearing on all monitors + + Improve support for display-attached tablets + + Fix stuck cursor in some clients + + Avoid unexpected orientation changes around suspend/resume + + Fix oversized input region around Xwayland windows + + Fix X11 client input region issues + + Plugged leak + + Fixed crashes + + Misc. bug fixes and cleanups + + Updated translations. +- Drop patches fixed upstream: + + mutter-do-not-unminimize-windows-with-initial-iconic.patch + + mutter-fix-wacom-tablet-crash.patch + ------------------------------------------------------------------- Tue May 23 07:41:44 UTC 2023 - Alynx Zhou diff --git a/mutter.obsinfo b/mutter.obsinfo index 8fb91a5..a65a902 100644 --- a/mutter.obsinfo +++ b/mutter.obsinfo @@ -1,4 +1,4 @@ name: mutter -version: 44.1+2 -mtime: 1683227330 -commit: 82bd40dcbcc3601da755678778f033bd9a30286d +version: 44.2 +mtime: 1685788323 +commit: e7ed2bf85700a2ff33b69826f6f0fff6e2f28e69 diff --git a/mutter.spec b/mutter.spec index bb52460..0292b23 100644 --- a/mutter.spec +++ b/mutter.spec @@ -22,7 +22,7 @@ %define api_minor 0 %define libmutter libmutter-%{api_major}-%{api_minor} Name: mutter -Version: 44.1+2 +Version: 44.2 Release: 0 Summary: Window and compositing manager based on Clutter License: GPL-2.0-or-later @@ -36,10 +36,6 @@ Patch1: mutter-disable-cvt-s390x.patch Patch2: mutter-window-actor-Special-case-shaped-Java-windows.patch # PATCH-FIX-UPSTREAM mutter-crash-meta_context_terminate.patch bsc#1199382 glgo#GNOME/mutter#2267 xwang@suse.com -- Fix SIGSEGV in meta_context_terminate Patch3: mutter-crash-meta_context_terminate.patch -# PATCH-FIX-UPSTREAM mutter-fix-wacom-tablet-crash.patch bsc#1211413 glgo#GNOME/mutter#2796 alynx.zhou@suse.com -- Fix x11 error of input configuration. -Patch4: mutter-fix-wacom-tablet-crash.patch -# PATCH-FIX-UPSTREAM mutter-do-not-unminimize-windows-with-initial-iconic.patch bsc#1193190 glgo#GNOME/mutter!3001 alynx.zhou@suse.com -- Fix initial iconic handling -Patch5: mutter-do-not-unminimize-windows-with-initial-iconic.patch ## SLE-only patches start at 1000 # PATCH-FEATURE-SLE mutter-SLE-bell.patch FATE#316042 bnc#889218 idonmez@suse.com -- make audible bell work out of the box.