diff --git a/mutter-crash-meta_context_terminate.patch b/mutter-crash-meta_context_terminate.patch deleted file mode 100644 index c96670a..0000000 --- a/mutter-crash-meta_context_terminate.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: mutter-44.beta/src/x11/session.c -=================================================================== ---- mutter-44.beta.orig/src/x11/session.c -+++ mutter-44.beta/src/x11/session.c -@@ -150,7 +150,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-44.beta/src/tests/meson.build -=================================================================== ---- mutter-44.beta.orig/src/tests/meson.build -+++ mutter-44.beta/src/tests/meson.build -@@ -43,6 +43,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 b8575b7..fc36680 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 9 20:50:24 UTC 2023 - Bjørn Lie + +- Drop mutter-crash-meta_context_terminate.patch: Closed upstream + via https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2609 + ------------------------------------------------------------------- Sat Sep 16 22:09:37 UTC 2023 - Bjørn Lie diff --git a/mutter.spec b/mutter.spec index a67adff..ad93606 100644 --- a/mutter.spec +++ b/mutter.spec @@ -34,8 +34,6 @@ Source0: %{name}-%{version}.tar.zst 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. @@ -147,7 +145,6 @@ applications that want to make use of the mutter library. %else %patch1 -p1 %patch2 -p1 -%patch3 -p1 %endif # SLE-only patches and translations. %if 0%{?sle_version}