Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

builder-manifest: run appstream compose with --no-partial-urls #576

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

builder-manifest: run appstream compose with --no-partial-urls #576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
1 change: 1 addition & 0 deletions src/builder-manifest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading