File: use-appstreamcli.patch

package info (click to toggle)
geary 46.0-8
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 15,092 kB
  • sloc: javascript: 972; ansic: 722; sql: 247; xml: 183; python: 30; makefile: 28; sh: 24
file content (74 lines) | stat: -rw-r--r-- 2,743 bytes parent folder | download | duplicates (2)
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
From e56734a97d9ee36b486b34a1a605fd5862b5210c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <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.
---
 .gitlab-ci.yml       |  8 ++++----
 BUILDING.md          |  4 ++--
 desktop/meson.build  |  6 +++---
 meson.build          |  5 +----
 org.gnome.Geary.json | 18 ------------------
 5 files changed, 10 insertions(+), 31 deletions(-)

--- a/BUILDING.md
+++ b/BUILDING.md
@@ -92,7 +92,7 @@
     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 @@
 ```
 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 \
--- a/desktop/meson.build
+++ b/desktop/meson.build
@@ -66,12 +66,12 @@
   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,
--- a/meson.build
+++ b/meson.build
@@ -69,9 +69,6 @@
 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 @@
 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)