#15 Work around crashy tear down
Merged 2 years ago by fmuellner. Opened 2 years ago by jadahl.
rpms/ jadahl/gnome-shell f34-work-around-crashy-tear-down  into  f34

Work around crashy tear down
Jonas Ådahl • 2 years ago  
@@ -0,0 +1,31 @@ 

+ From a9e79b1657dc7c1b702d7acc4d322539d2b8b6aa Mon Sep 17 00:00:00 2001

+ From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>

+ Date: Wed, 6 Oct 2021 10:00:43 +0200

+ Subject: [PATCH] main: Leak the GJS context and ShellGlobal

+ 

+ There are many crash-on-exit happening as a side effect of destroying

+ the GJS context. Work around these until we have a better solution by

+ leaking them.

+ ---

+  src/main.c | 2 ++

+  1 file changed, 2 insertions(+)

+ 

+ diff --git a/src/main.c b/src/main.c

+ index 91e5493fd1..d62dda9627 100644

+ --- a/src/main.c

+ +++ b/src/main.c

+ @@ -508,9 +508,11 @@ main (int argc, char **argv)

+    ecode = meta_run ();

+    shell_profiler_shutdown ();

+  

+ +#if 0

+    g_debug ("Doing final cleanup");

+    _shell_global_destroy_gjs_context (shell_global_get ());

+    g_object_unref (shell_global_get ());

+ +#endif

+  

+    return ecode;

+  }

+ -- 

+ 2.31.1

+ 

file modified
+6 -1
@@ -2,7 +2,7 @@ 

  

  Name:           gnome-shell

  Version:        40.5

- Release:        1%{?dist}

+ Release:        2%{?dist}

  Summary:        Window management and application launching for GNOME

  

  License:        GPLv2+
@@ -16,6 +16,8 @@ 

  # downstream patch to stop trying on configuration errors.

  Patch10005: 0001-gdm-Work-around-failing-fingerprint-auth.patch

  

+ # Work around crashy tear down

+ Patch11000: 0001-main-Leak-the-GJS-context-and-ShellGlobal.patch

  

  %define eds_version 3.33.1

  %define gnome_desktop_version 3.35.91
@@ -234,6 +236,9 @@ 

  %{_mandir}/man1/gnome-shell.1*

  

  %changelog

+ * Wed Oct 06 2021 Jonas Ådahl <jadahl@redhat.com> - 40.5-2

+ - Work around crashy tear down

+ 

  * Tue Sep 21 2021 Florian Müllner <fmuellner@redhat.com> - 40.5-1

  - Update to 40.5

  

This would hopefully stop the crash reports for crash-on-exit from coming in.

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

Pull-Request has been merged by fmuellner

2 years ago