Commit 794a5ed5 authored by Guido Gunther's avatar Guido Gunther
Browse files

Backport glib fix from Debian

parent 326e2f6b
Pipeline #76320 passed with stages
in 19 minutes and 40 seconds
......@@ -3,14 +3,14 @@ Date: Fri, 2 Jul 2010 23:20:04 +0000
Subject: Install as epiphany-browser not epiphany
---
meson.build | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
meson.build | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Index: epiphany-3.33.91/meson.build
===================================================================
--- epiphany-3.33.91.orig/meson.build
+++ epiphany-3.33.91/meson.build
@@ -23,9 +23,9 @@ libdir = join_paths(prefix, get_option('
diff --git a/meson.build b/meson.build
index 26a95c6..d6765dd 100644
--- a/meson.build
+++ b/meson.build
@@ -23,9 +23,9 @@ libdir = join_paths(prefix, get_option('libdir'))
libexecdir = join_paths(prefix, get_option('libexecdir'))
liblocaledir = join_paths(prefix, libdir, 'locale')
localedir = join_paths(prefix, get_option('localedir'))
......@@ -23,4 +23,3 @@ Index: epiphany-3.33.91/meson.build
servicedir = join_paths(datadir, 'dbus-1', 'services')
webprocessextensionsdir = join_paths(pkglibdir, 'web-process-extensions')
From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
Date: Tue, 17 May 2022 09:38:53 +0200
Subject: Backport glib fix from Debian
---
src/ephy-session.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/ephy-session.c b/src/ephy-session.c
index ba06665..ad945fa 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -849,6 +849,12 @@ save_session_in_thread_finished_cb (GObject *source_object,
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
@@ -1031,7 +1037,7 @@ ephy_session_save_idle_cb (EphySession *session)
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);
......@@ -4,3 +4,4 @@ pureos/tests-Disable-create_delete_dir-test.patch
pureos/header-bar-Hide-keyboard-shortcuts-button-on-mobile.patch
pureos/Disable-fullscreen.patch
pureos/firefox-sync-dialog-Use-GtkHeaderBar.patch
Backport-glib-fix-from-Debian.patch
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment