From fa50126439c01df27ffb1448c6bd02727f3202e2032a8de64135120fe0f1ce91 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 17 May 2022 07:19:36 +0000 Subject: [PATCH] Accepting request 977634 from home:xiaoguang_wang:branches:GNOME:Factory - Add mutter-crash-meta_context_terminate.patch: Fix SIGSEGV in meta_context_terminate (bsc#1199382 glgo#GNOME/mutter#2267). OBS-URL: https://build.opensuse.org/request/show/977634 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=411 --- mutter-crash-meta_context_terminate.patch | 26 +++++++++++++++++++++++ mutter.changes | 6 ++++++ mutter.spec | 3 +++ 3 files changed, 35 insertions(+) create mode 100644 mutter-crash-meta_context_terminate.patch diff --git a/mutter-crash-meta_context_terminate.patch b/mutter-crash-meta_context_terminate.patch new file mode 100644 index 0000000..aec1231 --- /dev/null +++ b/mutter-crash-meta_context_terminate.patch @@ -0,0 +1,26 @@ +Index: mutter-42.1/src/x11/session.c +=================================================================== +--- mutter-42.1.orig/src/x11/session.c ++++ mutter-42.1/src/x11/session.c +@@ -113,7 +113,8 @@ process_ice_messages (GIOChannel *chan + * being cleaned up, since it is owned by libSM. + */ + disconnect (); +- meta_context_terminate (ice_connection->context); ++ if (ice_connection->context != NULL) ++ meta_context_terminate (ice_connection->context); + + return FALSE; + } +Index: mutter-42.1/src/tests/meson.build +=================================================================== +--- mutter-42.1.orig/src/tests/meson.build ++++ mutter-42.1/src/tests/meson.build +@@ -35,6 +35,7 @@ tests_deps = [ + ] + + libmutter_test = shared_library(libmutter_test_name, ++ mutter_enum_types, + mutter_test_sources, + gnu_symbol_visibility: 'hidden', + include_directories: tests_includes, diff --git a/mutter.changes b/mutter.changes index 7ee3494..14f6338 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 13 08:22:15 UTC 2022 - Xiaoguang Wang + +- Add mutter-crash-meta_context_terminate.patch: Fix SIGSEGV in + meta_context_terminate (bsc#1199382 glgo#GNOME/mutter#2267). + ------------------------------------------------------------------- Fri May 06 08:22:25 UTC 2022 - Frederic Crozat diff --git a/mutter.spec b/mutter.spec index 31684f6..0d4f967 100644 --- a/mutter.spec +++ b/mutter.spec @@ -38,6 +38,8 @@ Patch0: mutter-Lower-HIDPI_LIMIT-to-144.patch Patch1: mutter-disable-cvt-s390x.patch # PATCH-FIX-OPENSUSE mutter-window-actor-Special-case-shaped-Java-windows.patch -- window-actor: Special-case shaped Java windows 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 ## 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. @@ -145,6 +147,7 @@ applications that want to make use of the mutter library. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # SLE-only patches and translations. %if 0%{?sle_version}