nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '439-appstream-glib' into 'mainline'

Browse source 
add appstream-glib dependency

Closes #439

See merge request GNOME/geary!243
This commit is contained in:
Michael Gratton 2019-06-03 10:31:52 +00:00
commit 5a87cf5436
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci.yml
View file

@ -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

8
INSTALL
View file

@ -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 \

3
meson.build
View file

@ -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')