From e56734a97d9ee36b486b34a1a605fd5862b5210c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= 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(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 571a8e2a..286fd483 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,23 +26,23 @@ variables: 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 json-glib-devel itstool - libappstream-glib-devel libgee-devel libhandy1-devel libicu-devel + libgee-devel libhandy1-devel libicu-devel libpeas1-devel libsecret-devel libstemmer-devel libunwind-devel libxml2-devel libytnef-devel sqlite-devel webkitgtk4-devel git - FEDORA_TEST_DEPS: dbus-daemon glibc-langpack-en gnutls-utils tar Xvfb xz + FEDORA_TEST_DEPS: appstream dbus-daemon glibc-langpack-en gnutls-utils tar Xvfb xz # Ubuntu packages UBUNTU_DEPS: meson build-essential valac desktop-file-utils gettext iso-codes - itstool libappstream-glib-dev libenchant-2-dev libfolks-dev + itstool 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 libhandy-1-dev libicu-dev libjson-glib-dev libmessaging-menu-dev libpeas-dev libsecret-1-dev libsqlite3-dev libstemmer-dev libunwind-dev libwebkit2gtk-4.1-dev libxml2-dev libytnef0-dev git ca-certificates - UBUNTU_TEST_DEPS: gnutls-bin librsvg2-common locales xauth xvfb + UBUNTU_TEST_DEPS: appstream gnutls-bin librsvg2-common locales xauth xvfb fedora: stage: build diff --git a/BUILDING.md b/BUILDING.md index 9e385ee0..b252c1d8 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 d5c2c7f7..08d7e0ae 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 87261bae..faa2d010 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) diff --git a/org.gnome.Geary.json b/org.gnome.Geary.json index b3943f14..2482f693 100644 --- a/org.gnome.Geary.json +++ b/org.gnome.Geary.json @@ -269,24 +269,6 @@ } ] }, - { - "name": "appstream-glib", - "buildsystem": "meson", - "config-opts": [ - "-Dfonts=false", - "-Dgtk-doc=false", - "-Dintrospection=false", - "-Dman=false", - "-Drpm=false" - ], - "sources": [ - { - "type": "git", - "url": "https://github.com/hughsie/appstream-glib.git", - "branch": "main" - } - ] - }, { "name": "geary", "buildsystem": "meson",