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

Revert "Merge branch 'wip/ricotz/webkit'. Fixes Bug 788113."

Browse source 
This reverts commit 43341cd3e3, reversing
changes made to ffb4befdd8.

This is causing segfault in Geary.JS.to_string_released() when running
client tests, so reverting until a solution is found.
This commit is contained in:
Michael James Gratton 2018-05-19 13:57:58 +10:00
parent d4aaa3c551
commit 386f9864c7
13 changed files with 334 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
meson.build
View file

@ -59,6 +59,8 @@ gio = dependency('gio-2.0', version: '>=' + target_glib)
gobject_introspection = dependency('gobject-introspection-1.0')
gthread = dependency('gthread-2.0', version: '>=' + target_glib)
javascriptcoregtk = dependency('javascriptcoregtk-4.0', version: '>=' + target_webkit)
javascriptcoregtk_lib = cc.find_library('javascriptcoregtk-4.0')
javascriptcoregtk_vapi = valac.find_library('javascriptcore-4.0', dirs: vapi_dir)
libcanberra = dependency('libcanberra', version: '>= 0.28')
libmath = cc.find_library('m')
libnotify = dependency('libnotify', version: '>= 0.7.5')
@ -69,7 +71,8 @@ libunwind_generic_dep = dependency('libunwind-generic', version: '>= 1.1')
libxml = dependency('libxml-2.0', version: '>= 2.7.8')
posix = valac.find_library('posix')
sqlite = dependency('sqlite3', version: '>= 3.12')
webkit2gtk_web_extension = dependency('webkit2gtk-web-extension-4.0', version: '>=' + target_webkit)
webkit2gtk_dep = dependency('webkit2gtk-4.0', version: '>=' + target_webkit)
webkit2gtk_web_extension_dep = dependency('webkit2gtk-web-extension-4.0', version: '>=' + target_webkit)
# Libunwind system dependencies above ensures appropriate versions,
# but this declared depencency is what we actually build against so we
@ -100,6 +103,9 @@ if enable_valadoc
valadoc = find_program('valadoc')
endif
# This will provide our custom dependencies, such as webkit2gtk
subdir('bindings')
# Language detection
iso_codes_dir = join_paths('/', 'usr', 'share', 'xml', 'iso-codes')
if iso_639_xml == ''