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
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
From: =?utf-8?b?QmFsbMOzIEd5w7ZyZ3k=?= <ballogyor@gmail.com>
Date: Sat, 28 Dec 2024 12:01:40 +0100
Subject: [PATCH] build: Use appstream for appdata validation test
appstream-glib is under heavy maintenance mode and recommends using
appstream instead.
---
BUILDING.md | 4 ++--
desktop/meson.build | 6 +++---
meson.build | 5 +----
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/BUILDING.md b/BUILDING.md
index 9e385ee..b252c1d 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -92,7 +92,7 @@ sudo dnf install meson vala desktop-file-utils enchant2-devel \
folks-devel gcr3-devel glib2-devel gmime30-devel \
gnome-online-accounts-devel gspell-devel gsound-devel \
gtk3-devel iso-codes-devel itstool json-glib-devel \
- libappstream-glib-devel libgee-devel libhandy1-devel \
+ libgee-devel libhandy1-devel \
libpeas-devel libsecret-devel libicu-devel libstemmer-devel \
libunwind-devel libxml2-devel libytnef-devel sqlite-devel \
webkitgtk4-devel
@@ -106,7 +106,7 @@ Install them by running this command:
```
sudo apt-get install meson build-essential valac \
desktop-file-utils iso-codes gettext itstool \
- libappstream-glib-dev libenchant-2-dev libfolks-dev \
+ libenchant-2-dev libfolks-dev \
libgcr-3-dev libgee-0.8-dev libglib2.0-dev libgmime-3.0-dev \
libgoa-1.0-dev libgspell-1-dev libgsound-dev libgtk-3-dev \
libjson-glib-dev libhandy-1-dev libicu-dev libpeas-dev \
diff --git a/desktop/meson.build b/desktop/meson.build
index d5c2c7f..08d7e0a 100644
--- a/desktop/meson.build
+++ b/desktop/meson.build
@@ -66,12 +66,12 @@ appdata_merged = i18n.merge_file(
install_dir: join_paths(data_dir, 'metainfo')
)
-if appstream_util.found()
+if appstreamcli.found()
test(
appdata_file + '-validate',
- appstream_util,
+ appstreamcli,
args: [
- 'validate-relax', '--nonet', appdata_merged.full_path()
+ 'validate', '--no-net', '--explain', appdata_merged.full_path()
],
depends: [
appdata_merged,
diff --git a/meson.build b/meson.build
index 3b487e1..eef982d 100644
--- a/meson.build
+++ b/meson.build
@@ -69,9 +69,6 @@ sqlite = dependency('sqlite3', version: '>= 3.24')
webkit2gtk = dependency('webkit2gtk-4.1', version: '>=' + target_webkit)
# Secondary deps - keep sorted alphabetically
-# We need appdata.its from appstream-glib:
-# https://gitlab.gnome.org/GNOME/geary/issues/439
-appstream_glib = dependency('appstream-glib', version: '>=0.7.10')
cairo = dependency('cairo')
enchant = dependency('enchant-2', version: '>=2.1')
folks = dependency('folks', version: '>=0.11')
@@ -157,7 +154,7 @@ if not libhandy.found()
endif
# Optional dependencies
-appstream_util = find_program('appstream-util', required: false)
+appstreamcli = find_program('appstreamcli', required: false)
desktop_file_validate = find_program('desktop-file-validate', required: false)
libmessagingmenu_dep = dependency('messaging-menu', version: '>= 12.10', required: false)
|
