1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
From 4624b3850dd4ef92ac265949d8273c4fea95b74f Mon Sep 17 00:00:00 2001
From: Matthias Klumpp <matthias@tenstral.net>
Date: Sat, 3 May 2025 04:20:44 +0200
Subject: [PATCH] Validate metainfo data with appstreamcli
The appstream-util tool is deprecated and does not support modern
metadata.
---
data/meson.build | 6 +++---
data/org.gnome.Four-in-a-row.appdata.xml.in | 9 +++++----
meson.build | 6 +++---
3 files changed, 11 insertions(+), 10 deletions(-)
--- a/data/meson.build
+++ b/data/meson.build
@@ -43,11 +43,11 @@
)
# Validate AppData file
-if appstream_util.found()
+if appstream_cli.found()
test(
- 'validate-appdata', appstream_util,
+ 'validate-metainfo', appstream_cli,
args: [
- 'validate', '--nonet', appdata_file.full_path()
+ 'validate', '--no-net', '--explain', appdata_file.full_path()
]
)
endif
--- a/data/org.gnome.Four-in-a-row.appdata.xml.in
+++ b/data/org.gnome.Four-in-a-row.appdata.xml.in
@@ -63,6 +63,11 @@
<content_attribute id="money-purchasing">none</content_attribute>
<content_attribute id="money-gambling">none</content_attribute>
</content_rating>
+ <supports>
+ <control>pointing</control>
+ <control>keyboard</control>
+ <control>touch</control>
+ </supports>
<releases>
<!-- should be kept in versioning inverted order -->
--- a/meson.build
+++ b/meson.build
@@ -25,9 +25,9 @@
rsvg_dependency = dependency('librsvg-2.0', version: '>= 2.32.0')
math_dependency = meson.get_compiler('c').find_library('m')
-appstream_util = find_program('appstream-util', required: false)
-desktop_file_validate = find_program('desktop-file-validate', required: false)
-glib_compile_schema = find_program('glib-compile-schemas', required: true) # useful?
+appstream_cli = find_program('appstreamcli', required: false)
+desktop_file_validate = find_program('desktop-file-validate', required: false)
+glib_compile_schema = find_program('glib-compile-schemas', required: true) # useful?
localedir = join_paths(get_option('prefix'), get_option('localedir'))
datadir = join_paths(get_option('prefix'), get_option('datadir'))
|
