[geary/wip/geary-inspector: 18/38] Depend on libhandy for the client build

[Michael Gratton <mjog src gnome org>]

commit 645220955a0ffa35ca7d4e99499862095524d791
Author: Michael Gratton <mike vee net>
Date:   Fri Apr 5 23:32:21 2019 +1100

    Depend on libhandy for the client build

 .gitlab-ci.yml         | 32 ++++++++++++++++----------------
 INSTALL                | 39 +++++++++++++++------------------------
 meson.build            |  1 +
 src/client/meson.build |  2 ++
 src/meson.build        |  5 +++--
 5 files changed, 37 insertions(+), 42 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd6221f9..547067cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,25 +16,25 @@ variables:
   INSTALL_CMD: ninja -v -C $BUILD_DIR install
 
   # Fedora packages
-  FEDORA_DEPS: vala
-               meson desktop-file-utils libcanberra-devel
-               folks-devel libgee-devel glib2-devel gmime-devel
-               gtk3-devel libnotify-devel sqlite-devel
-               webkitgtk4-devel libsecret-devel libxml2-devel
-               vala-tools gcr-devel enchant2-devel libunwind-devel
-               iso-codes-devel gnome-online-accounts-devel itstool
-               json-glib-devel
+  FEDORA_DEPS: meson vala
+               desktop-file-utils enchant2-devel folks-devel gcr-devel
+               glib2-devel gmime-devel gnome-online-accounts-devel
+               gtk3-devel iso-codes-devel json-glib-devel itstool
+               libcanberra-devel libgee-devel libhandy-devel
+               libnotify-devel libsecret-devel libunwind-devel
+               libxml2-devel sqlite-devel webkitgtk4-devel
   FEDORA_TEST_DEPS: Xvfb tar xz
 
   # Ubuntu packages
-  UBUNTU_DEPS: valac build-essential
-               meson desktop-file-utils libcanberra-dev
-               libfolks-dev libgee-0.8-dev libglib2.0-dev
-               libgmime-2.6-dev libgtk-3-dev libsecret-1-dev
-               libxml2-dev libnotify-dev libsqlite3-dev
-               libwebkit2gtk-4.0-dev libgcr-3-dev libenchant-dev
-               libunwind-dev iso-codes libgoa-1.0-dev itstool gettext
-               libmessaging-menu-dev libunity-dev libjson-glib-dev
+  UBUNTU_DEPS: meson build-essential valac
+               desktop-file-utils gettext iso-codes itstool
+               libcanberra-dev libenchant-dev libfolks-dev
+               libgcr-3-dev libgee-0.8-dev libglib2.0-dev
+               libgmime-2.6-dev libgoa-1.0-dev libgtk-3-dev
+               libhandy-dev libjson-glib-dev libmessaging-menu-dev
+               libnotify-dev libsecret-1-dev libsqlite3-dev
+               libunity-dev libunwind-dev libwebkit2gtk-4.0-dev
+               libxml2-dev
   UBUNTU_TEST_DEPS: xauth xvfb
 
 fedora:
diff --git a/INSTALL b/INSTALL
index 446319e8..a9ee7066 100644
--- a/INSTALL
+++ b/INSTALL
@@ -38,40 +38,31 @@ distribution's package repositories:
 Installing dependencies on Fedora
 ---------------------------------
 
-Fedora 25 and later ships with the correct versions of the required
-libraries. Install them by running this command:
+Install them by running this command:
 
-    sudo yum install vala meson desktop-file-utils iso-codes-devel \
-        libcanberra-devel folks-devel libgee-devel glib2-devel \
-        gmime-devel gtk3-devel libnotify-devel sqlite-devel \
-        webkitgtk4-devel libsecret-devel libxml2-devel vala-tools \
-        gcr-devel enchant2-devel libunwind-devel json-glib-devel \
-        gnome-online-accounts-devel itstool
+    sudo yum install meson vala \
+        desktop-file-utils enchant2-devel folks-devel gcr-devel \
+        glib2-devel gmime-devel gnome-online-accounts-devel gtk3-devel \
+        iso-codes-devel json-glib-devel libcanberra-devel \
+        libgee-devel libhandy-devel libnotify-devel libsecret-devel \
+        libunwind-devel libxml2-devel sqlite-devel webkitgtk4-devel
 
 Installing dependencies on Ubuntu/Debian
 ----------------------------------------
 
-Ubuntu 17.10 (Artful) and later ships with the correct versions of the
-required libraries.
-
-Ubuntu 16.04 LTS (Xenial) does not meet the minimum requirements,
-users of that are encourage to use Geary 0.12 LTS instead.
-
-Debian 9 (Stretch) and later ships with the correct versions of the
-required libraries.
-
 Install them by running this command:
 
-    sudo apt-get install valac meson desktop-file-utils iso-codes \
-        libcanberra-dev libfolks-dev libgee-0.8-dev libglib2.0-dev \
-        libgmime-2.6-dev libgtk-3-dev libsecret-1-dev libxml2-dev \
-        libnotify-dev libsqlite3-dev libwebkit2gtk-4.0-dev \
-        libgcr-3-dev libenchant-dev libunwind-dev libgoa-1.0-dev \
-        libjson-glib-dev itstool gettext
+    sudo apt-get install meson build-essential valac \
+        desktop-file-utils iso-codes gettext libcanberra-dev \
+        libenchant-dev libfolks-dev libgcr-3-dev libgee-0.8-dev \
+        libglib2.0-dev libgmime-2.6-dev libgoa-1.0-dev libgtk-3-dev \
+        libjson-glib-dev libhandy-dev libnotify-dev libsecret-1-dev \
+        libsqlite3-dev libunwind-dev libwebkit2gtk-4.0-dev \
+        libxml2-dev
 
 And for Ubuntu Unity integration:
 
-    sudo apt-get install libunity-dev libmessaging-menu-dev
+    sudo apt-get install libmessaging-menu-dev libunity-dev
 
 Running
 -------
diff --git a/meson.build b/meson.build
index 479e5743..23bfa02d 100644
--- a/meson.build
+++ b/meson.build
@@ -66,6 +66,7 @@ iso_codes = dependency('iso-codes')
 javascriptcoregtk = dependency('javascriptcoregtk-4.0', version: '>=' + target_webkit)
 json_glib = dependency('json-glib-1.0', version: '>= 1.0')
 libcanberra = dependency('libcanberra', version: '>= 0.28')
+libhandy = dependency('libhandy-0.0', version: '>= 0.0.9')
 libmath = cc.find_library('m')
 libnotify = dependency('libnotify', version: '>= 0.7.5')
 libsecret = dependency('libsecret-1', version: '>= 0.11')
diff --git a/src/client/meson.build b/src/client/meson.build
index d1c7863a..a2678ec8 100644
--- a/src/client/meson.build
+++ b/src/client/meson.build
@@ -22,6 +22,7 @@ geary_client_vala_sources = files(
   'accounts/accounts-manager.vala',
 
   'components/client-web-view.vala',
+  'components/components-inspector.vala',
   'components/components-placeholder-pane.vala',
   'components/components-validator.vala',
   'components/count-badge.vala',
@@ -120,6 +121,7 @@ geary_client_dependencies = [
   gtk,
   json_glib,
   libcanberra,
+  libhandy,
   libnotify,
   libsecret,
   libsoup,
diff --git a/src/meson.build b/src/meson.build
index ea5509a9..175c4aa9 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -37,9 +37,10 @@ geary_c_options = [
   # Select libunwind's optimised, local-only backtrace unwiding. See
   # libunwind(3).
   '-DUNW_LOCAL_ONLY',
-  # Neither GOA nor GCK want to hang out unless you are cool enough
-  '-DGOA_API_IS_SUBJECT_TO_CHANGE',
+  # None of these kids want to hang out unless you are cool enough
   '-DGCK_API_SUBJECT_TO_CHANGE',
+  '-DGOA_API_IS_SUBJECT_TO_CHANGE',
+  '-DHANDY_USE_UNSTABLE_API',
 ]
 
 subdir('sqlite3-unicodesn')