From a972236bb22b63196629f04500dc9be58b2cd166 Mon Sep 17 00:00:00 2001
From: Michael James Gratton <mike@vee.net>
Date: Fri, 15 Dec 2017 15:08:02 +1100
Subject: [PATCH] Update WebKit and JSC dependencies in Meson build.

* bindings/meson.build: Declare a dependency for JSC that includes both
  the lib, VAPI and appropriate build directory. Update WK dependencies
  to reflect the same that their pkg-config files currently do, sort.

* meson.build: Rename top-level JSC deps to make it clear what they are
  for.

* src/engine/meson.build: Depend on JSC rather than WK, sort deps.
---
 bindings/meson.build   | 36 ++++++++++++++++++++++--------------
 meson.build            |  4 ++--
 src/engine/meson.build |  4 ++--
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/bindings/meson.build b/bindings/meson.build
index db55b943..6e9c7256 100644
--- a/bindings/meson.build
+++ b/bindings/meson.build
@@ -7,6 +7,17 @@
 
 
 girdir = gobject_introspection.get_pkgconfig_variable('girdir')
+webkit2gtk_include = include_directories(
+  webkit2gtk_dep.get_pkgconfig_variable('includedir') + '/webkitgtk-4.0'
+)
+
+javascriptcoregtk = declare_dependency(
+  dependencies: [
+    javascriptcoregtk_lib,
+    javascriptcoregtk_vapi
+  ],
+  include_directories: webkit2gtk_include
+)
 
 webkit2gtk_vapi = gnome.generate_vapi('webkit2gtk-4.8',
   sources: join_paths(girdir, 'WebKit2-4.0.gir'),
@@ -21,15 +32,14 @@ webkit2gtk_vapi = gnome.generate_vapi('webkit2gtk-4.8',
 
 webkit2gtk = declare_dependency(
   dependencies: [
-    webkit2gtk_vapi,
-    javascriptcore,
+    cc.find_library('webkit2gtk-4.0'),
+    glib,
+    gtk,
     javascriptcoregtk,
     libsoup,
-    gdk,
-    gtk,
-    cc.find_library('webkit2gtk-4.0'),
+    webkit2gtk_vapi
   ],
-  include_directories: include_directories(webkit2gtk_dep.get_pkgconfig_variable('includedir')+'/webkitgtk-4.0/'),
+  include_directories: webkit2gtk_include
 )
 
 
@@ -49,14 +59,12 @@ webkit2gtk_web_extension_vapi = gnome.generate_vapi('webkit2gtk-web-extension-4.
 
 webkit2gtk_web_extension = declare_dependency(
   dependencies: [
-    webkit2gtk_web_extension_vapi,
-    glib,
-    gio,
-    gtk,
-    libsoup,
-    javascriptcore,
-    javascriptcoregtk,
     cc.find_library('webkit2gtk-4.0'),
+    glib,
+    gtk,
+    javascriptcoregtk,
+    libsoup,
+    webkit2gtk_web_extension_vapi,
   ],
-  include_directories: include_directories(webkit2gtk_web_extension_dep.get_pkgconfig_variable('includedir')+'/webkitgtk-4.0/'),
+  include_directories: webkit2gtk_include
 )
diff --git a/meson.build b/meson.build
index 21859803..99c02af4 100644
--- a/meson.build
+++ b/meson.build
@@ -59,8 +59,8 @@ gcr = dependency('gcr-3', version: '>= 3.10.1')
 gobject_introspection = dependency('gobject-introspection-1.0')
 webkit2gtk_dep = dependency('webkit2gtk-4.0', version: '>=' + target_webkit)
 webkit2gtk_web_extension_dep = dependency('webkit2gtk-web-extension-4.0', version: '>=' + target_webkit)
-javascriptcore = valac.find_library('javascriptcore-4.0', dirs: vapi_dir)
-javascriptcoregtk = cc.find_library('javascriptcoregtk-4.0', version: '>=' + target_webkit)
+javascriptcoregtk_lib = cc.find_library('javascriptcoregtk-4.0', version: '>=' + target_webkit)
+javascriptcoregtk_vapi = valac.find_library('javascriptcore-4.0', dirs: vapi_dir)
 enchant = dependency('enchant', version: '>= 1.6')
 libunwind = declare_dependency(
   dependencies: [
diff --git a/src/engine/meson.build b/src/engine/meson.build
index 1bf41700..89431eab 100644
--- a/src/engine/meson.build
+++ b/src/engine/meson.build
@@ -324,11 +324,11 @@ geary_engine_dependencies = [
   gio,
   glib,
   gmime,
+  javascriptcoregtk,
   libunwind,
   libxml,
   posix,
-  sqlite,
-  webkit2gtk,
+  sqlite
 ]
 
 geary_engine_lib = static_library('geary-engine',