mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-01-31 11:01:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

appstream: Create symlinks for the icons/$origin subdirectory

Browse Source 
For compatibility with libappstream we create a $origin ("flatpak")
subdirectory with symlinks to the size directories thus matching the
standard merged appstream layout if we assume the appstream has
origin=flatpak, which flatpak-builder creates.

See https://github.com/ximion/appstream/pull/224 for details.

Fixes https://github.com/flatpak/flatpak/pull/2779

Closes: #2789
Approved by: alexlarsson
This commit is contained in:
Alexander Larsson
2019-03-27 09:46:06 +01:00
committed by Atomic Bot
parent 7df32ae388
commit 4c8409ed6a
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/flatpak-utils.c
View File

@@ -3865,6 +3865,7 @@ flatpak_repo_generate_appstream (OstreeRepo *repo,
g_autoptr(GBytes) xml_gz_data = NULL;
g_autoptr(OstreeMutableTree) mtree = ostree_mutable_tree_new ();
g_autoptr(OstreeMutableTree) icons_mtree = NULL;
g_autoptr(OstreeMutableTree) icons_flatpak_mtree = NULL;
g_autoptr(OstreeMutableTree) size1_mtree = NULL;
g_autoptr(OstreeMutableTree) size2_mtree = NULL;
const char *compat_arch;
@@ -3884,6 +3885,19 @@ flatpak_repo_generate_appstream (OstreeRepo *repo,
if (!flatpak_mtree_create_dir (repo, icons_mtree, "128x128", &size2_mtree, error))
return FALSE;
/* For compatibility with libappstream we create a $origin ("flatpak") subdirectory with symlinks
* to the size directories thus matching the standard merged appstream layout if we assume the
* appstream has origin=flatpak, which flatpak-builder creates.
*
* See https://github.com/ximion/appstream/pull/224 for details.
*/
if (!flatpak_mtree_create_dir (repo, icons_mtree, "flatpak", &icons_flatpak_mtree, error))
return FALSE;
if (!flatpak_mtree_create_symlink (repo, icons_flatpak_mtree, "64x64", "../64x64", error))
return FALSE;
if (!flatpak_mtree_create_symlink (repo, icons_flatpak_mtree, "128x128", "../128x128", error))
return FALSE;
appstream_root = flatpak_appstream_xml_new ();
for (i = 0; i < n_keys; i++)