[geary: 4/4] Merge branch 'wip/ricotz/webkit' into 'master'

[Michael Gratton <mjog src gnome org>]

commit 23b974ecf28939d32ac22dad1e7b4c8658918bf7
Merge: a3abfd60 79562f4e
Author: Michael Gratton <mike vee net>
Date:   Sun Jun 10 23:13:25 2018 +0000

    Merge branch 'wip/ricotz/webkit' into 'master'
    
    Use upstream webkit2gtk bindings
    
    See merge request GNOME/geary!2

 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                                        |   9 +-
 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                       |  38 +++--
 src/meson.build                                    |   2 +-
 test/CMakeLists.txt                                |   2 +-
 14 files changed, 45 insertions(+), 339 deletions(-)
---