Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mutter for openSUSE:Factory checked in at 2023-05-23 14:53:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mutter (Old) and /work/SRC/openSUSE:Factory/.mutter.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mutter" Tue May 23 14:53:29 2023 rev:203 rq:1088409 version:44.1+2 Changes: -------- --- /work/SRC/openSUSE:Factory/mutter/mutter.changes 2023-05-10 16:16:58.682425833 +0200 +++ /work/SRC/openSUSE:Factory/.mutter.new.1533/mutter.changes 2023-05-23 14:53:40.362174039 +0200 @@ -1,0 +2,7 @@ +Wed May 17 03:01:48 UTC 2023 - Alynx Zhou <[email protected]> + +- Add mutter-fix-wacom-tablet-crash.patch: Use clutter error trap + to fix x11 error of some input device configuration like wacom + tablet (bsc#1211413, glgo#GNOME/mutter#2796). + +------------------------------------------------------------------- New: ---- mutter-fix-wacom-tablet-crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mutter.spec ++++++ --- /var/tmp/diff_new_pack.YrQnRR/_old 2023-05-23 14:53:42.410186156 +0200 +++ /var/tmp/diff_new_pack.YrQnRR/_new 2023-05-23 14:53:42.418186203 +0200 @@ -36,6 +36,8 @@ 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 [email protected] -- 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 [email protected] -- Fix x11 error of input configuration. +Patch4: mutter-fix-wacom-tablet-crash.patch ## SLE-only patches start at 1000 # PATCH-FEATURE-SLE mutter-SLE-bell.patch FATE#316042 bnc#889218 [email protected] -- make audible bell work out of the box. ++++++ mutter-fix-wacom-tablet-crash.patch ++++++ 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
