diff options
Diffstat (limited to 'gnome-session-glib-2.78-compat.patch')
| -rw-r--r-- | gnome-session-glib-2.78-compat.patch | 119 |
1 files changed, 119 insertions, 0 deletions
diff --git a/gnome-session-glib-2.78-compat.patch b/gnome-session-glib-2.78-compat.patch new file mode 100644 index 0000000..de067ac --- /dev/null +++ b/gnome-session-glib-2.78-compat.patch @@ -0,0 +1,119 @@ +diff --git a/gnome-session/gsm-session-save.c b/gnome-session/gsm-session-save.c +index 3d10bed..b672f36 100644 +--- a/gnome-session/gsm-session-save.c ++++ b/gnome-session/gsm-session-save.c +@@ -223,14 +223,14 @@ flush_to_disk (GsmSessionSave *save) + GHashTableIter app_iter; + gpointer value; + +- g_variant_builder_init_static (&builder, G_VARIANT_TYPE_VARDICT); ++ g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT); + + g_variant_builder_add (&builder, "{sv}", "version", + g_variant_new_uint32 (1)); + g_variant_builder_add (&builder, "{sv}", "dirty", + g_variant_new_boolean (!save->sealed)); + +- g_variant_builder_init_static (&instances, G_VARIANT_TYPE ("a{s(a{sv}aa{sv})}")); ++ g_variant_builder_init (&instances, G_VARIANT_TYPE ("a{s(a{sv}aa{sv})}")); + g_hash_table_iter_init (&app_iter, save->apps); + while (g_hash_table_iter_next (&app_iter, NULL, &value)) { + SavedApp *app = value; +@@ -246,7 +246,7 @@ flush_to_disk (GsmSessionSave *save) + g_variant_new_string (app->next_id)); + if (app->discarded_ids) { + GVariantBuilder discarded; +- g_variant_builder_init_static (&discarded, G_VARIANT_TYPE ("as")); ++ g_variant_builder_init (&discarded, G_VARIANT_TYPE ("as")); + for (const GSList *iter = app->discarded_ids; iter; iter = iter->next) { + g_variant_builder_add (&discarded, "s", iter->data); + } +diff --git a/gnome-session/leader-main.c b/gnome-session/leader-main.c +index 8ccc06d..f1d5ab0 100644 +--- a/gnome-session/leader-main.c ++++ b/gnome-session/leader-main.c +@@ -28,6 +28,25 @@ + + #include "gsm-util.h" + ++/* openEuler 24.03 LTS ships GLib 2.78, which predates the ++ * g_strv_builder_take() and g_strv_builder_unref_to_strv() helpers that were ++ * added in GLib 2.82. Provide equivalent local implementations. */ ++static void ++gsm_strv_builder_take (GStrvBuilder *builder, ++ char *value) ++{ ++ g_strv_builder_add (builder, value); ++ g_free (value); ++} ++ ++static GStrv ++gsm_strv_builder_unref_to_strv (GStrvBuilder *builder) ++{ ++ GStrv strv = g_strv_builder_end (builder); ++ g_strv_builder_unref (builder); ++ return strv; ++} ++ + #define INIT_WORKER_PATH (LIBEXECDIR "/gnome-session-init-worker") + + static char * +@@ -96,18 +115,18 @@ maybe_reexec_with_login_shell (GStrv argv) + /* First, we construct the command executed by the login shell */ + builder = g_strv_builder_new (); + g_strv_builder_add (builder, "exec"); +- g_strv_builder_take (builder, g_shell_quote (argv [0])); ++ gsm_strv_builder_take (builder, g_shell_quote (argv [0])); + g_strv_builder_add (builder, "--no-reexec"); + for (char **p = argv + 1; *p != NULL; p++) +- g_strv_builder_take (builder, g_shell_quote (*p)); +- inner_args = g_strv_builder_unref_to_strv (builder); ++ gsm_strv_builder_take (builder, g_shell_quote (*p)); ++ inner_args = gsm_strv_builder_unref_to_strv (builder); + + /* Next, we construct the invocation of the login shell itself */ + builder = g_strv_builder_new (); +- g_strv_builder_take (builder, g_steal_pointer (&login_shell)); ++ gsm_strv_builder_take (builder, g_steal_pointer (&login_shell)); + g_strv_builder_add (builder, "-c"); +- g_strv_builder_take (builder, g_strjoinv (" ", inner_args)); +- outer_args = g_strv_builder_unref_to_strv (builder); ++ gsm_strv_builder_take (builder, g_strjoinv (" ", inner_args)); ++ outer_args = gsm_strv_builder_unref_to_strv (builder); + + execv (shell, outer_args); + g_warning ("Failed to re-execute with login shell (%s): %m", shell); +@@ -206,7 +225,7 @@ main (int argc, char **argv) + argv_dup_builder = g_strv_builder_new (); + for (size_t i = 0; i < argc; i++) + g_strv_builder_add (argv_dup_builder, argv [i]); +- argv_dup = g_strv_builder_unref_to_strv (argv_dup_builder); ++ argv_dup = gsm_strv_builder_unref_to_strv (argv_dup_builder); + + options = g_option_context_new (_(" — the GNOME session manager")); + g_option_context_add_main_entries (options, entries, GETTEXT_PACKAGE); +diff --git a/gnome-session/leader-systemd.c b/gnome-session/leader-systemd.c +index 911b7d8..34e8505 100644 +--- a/gnome-session/leader-systemd.c ++++ b/gnome-session/leader-systemd.c +@@ -20,6 +20,7 @@ + #include <config.h> + + #include <glib.h> ++#include <glib/gstdio.h> + #include <glib-unix.h> + #include <gio/gio.h> + +diff --git a/meson.build b/meson.build +index d38cba6..5c4037f 100644 +--- a/meson.build ++++ b/meson.build +@@ -76,7 +76,7 @@ endif + + add_project_arguments(common_flags + compiler_flags, language: 'c') + +-glib_req_version = '>= 2.82.0' ++glib_req_version = '>= 2.78.0' + + gio_dep = dependency('gio-2.0', version: glib_req_version) + |
