[gnome-clocks/zbrown/fix-handy-ci: 6/6] build: fix libhandy build

[Zander <zbrown src gnome org>]

commit 0df855391caefe3b55ec3a40394a21f32a2040e2
Author: Zander Brown <zbrown gnome org>
Date:   Sun Jan 26 23:56:07 2020 +0000

    build: fix libhandy build
    
    handy has changed its pkg-config name on master, follow the `libhandy-0-0` branch instead

 build-aux/flatpak/org.gnome.clocks.json | 27 ++++++++++++++-------------
 meson.build                             |  3 ++-
 subprojects/libhandy.wrap               |  4 ++++
 3 files changed, 20 insertions(+), 14 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.clocks.json b/build-aux/flatpak/org.gnome.clocks.json
index 81523d2..ba95cf3 100644
--- a/build-aux/flatpak/org.gnome.clocks.json
+++ b/build-aux/flatpak/org.gnome.clocks.json
@@ -79,19 +79,20 @@
             ]
         },
         {
-               "name": "libhandy",
-               "buildsystem": "meson",
-               "config-opts": [
-                       "-Dtests=false",
-                       "-Dexamples=false",
-                       "-Dglade_catalog=disabled"
-               ],
-               "sources": [
-                       {
-                               "type": "git",
-                               "url": "https://source.puri.sm/Librem5/libhandy.git";
-                       }
-               ]
+            "name": "libhandy",
+            "buildsystem": "meson",
+            "config-opts": [
+                "-Dtests=false",
+                "-Dexamples=false",
+                "-Dglade_catalog=disabled"
+            ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://source.puri.sm/Librem5/libhandy.git";,
+                    "branch": "libhandy-0-0"
+                }
+            ]
         },
         {
             "name": "gnome-clocks",
diff --git a/meson.build b/meson.build
index 5961d52..620acea 100644
--- a/meson.build
+++ b/meson.build
@@ -19,7 +19,8 @@ gweather = dependency('gweather-3.0', version: '>=3.27.2')
 gnomedesktop = dependency('gnome-desktop-3.0', version: '>=3.8')
 geocodeglib = dependency('geocode-glib-1.0', version: '>=1.0')
 libgeoclue = dependency('libgeoclue-2.0', version: '>=2.4')
-libhandy = dependency ('libhandy-0.0', version: '>= 0.0.10')
+libhandy = dependency ('libhandy-0.0', version: '>= 0.0.10',
+                       fallback: ['libhandy', 'libhandy_dep'])
 
 cc = meson.get_compiler('c')
 math = cc.find_library('m', required: false)
diff --git a/subprojects/libhandy.wrap b/subprojects/libhandy.wrap
new file mode 100644
index 0000000..ddf6431
--- /dev/null
+++ b/subprojects/libhandy.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory=libhandy
+url=https://source.puri.sm/Librem5/libhandy.git
+revision=origin/libhandy-0-0
\ No newline at end of file