From d11e609543fb484b72097cc95249f8829ed7e711 Mon Sep 17 00:00:00 2001
From: Christopher Davis <brainblasted@disroot.org>
Date: Mon, 8 Feb 2021 17:26:36 -0800
Subject: [PATCH] dependencies: Add libhandy as a subproject

Allows for building on systems that don't ship libhandy
or a version of libhandy that's new enough.
---
 libmalcontent-ui/meson.build   | 2 +-
 malcontent-control/meson.build | 2 +-
 meson.build                    | 1 +
 subprojects/libhandy.wrap      | 4 ++++
 4 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 subprojects/libhandy.wrap

diff --git a/libmalcontent-ui/meson.build b/libmalcontent-ui/meson.build
index 7fc0ad7..208741d 100644
--- a/libmalcontent-ui/meson.build
+++ b/libmalcontent-ui/meson.build
@@ -29,7 +29,7 @@ libmalcontent_ui_public_deps = [
   dependency('glib-2.0', version: '>= 2.54.2'),
   dependency('gobject-2.0', version: '>= 2.54'),
   dependency('gtk+-3.0', version: '>= 3.24'),
-  dependency('libhandy-1', version: '>= 1.1.0'),
+  libhandy_dep,
   libmalcontent_dep,
 ]
 libmalcontent_ui_private_deps = [
diff --git a/malcontent-control/meson.build b/malcontent-control/meson.build
index bd9f037..9b9802b 100644
--- a/malcontent-control/meson.build
+++ b/malcontent-control/meson.build
@@ -28,8 +28,8 @@ malcontent_control = executable('malcontent-control',
     dependency('glib-2.0', version: '>= 2.54.2'),
     dependency('gobject-2.0', version: '>= 2.54'),
     dependency('gtk+-3.0'),
-    dependency('libhandy-1', version: '>=1.1.0'),
     dependency('polkit-gobject-1'),
+    libhandy_dep,
     libmalcontent_dep,
     libmalcontent_ui_dep,
   ],
diff --git a/meson.build b/meson.build
index 29a5850..db51b4e 100644
--- a/meson.build
+++ b/meson.build
@@ -134,6 +134,7 @@ else
                        'Malcontent-' + libmalcontent_api_version + '.typelib']
 endif
 if get_option('ui').enabled()
+  libhandy_dep = dependency('libhandy-1', version: '>=1.1.0', fallback: ['libhandy', 'libhandy_dep'])
   subdir('libmalcontent-ui')
 endif
 subdir('malcontent-client')
diff --git a/subprojects/libhandy.wrap b/subprojects/libhandy.wrap
new file mode 100644
index 0000000..509a97a
--- /dev/null
+++ b/subprojects/libhandy.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory = libhandy
+url = https://gitlab.gnome.org/GNOME/libhandy.git
+revision = origin/main