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

Add Gspell to dependencies and the build

Browse source
This commit is contained in:
Michael Gratton 2019-05-24 13:50:35 +02:00 • committed by Michael James Gratton
parent 10af58a5f1
commit 4dd08389df
5 changed files with 39 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
.gitlab-ci.yml
View file

@ -24,8 +24,8 @@ variables:
FEDORA_DEPS: meson vala
desktop-file-utils enchant2-devel folks-devel gcr-devel
glib2-devel gmime-devel gnome-online-accounts-devel
gtk3-devel iso-codes-devel json-glib-devel itstool
libcanberra-devel libgee-devel libhandy-devel
gspell-devel gtk3-devel iso-codes-devel json-glib-devel
itstool libcanberra-devel libgee-devel libhandy-devel
libsecret-devel libunwind-devel libxml2-devel
libytnef-devel sqlite-devel webkitgtk4-devel
FEDORA_TEST_DEPS: Xvfb tar xz
@ -35,11 +35,11 @@ variables:
desktop-file-utils gettext iso-codes itstool
libcanberra-dev libenchant-dev libfolks-dev
libgcr-3-dev libgee-0.8-dev libglib2.0-dev
libgmime-2.6-dev libgoa-1.0-dev libgtk-3-dev
libhandy-0.0-dev libjson-glib-dev libmessaging-menu-dev
libsecret-1-dev libsqlite3-dev libunity-dev
libunwind-dev libwebkit2gtk-4.0-dev libxml2-dev
libytnef0-dev
libgmime-2.6-dev libgoa-1.0-dev libgspell-1-dev
libgtk-3-dev libhandy-0.0-dev libjson-glib-dev
libmessaging-menu-dev libsecret-1-dev libsqlite3-dev
libunity-dev libunwind-dev libwebkit2gtk-4.0-dev
libxml2-dev libytnef0-dev
UBUNTU_TEST_DEPS: xauth xvfb
fedora:

16
INSTALL
View file

@ -42,10 +42,11 @@ Install them by running this command:
sudo yum install meson vala \
desktop-file-utils enchant2-devel folks-devel gcr-devel \
glib2-devel gmime-devel gnome-online-accounts-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
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
Installing dependencies on Ubuntu/Debian
----------------------------------------
@ -55,9 +56,10 @@ 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 \
libglib2.0-dev libgmime-2.6-dev libgoa-1.0-dev libgtk-3-dev \
libjson-glib-dev libhandy-dev libsecret-1-dev libsqlite3-dev \
libunwind-dev libwebkit2gtk-4.0-dev libxml2-dev libytnef0-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 \
libxml2-dev libytnef0-dev
And for Ubuntu Unity integration:

1
meson.build
View file

@ -62,6 +62,7 @@ gdk = dependency('gdk-3.0', version: '>=' + target_gtk)
gee = dependency('gee-0.8', version: '>= 0.8.5')
gio = dependency('gio-2.0', version: '>=' + target_glib)
goa = dependency('goa-1.0')
gspell = dependency('gspell-1')
gthread = dependency('gthread-2.0', version: '>=' + target_glib)
iso_codes = dependency('iso-codes')
javascriptcoregtk = dependency('javascriptcoregtk-4.0', version: '>=' + target_webkit)

21
org.gnome.Geary.json
View file

@ -100,6 +100,27 @@
}
]
},
{
"name" : "gspell",
"config-opts" : [
"--disable-gtk-doc",
"--disable-gtk-doc-html"
],
"cleanup" : [
"/bin",
"/include",
"/lib/pkgconfig",
"*.la",
"/share"
],
"sources" : [
{
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/gspell.git",
"branch" : "master"
}
]
},
{
"name": "libical",
"cleanup": [

1
src/client/meson.build
View file

@ -121,6 +121,7 @@ geary_client_dependencies = [
gee,
gio,
goa,
gspell,
gtk,
json_glib,
libcanberra,