From 9f9aa465c3174150134435e2b371490c1c235727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= Date: Wed, 27 Dec 2023 21:10:58 -0500 Subject: [PATCH] builder-manifest: run appstreamcli compose with --no-partial-urls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only when mirroring. This is to be compatible with existing flatpak deployment and appstream-glib See https://github.com/ximion/appstream/issues/505 Should fix https://github.com/flatpak/flatpak-builder/issues/573 Signed-off-by: Hubert Figuière --- README.md | 6 +++--- meson.build | 2 +- src/builder-manifest.c | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 60ac3495..12be7dfc 100644 --- a/README.md +++ b/README.md @@ -28,9 +28,9 @@ Configure arguments are documented in `meson_options.txt`. ## Runtime dependencies -The `flatpak-builder` tool requires `flatpak` being available on the host to -function. Depending on the manifest used it also requires some commands be available on -the host. +The `flatpak-builder` tool requires `flatpak` and `appstreamcli` >= +0.16.3 being available on the host to function. Depending on the +manifest used it also requires some commands be available on the host. Very commonly used: diff --git a/meson.build b/meson.build index e344f9a5..ef1cbcf4 100644 --- a/meson.build +++ b/meson.build @@ -41,7 +41,7 @@ endforeach debugedit = find_program('debugedit', version: '>= 5.0') # Require appstream with compose plugin installed -appstreamcli = find_program('appstreamcli', version: '>= 0.15.0') +appstreamcli = find_program('appstreamcli', version: '>= 0.16.3') appstreamcli_compose = run_command(appstreamcli, ['compose', '--help'], check: true) subdir('src') diff --git a/src/builder-manifest.c b/src/builder-manifest.c index 27312714..ab0ae512 100644 --- a/src/builder-manifest.c +++ b/src/builder-manifest.c @@ -3053,6 +3053,7 @@ builder_manifest_cleanup (BuilderManifest *self, g_print ("Running appstreamcli compose\n"); g_print ("Saving screenshots in %s\n", flatpak_file_get_path_cached (media_dir)); if (!appstreamcli_compose (error, + "--no-partial-urls", "--prefix=/", origin, arg_base_url,