From 3f96db099e3c748e960164e4d0791d4a5cb632c5 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Sun, 19 Apr 2026 08:25:21 -0400 Subject: [PATCH] flatpak: bump to gnome runtime 50 and glib 2.88, fix glib patch --- .../io.github.alyraffauf.Switchyard.Devel.yml | 6 ++--- flatpak/patches/glib-appinfo.patch | 22 ++++++++++--------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/flatpak/io.github.alyraffauf.Switchyard.Devel.yml b/flatpak/io.github.alyraffauf.Switchyard.Devel.yml index be2b0fb..7cf42f9 100644 --- a/flatpak/io.github.alyraffauf.Switchyard.Devel.yml +++ b/flatpak/io.github.alyraffauf.Switchyard.Devel.yml @@ -1,6 +1,6 @@ app-id: io.github.alyraffauf.Switchyard.Devel runtime: org.gnome.Platform -runtime-version: "49" +runtime-version: "50" sdk: org.gnome.Sdk sdk-extensions: - org.freedesktop.Sdk.Extension.golang @@ -32,8 +32,8 @@ modules: - -Dtests=false sources: - type: archive - url: https://download.gnome.org/sources/glib/2.86/glib-2.86.3.tar.xz - sha256: b3211d8d34b9df5dca05787ef0ad5d7ca75dec998b970e1aab0001d229977c65 + url: https://download.gnome.org/sources/glib/2.88/glib-2.88.0.tar.xz + sha256: 3546251ccbb3744d4bc4eb48354540e1f6200846572bab68e3a2b7b2b64dfd07 - type: patch path: patches/glib-appinfo.patch diff --git a/flatpak/patches/glib-appinfo.patch b/flatpak/patches/glib-appinfo.patch index 2944dce..b9643f2 100644 --- a/flatpak/patches/glib-appinfo.patch +++ b/flatpak/patches/glib-appinfo.patch @@ -1,15 +1,13 @@ -# In the sandbox - the programs in the Exec and Try_Exec keys do not exist +# In the sandbox, the programs in the Exec and Try_Exec keys do not exist # so GAppInfo will ignore them -# Credit to https://github.com/flathub/re.sonny.Junction/blob/master/build-aux/flatpak/glib-appinfo.patch diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c -index 1f161328a..4184d40f0 100644 --- a/gio/gdesktopappinfo.c +++ b/gio/gdesktopappinfo.c -@@ -1910,56 +1910,11 @@ g_desktop_app_info_load_from_keyfile (GDesktopAppInfo *info, - G_KEY_FILE_DESKTOP_GROUP, - G_KEY_FILE_DESKTOP_KEY_TRY_EXEC, - NULL); +@@ -1944,20 +1944,6 @@ + } + g_clear_error (&local_error); + - if (try_exec && try_exec[0] != '\0') - { - char *t; @@ -23,11 +21,14 @@ index 1f161328a..4184d40f0 100644 - } - g_free (t); - } - +- exec = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_EXEC, - NULL); +@@ -1971,39 +1957,6 @@ + } + g_clear_error (&local_error); + - if (exec && exec[0] != '\0') - { - gint argc; @@ -60,6 +61,7 @@ index 1f161328a..4184d40f0 100644 - g_free (t); - } - } - +- info->name = g_key_file_get_locale_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_NAME, NULL, NULL); info->generic_name = g_key_file_get_locale_string (key_file, G_KEY_FILE_DESKTOP_GROUP, GENERIC_NAME_KEY, NULL, NULL); + info->fullname = g_key_file_get_locale_string (key_file, G_KEY_FILE_DESKTOP_GROUP, FULL_NAME_KEY, NULL, NULL); -- 2.51.2