Skip to content

Commit

Permalink
Use appstreamcli for appdata validation
Browse files Browse the repository at this point in the history
appstream-util is obsoleted by appstreamcli.

Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1326>
  • Loading branch information
mcatanzaro authored and Marge Bot committed May 7, 2023
1 parent 20e4fda commit 43f3a37
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions data/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ appdata = i18n.merge_file(
install_dir: join_paths(datadir, 'metainfo'),
po_dir: po_dir
)
appstream_util = find_program('appstream-util', required: false)

# We need three custom_target() calls because Meson doesn't have very
# good support for GSettings yet. First, generate our GSettings enums
Expand Down Expand Up @@ -134,12 +133,12 @@ if desktop_file_validate.found()
)
endif

appstream_util = find_program('appstream-util', required: false)
if appstream_util.found()
appstreamcli = find_program('appstreamcli', required: false)
if appstreamcli.found()
test(
'validate-appdata', appstream_util,
'validate-appdata', appstreamcli,
args: [
'validate-relax', '--nonet', appdata.full_path()
'validate', '--no-net', appdata.full_path()
],
depends: appdata
)
Expand Down

0 comments on commit 43f3a37

Please sign in to comment.