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

Merge branch 'mjog/build-updates' into 'mainline'

Browse source 
Build updates

See merge request GNOME/geary!424
This commit is contained in:
Michael Gratton 2020-03-13 07:32:58 +00:00
commit 46541b963b
4 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -37,7 +37,7 @@ variables:
# Ubuntu packages # Ubuntu packages
UBUNTU_DEPS: UBUNTU_DEPS:
meson build-essential valac desktop-file-utils gettext iso-codes meson build-essential valac desktop-file-utils gettext iso-codes
itstool libappstream-glib-dev libenchant-dev libfolks-dev itstool libappstream-glib-dev libenchant-2-dev libfolks-dev
libgcr-3-dev libgee-0.8-dev libglib2.0-dev libgmime-3.0-dev libgcr-3-dev libgee-0.8-dev libglib2.0-dev libgmime-3.0-dev
libgoa-1.0-dev libgspell-1-dev libgtk-3-dev libhandy-0.0-dev libgoa-1.0-dev libgspell-1-dev libgtk-3-dev libhandy-0.0-dev
libjson-glib-dev libmessaging-menu-dev libpeas-dev libsecret-1-dev libjson-glib-dev libmessaging-menu-dev libpeas-dev libsecret-1-dev

11
INSTALL
View file

@ -54,11 +54,12 @@ Install them by running this command:
sudo apt-get install meson build-essential valac \ sudo apt-get install meson build-essential valac \
desktop-file-utils iso-codes gettext itstool \ desktop-file-utils iso-codes gettext itstool \
libappstream-glib-dev libenchant-dev libfolks-dev libgcr-3-dev \ libappstream-glib-dev libenchant-2-dev libfolks-dev \
libgee-0.8-dev libglib2.0-dev libgmime3.0-dev libgoa-1.0-dev \ libgcr-3-dev libgee-0.8-dev libglib2.0-dev libgmime3.0-dev \
libgspell-1-dev libgtk-3-dev libjson-glib-dev libhandy-0.0-dev \ libgoa-1.0-dev libgspell-1-dev libgtk-3-dev libjson-glib-dev \
libpeas-dev libsecret-1-dev libsqlite3-dev libunwind-dev \ libhandy-0.0-dev libpeas-dev libsecret-1-dev libsqlite3-dev \
libwebkit2gtk-4.0-dev libxml2-dev libytnef0-dev libunwind-dev libwebkit2gtk-4.0-dev libxml2-dev \
libytnef0-dev
And for Ubuntu Messaging Menu integration: And for Ubuntu Messaging Menu integration:

12
meson.build
View file

@ -51,10 +51,15 @@ valac = meson.get_compiler('vala')
# Required libraries and other dependencies # Required libraries and other dependencies
# #
target_vala = '0.42'
target_glib = '2.60.4' target_glib = '2.60.4'
target_gtk = '3.24.7' target_gtk = '3.24.7'
target_webkit = '2.26' target_webkit = '2.26'
if not valac.version().version_compare('>=' + target_vala)
error('Vala does not meet minimum required version: ' + target_vala)
endif
# Primary deps # Primary deps
glib = dependency('glib-2.0', version: '>=' + target_glib) glib = dependency('glib-2.0', version: '>=' + target_glib)
gmime = dependency('gmime-3.0', version: '>= 3.2.4') gmime = dependency('gmime-3.0', version: '>= 3.2.4')
@ -66,7 +71,7 @@ webkit2gtk = dependency('webkit2gtk-4.0', version: '>=' + target_webkit)
# We need appdata.its from appstream-glib: # We need appdata.its from appstream-glib:
# https://gitlab.gnome.org/GNOME/geary/issues/439 # https://gitlab.gnome.org/GNOME/geary/issues/439
appstream_glib = dependency('appstream-glib', version: '>=0.7.10') appstream_glib = dependency('appstream-glib', version: '>=0.7.10')
enchant = dependency('enchant-2', version: '>=2.1', required: false) # see below enchant = dependency('enchant-2', version: '>=2.1')
folks = dependency('folks', version: '>=0.11') folks = dependency('folks', version: '>=0.11')
gck = dependency('gck-1') gck = dependency('gck-1')
gcr = dependency('gcr-3', version: '>= 3.10.1') gcr = dependency('gcr-3', version: '>= 3.10.1')
@ -95,11 +100,6 @@ libytnef = dependency('libytnef', version: '>= 1.9.3', required: get_option('tne
posix = valac.find_library('posix') posix = valac.find_library('posix')
webkit2gtk_web_extension = dependency('webkit2gtk-web-extension-4.0', version: '>=' + target_webkit) webkit2gtk_web_extension = dependency('webkit2gtk-web-extension-4.0', version: '>=' + target_webkit)
# Can currently use either Enchant 1 or 2
if not enchant.found()
enchant = dependency('enchant', version: '>=1.6')
endif
# Libunwind system dependencies above ensures appropriate versions, # Libunwind system dependencies above ensures appropriate versions,
# but this declared depencency is what we actually build against so we # but this declared depencency is what we actually build against so we
# can include the custom VAPI correctly. We need to add unwind_lib to # can include the custom VAPI correctly. We need to add unwind_lib to

1
src/meson.build
View file

@ -22,6 +22,7 @@ configure_file(output: 'config.h', configuration: conf)
# Common valac options # Common valac options
geary_vala_args = [ geary_vala_args = [
'--abi-stability',
'--enable-checking', '--enable-checking',
] ]