From af58f4c6ed05f2c3f85604fb5b6b26840d4e7f48 Mon Sep 17 00:00:00 2001
From: Adrien Plazas <kekun.plazas@laposte.net>
Date: Mon, 17 Sep 2018 13:57:53 +0200
Subject: [PATCH] build: Add libhandy-0.0 dependency

This is needed to access widgets to make the shell adaptive.

This also adds libhandy as a submodule and will make use of that version
if it isn't available otherwise.
---
 .gitmodules          |  3 +++
 meson.build          | 16 ++++++++++++++++
 subprojects/libhandy |  1 +
 3 files changed, 20 insertions(+)
 create mode 160000 subprojects/libhandy

diff --git a/.gitmodules b/.gitmodules
index 5ab4a386d..c7a037aa3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "subprojects/gvc"]
 	path = subprojects/gvc
 	url = https://gitlab.gnome.org/GNOME/libgnome-volume-control.git
+[submodule "subprojects/libhandy"]
+	path = subprojects/libhandy
+	url = https://source.puri.sm/Librem5/libhandy.git
diff --git a/meson.build b/meson.build
index 8cb5f4acc..f344112b0 100644
--- a/meson.build
+++ b/meson.build
@@ -96,6 +96,21 @@ libgvc = subproject(
 )
 libgvc_dep = libgvc.get_variable('libgvc_dep')
 
+libhandy_dep = dependency('libhandy-0.0', version: '>= 0.0.4', required: false)
+if not libhandy_dep.found()
+  libhandy = subproject(
+    'libhandy',
+    default_options: [
+      'examples=false',
+      'glade_catalog=false',
+      'introspection=false',
+      'tests=false',
+      'vapi=false',
+    ]
+  )
+  libhandy_dep = libhandy.get_variable('libhandy_dep')
+endif
+
 goa_req_version = '>= 3.25.3'
 pulse_req_version = '>= 2.0'
 
@@ -122,6 +137,7 @@ common_deps = [
   gio_dep,
   glib_dep,
   gsettings_desktop_dep,
+  libhandy_dep,
   dependency('gio-unix-2.0'),
   dependency('gthread-2.0'),
   dependency('gtk+-3.0', version: '>= 3.22.20')
diff --git a/subprojects/libhandy b/subprojects/libhandy
new file mode 160000
index 000000000..5004b4204
--- /dev/null
+++ b/subprojects/libhandy
@@ -0,0 +1 @@
+Subproject commit 5004b4204a11f021c8e75c7dce034e19c29b987c