Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update glib to 2.76.3 and Flatpak platform to 7.2 #133

Merged
merged 1 commit into from
Jun 11, 2023
Merged

Update glib to 2.76.3 and Flatpak platform to 7.2 #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions com.github.donadigo.appeditor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand All @@ -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",
Expand Down Expand Up @@ -66,4 +65,4 @@
]
}
]
}
}
Binary file removed external/glib-2.70.0.tar.xz
View file
Open in desktop
Binary file not shown.
Binary file added external/glib-2.76.3.tar.xz
View file
Open in desktop
Binary file not shown.
21 changes: 15 additions & 6 deletions external/glib-appinfo.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -31,25 +33,32 @@ 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;
- }
- 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;
- }
- 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);