diff --git a/com.github.donadigo.appeditor.json b/com.github.donadigo.appeditor.json index 747c8a3..2bf28e5 100644 --- a/com.github.donadigo.appeditor.json +++ b/com.github.donadigo.appeditor.json @@ -1,7 +1,7 @@ { "app-id": "com.github.donadigo.appeditor", "runtime": "io.elementary.Platform", - "runtime-version": "6.1", + "runtime-version": "7.2", "sdk": "io.elementary.Sdk", "command": "appeditor-wrapper", "finish-args": [ @@ -18,14 +18,13 @@ "buildsystem": "meson", "config-opts": [ "-Dtests=false", - "-Dselinux=disabled", - "-Dinternal_pcre=false" + "-Dselinux=disabled" ], "sources": [ { "type": "archive", - "path": "external/glib-2.70.0.tar.xz", - "sha256": "200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742" + "path": "external/glib-2.76.3.tar.xz", + "sha256": "c0be444e403d7c3184d1f394f89f0b644710b5e9331b54fa4e8b5037813ad32a" }, { "type": "patch", @@ -66,4 +65,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/external/glib-2.70.0.tar.xz b/external/glib-2.70.0.tar.xz deleted file mode 100644 index 5bbbd3e..0000000 Binary files a/external/glib-2.70.0.tar.xz and /dev/null differ diff --git a/external/glib-2.76.3.tar.xz b/external/glib-2.76.3.tar.xz new file mode 100644 index 0000000..5dbd9e5 Binary files /dev/null and b/external/glib-2.76.3.tar.xz differ diff --git a/external/glib-appinfo.patch b/external/glib-appinfo.patch index 9cca1dc..0731aea 100644 --- a/external/glib-appinfo.patch +++ b/external/glib-appinfo.patch @@ -2,25 +2,27 @@ # so GAppInfo will ignore them diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c -index 63ef0c045..fa5ade90a 100644 +index 1f161328a..4184d40f0 100644 --- a/gio/gdesktopappinfo.c +++ b/gio/gdesktopappinfo.c -@@ -1787,47 +1787,11 @@ g_desktop_app_info_load_from_keyfile (GDesktopAppInfo *info, +@@ -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); - if (try_exec && try_exec[0] != '\0') - { - char *t; -- t = g_find_program_in_path (try_exec); +- /* Use the desktop file path (if any) as working dir to search program */ +- t = GLIB_PRIVATE_CALL (g_find_program_for_path) (try_exec, NULL, path); - if (t == NULL) - { +- g_free (path); - g_free (try_exec); - return FALSE; - } - g_free (t); - } - + exec = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_EXEC, @@ -31,6 +33,7 @@ index 63ef0c045..fa5ade90a 100644 - char **argv; - if (!g_shell_parse_argv (exec, &argc, &argv, NULL)) - { +- g_free (path); - g_free (exec); - g_free (try_exec); - return FALSE; @@ -38,11 +41,17 @@ index 63ef0c045..fa5ade90a 100644 - else - { - char *t; -- t = g_find_program_in_path (argv[0]); +- +- /* Since @exec is not an empty string, there must be at least one +- * argument, so dereferencing argv[0] should return non-NULL. */ +- g_assert (argc > 0); +- /* Use the desktop file path (if any) as working dir to search program */ +- t = GLIB_PRIVATE_CALL (g_find_program_for_path) (argv[0], NULL, path); - g_strfreev (argv); - - if (t == NULL) - { +- g_free (path); - g_free (exec); - g_free (try_exec); - return FALSE; @@ -50,6 +59,6 @@ index 63ef0c045..fa5ade90a 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);