Bump appstreamcli requirement to 1.0.2, pass --icon-policy to compose

README.md

@@ -29,7 +29,7 @@ Configure arguments are documented in `meson_options.txt`.
 ## Runtime dependencies
 
 The `flatpak-builder` tool requires `flatpak` and `appstreamcli` >=
-0.16.3 being available on the host to function. Depending on the
+1.0.2 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:

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.16.3
+APPSTREAMCLI_REQS=1.0.2
 SYSTEM_DEBUGEDIT_REQS=5.0
 LIBDW_REQS=0.172
 

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.16.3')
+appstreamcli = find_program('appstreamcli', version: '>= 1.0.2')
 appstreamcli_compose = run_command(appstreamcli, ['compose', '--help'], check: true)
 
 subdir('src')

src/builder-manifest.c

@@ -3055,6 +3055,7 @@ builder_manifest_cleanup (BuilderManifest *self,
  if (!appstreamcli_compose (error,
  "--no-partial-urls",
  "--prefix=/",
+ "--icon-policy=128x128=cached-remote,128x128@2=cached-remote",
  origin,
  arg_base_url,
  arg_media_dir,