builder-manifest: run appstreamcli compose with --no-partial-urls

Only when mirroring. This is to be compatible with existing flatpak deployment and appstream-glib See ximion/appstream#505 Should fix #573 Signed-off-by: Hubert Figuière <[email protected]>
flatpak · Jan 23, 2024 · c9f7ad0 · c9f7ad0
1 parent 63905e5
commit c9f7ad0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git 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/configure.ac b/configure.ac
@@ -18,7 +18,7 @@ AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_70], [Glib max version])
 GLIB_REQS=2.66
 OSTREE_REQS=2017.14
 FLATPAK_REQS=0.99.1
-APPSTREAMCLI_REQS=0.15.0
+APPSTREAMCLI_REQS=0.16.3
 SYSTEM_DEBUGEDIT_REQS=5.0
 LIBDW_REQS=0.172
 

diff --git 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
@@ -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,