[geary: 3/3] Merge branch 'wip/ricotz/webkit'. Fixes Bug 788113.

[Michael Gratton <mjog src gnome org>]

commit 43341cd3e399155c38afb9efa630b5d48988ee5d
Merge: ffb4bef 93a7da0
Author: Michael James Gratton <mike vee net>
Date:   Sat May 19 10:06:45 2018 +1000

    Merge branch 'wip/ricotz/webkit'. Fixes Bug 788113.
    
    This became necessary sooner rather than later since WebKitGTK 2.21
    with the upstream valac bindings are now incompatible with the custom
    in-source bindings.

 bindings/meson.build                               |   70 ---------
 bindings/metadata/Soup-2.4.metadata                |    3 -
 bindings/metadata/WebKit2-4.0.metadata             |   19 ---
 .../metadata/WebKit2WebExtension-4.0-custom.vala   |    5 -
 bindings/metadata/WebKit2WebExtension-4.0.metadata |    9 -
 bindings/vapi/javascriptcore-4.0.vapi              |  155 --------------------
 meson.build                                        |   10 +-
 src/CMakeLists.txt                                 |   39 +-----
 .../conversation-viewer/conversation-web-view.vala |    2 +-
 src/client/util/util-webkit.vala                   |   10 +-
 src/client/web-process/web-process-extension.vala  |   21 +--
 src/engine/util/util-js.vala                       |   18 +--
 test/CMakeLists.txt                                |    2 +-
 13 files changed, 29 insertions(+), 334 deletions(-)
---