diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d65098b..418a368c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,15 +25,15 @@ variables: desktop-file-utils enchant2-devel folks-devel gcr-devel glib2-devel gmime-devel gnome-online-accounts-devel gspell-devel gtk3-devel iso-codes-devel json-glib-devel - itstool libcanberra-devel libgee-devel libhandy-devel - libsecret-devel libunwind-devel libxml2-devel + itstool libappstream-glib-devel libcanberra-devel libgee-devel + libhandy-devel libsecret-devel libunwind-devel libxml2-devel libytnef-devel sqlite-devel webkitgtk4-devel FEDORA_TEST_DEPS: Xvfb tar xz # Ubuntu packages UBUNTU_DEPS: meson build-essential valac desktop-file-utils gettext iso-codes itstool - libcanberra-dev libenchant-dev libfolks-dev + libappstream-glib-dev libcanberra-dev libenchant-dev libfolks-dev libgcr-3-dev libgee-0.8-dev libglib2.0-dev libgmime-2.6-dev libgoa-1.0-dev libgspell-1-dev libgtk-3-dev libhandy-0.0-dev libjson-glib-dev diff --git a/INSTALL b/INSTALL index eb7a0c74..556ef8b0 100644 --- a/INSTALL +++ b/INSTALL @@ -44,9 +44,9 @@ Install them by running this command: desktop-file-utils enchant2-devel folks-devel gcr-devel \ glib2-devel gmime-devel gnome-online-accounts-devel \ gspell-devel gtk3-devel iso-codes-devel json-glib-devel \ - libcanberra-devel libgee-devel libhandy-devel libsecret-devel \ - libunwind-devel libxml2-devel libytnef-devel sqlite-devel \ - webkitgtk4-devel + libappstream-glib-devel libcanberra-devel libgee-devel \ + libhandy-devel libsecret-devel libunwind-devel libxml2-devel \ + libytnef-devel sqlite-devel webkitgtk4-devel Installing dependencies on Ubuntu/Debian ---------------------------------------- @@ -55,7 +55,7 @@ Install them by running this command: sudo apt-get install meson build-essential valac \ desktop-file-utils iso-codes gettext libcanberra-dev \ - libenchant-dev libfolks-dev libgcr-3-dev libgee-0.8-dev \ + libappstream-glib-dev libenchant-dev libfolks-dev libgcr-3-dev libgee-0.8-dev \ libglib2.0-dev libgmime-2.6-dev libgoa-1.0-dev libgspell-1-dev \ libgtk-3-dev libjson-glib-dev libhandy-dev libsecret-1-dev \ libsqlite3-dev libunwind-dev libwebkit2gtk-4.0-dev \ diff --git a/meson.build b/meson.build index 1353c2f4..84d95b74 100644 --- a/meson.build +++ b/meson.build @@ -54,6 +54,9 @@ sqlite = dependency('sqlite3', version: '>= 3.12') webkit2gtk = dependency('webkit2gtk-4.0', 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') enchant = dependency('enchant-2', version: '>=2.1', required: false) # see below folks = dependency('folks', version: '>=0.11') gck = dependency('gck-1')