marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't export app-info files 

Also, pick up the non-exported files when updating the appdata branch
tingping/wmclass
Alexander Larsson 2016-02-08 10:19:30 +01:00
parent fbcdb07768
commit dd1e967b60
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/xdg-app-builtins-build-finish.c
View File

@ -183,14 +183,12 @@ collect_exports (GFile *base, const char *app_id, gboolean is_runtime, GCancella
g_autoptr(GFile) export = NULL;
const char *app_paths[] = {
"share/applications", /* Copy desktop files */
"share/app-info", /* Copy appstream files */
"share/icons/hicolor", /* Icons */
"share/dbus-1/services", /* D-Bus service files */
"share/gnome-shell/search-providers", /* Search providers */
NULL,
};
const char *runtime_paths[] = {
"share/app-info", /* Copy appstream files */
NULL,
};
const char **paths;

4
common/xdg-app-utils.c
View File

@ -1581,7 +1581,7 @@ copy_icon (const char *id,
g_autofree char *icon_name = g_strconcat (id, ".png", NULL);
g_autoptr(GFile) icons_dir =
g_file_resolve_relative_path (root,
"export/share/app-info/icons/xdg-app");
"files/share/app-info/icons/xdg-app");
g_autoptr(GFile) size_dir =g_file_get_child (icons_dir, size);
g_autoptr(GFile) icon_file = g_file_get_child (size_dir, icon_name);
g_autoptr(GFile) dest_dir = g_file_get_child (dest, "icons");
@ -1632,7 +1632,7 @@ extract_appstream (OstreeRepo *repo,
if (!ostree_repo_read_commit (repo, ref, &root, NULL, NULL, error))
return FALSE;
xmls_dir = g_file_resolve_relative_path (root, "export/share/app-info/xmls");
xmls_dir = g_file_resolve_relative_path (root, "files/share/app-info/xmls");
appstream_basename = g_strconcat (id, ".xml.gz", NULL);
appstream_file = g_file_get_child (xmls_dir, appstream_basename);