[gnome-boxes/libhandy-submodule-gnome-3-38] subprojects: Turn libhandy into a submodule for non-Flatpak builds

[Felipe Borges <felipeborges src gnome org>]

commit 40ec44f7ece7b8451a2523eed8b45584ee012e3a
Author: Felipe Borges <felipeborges gnome org>
Date:   Tue Sep 22 15:28:41 2020 +0200

    subprojects: Turn libhandy into a submodule for non-Flatpak builds
    
    Fixes #597

 .gitmodules               |  4 ++++
 src/meson.build           | 14 +++++++++++++-
 subprojects/libhandy      |  1 +
 subprojects/libhandy.wrap |  4 ++++
 4 files changed, 22 insertions(+), 1 deletion(-)
---
diff --git a/.gitmodules b/.gitmodules
index 524c0083..7744bc3a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,3 +5,7 @@
 [submodule "subprojects/libovf-glib"]
        path = subprojects/libovf-glib
        url = https://gitlab.gnome.org/felipeborges/libovf-glib.git
+
+[submodule "subprojects/libhandy"]
+       path = subprojects/libhandy
+       url = https://gitlab.gnome.org/GNOME/libhandy.git
diff --git a/src/meson.build b/src/meson.build
index 028750c5..b7987689 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -147,7 +147,6 @@ dependencies = [
   dependency ('tracker-sparql-2.0'),
   dependency ('vte-2.91', version: '>= 0.40.2'),
   dependency ('webkit2gtk-4.0', version: '>= 2.26.0'),
-  dependency ('libhandy-0.0', version: '>= 0.0.11'),
   cc.find_library('m', required : false),
   valac.find_library ('gio-2.0-workaround', dirs: vapi_dir),
   valac.find_library ('linux'),
@@ -155,6 +154,7 @@ dependencies = [
   valac.find_library ('spice-client-gtk-3.0'),
 ]
 
+
 if get_option('rdp')
   vala_sources += ['rdp-display.vala']
 
@@ -165,6 +165,7 @@ if get_option('flatpak')
   vala_args += '--define=FLATPAK'
 
   dependencies += dependency ('govf-0.1')
+  dependencies += dependency ('libhandy-0.0', version: '>= 0.0.11')
 
   if get_option('rdp')
     dependencies += dependency ('gtk-frdp-0.1')
@@ -174,6 +175,17 @@ else
     dependency ('gudev-1.0', version: '>= 165'),
   ]
 
+  libhandy = subproject(
+    'libhandy',
+    default_options: [
+      'package_subdir=' + meson.project_name(),
+      'examples=false',
+      'glade_catalog=disabled',
+      'tests=false',
+    ]
+  )
+  dependencies += libhandy.get_variable('libhandy_vapi')
+
   if get_option('rdp')
     gtk_frdp = subproject(
       'gtk-frdp',
diff --git a/subprojects/libhandy b/subprojects/libhandy
new file mode 160000
index 00000000..aa6b6f43
--- /dev/null
+++ b/subprojects/libhandy
@@ -0,0 +1 @@
+Subproject commit aa6b6f43d505383538a2a3e7b4fcdd6a8ada85ff
diff --git a/subprojects/libhandy.wrap b/subprojects/libhandy.wrap
new file mode 100644
index 00000000..5bfca8ba
--- /dev/null
+++ b/subprojects/libhandy.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory=libhandy
+url=https://gitlab.gnome.org/gnome/libhandy.git
+revision=libhandy-0-0