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
|
From ae5a4e5027ebb2937fa795492d1451f3d0a6758b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
Date: Wed, 9 Apr 2025 20:05:57 +0200
Subject: [PATCH] Use appstream for appdata validation test
appstream-glib is under heavy maintenance mode and recommends using
appstream instead. Also fix duplicate key error by replacing custom
elements with standard ones.
---
data/meson.build | 6 +++---
data/org.gnome.Taquin.appdata.xml.in | 9 +++++----
meson.build | 2 +-
3 files changed, 9 insertions(+), 8 deletions(-)
--- a/data/meson.build
+++ b/data/meson.build
@@ -52,11 +52,11 @@
)
# Validate AppData file
-if appstream_util.found()
+if appstreamcli.found()
test(
- 'validate-appdata', appstream_util,
+ 'validate-appdata', appstreamcli,
args: [
- 'validate', '--nonet', appdata_file.full_path()
+ 'validate', '--no-net', '--explain', appdata_file.full_path()
]
)
endif
--- a/data/org.gnome.Taquin.appdata.xml.in
+++ b/data/org.gnome.Taquin.appdata.xml.in
@@ -33,6 +33,11 @@
<kudo>ModernToolkit</kudo>
<kudo>UserDocs</kudo>
</kudos>
+ <recommends>
+ <control>keyboard</control>
+ <control>pointing</control>
+ <control>touch</control>
+ </recommends>
<translation type="gettext">gnome-taquin</translation>
<developer_name>The GNOME Project</developer_name>
<content_rating type="oars-1.0">
--- a/meson.build
+++ b/meson.build
@@ -22,7 +22,7 @@
rsvg_dependency = dependency('librsvg-2.0', version: '>= 2.32.0')
desktop_file_validate = find_program('desktop-file-validate', required: false)
-appstream_util = find_program('appstream-util', required: false)
+appstreamcli = find_program('appstreamcli', required: false)
glib_compile_schema = find_program('glib-compile-schemas', required: true)
add_global_arguments('-DGETTEXT_PACKAGE="@0@"'.format (meson.project_name()), language: 'c')
|
