Control: tags -1 patch fixed-upstream Control: forwarded -1 https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/954
On Tue, Feb 15, 2022 at 04:29:52PM +0200, Andres Gomez wrote: > After talking with the main WebKitGtk developer and maintainer, > he pointed that the cause of the crash actually laid in > epiphany-browser and, specifically, the reason for the crash had > been already addressed upstream in the following issue: > > https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/954 I'm attaching the debdiff with this fix. If this fixes the issue I think we should upload it to bullseye. Berto
diff -Nru epiphany-browser-3.38.2/debian/changelog epiphany-browser-3.38.2/debian/changelog --- epiphany-browser-3.38.2/debian/changelog 2022-01-12 18:33:21.000000000 +0100 +++ epiphany-browser-3.38.2/debian/changelog 2022-02-23 17:34:35.000000000 +0100 @@ -1,3 +1,11 @@ +epiphany-browser (3.38.2-1+deb11u2) bullseye; urgency=medium + + * d/p/glib-bug-workaround.patch: + - Cherry pick upstream patch ff8ecbf6. This works around a bug in GLib + and fixes a UI process crash (Closes: #1005810). + + -- Alberto Garcia <be...@igalia.com> Wed, 23 Feb 2022 17:34:35 +0100 + epiphany-browser (3.38.2-1+deb11u1) bullseye-security; urgency=medium * d/p/encode-untrusted-data.patch: diff -Nru epiphany-browser-3.38.2/debian/patches/glib-bug-workaround.patch epiphany-browser-3.38.2/debian/patches/glib-bug-workaround.patch --- epiphany-browser-3.38.2/debian/patches/glib-bug-workaround.patch 1970-01-01 01:00:00.000000000 +0100 +++ epiphany-browser-3.38.2/debian/patches/glib-bug-workaround.patch 2022-02-23 17:31:38.000000000 +0100 @@ -0,0 +1,30 @@ +From: Michael Catanzaro <mcatanz...@redhat.com> +Subject: remove user data from task to workaround glib bug +Origin: https://gitlab.gnome.org/GNOME/epiphany/-/commit/ff8ecbf673cd25f8ed34d4ccb29cc5d3d13cd683 +Bug-Debian: https://bugs.debian.org/1005810 +Index: epiphany-browser-3.38.2/src/ephy-session.c +=================================================================== +--- epiphany-browser-3.38.2.orig/src/ephy-session.c ++++ epiphany-browser-3.38.2/src/ephy-session.c +@@ -844,6 +844,12 @@ save_session_in_thread_finished_cb (GObj + gpointer user_data) + { + g_application_release (G_APPLICATION (ephy_shell_get_default ())); ++ ++ /* FIXME: this is a workaround for https://gitlab.gnome.org/GNOME/glib/-/issues/1346. ++ * After this GLib issue is fixed, we should instead pass save_data_free() as the ++ * GDestroyNotify parameter to g_task_set_task_data(). ++ */ ++ save_data_free (g_task_get_task_data (G_TASK (res))); + } + + static gboolean +@@ -1026,7 +1032,7 @@ ephy_session_save_idle_cb (EphySession * + session->save_cancellable = g_cancellable_new (); + task = g_task_new (session, session->save_cancellable, + save_session_in_thread_finished_cb, NULL); +- g_task_set_task_data (task, data, (GDestroyNotify)save_data_free); ++ g_task_set_task_data (task, data, NULL); + g_task_run_in_thread (task, save_session_sync); + g_object_unref (task); + diff -Nru epiphany-browser-3.38.2/debian/patches/series epiphany-browser-3.38.2/debian/patches/series --- epiphany-browser-3.38.2/debian/patches/series 2022-01-12 18:33:21.000000000 +0100 +++ epiphany-browser-3.38.2/debian/patches/series 2022-02-23 17:28:18.000000000 +0100 @@ -3,3 +3,4 @@ dont-make-compulsory.patch build-Allow-libportal-support-to-be-disabled.patch encode-untrusted-data.patch +glib-bug-workaround.patch
