From 3d86c345be58b1e7f15a775f023de98d7e13d930 Mon Sep 17 00:00:00 2001
From: Michael Gratton <mike@vee.net>
Date: Thu, 23 Jan 2020 22:56:17 +1100
Subject: [PATCH] Remove libhandy git submodule, bump minimum version to 0.10

Fixes Flatpak CI FTB, distros are all packaging it anyway.
---
 .gitmodules          |  3 ---
 meson.build          | 22 +---------------------
 org.gnome.Geary.json |  3 ++-
 org.gnome.Geary.yml  |  1 +
 subprojects/libhandy |  1 -
 5 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 160000 subprojects/libhandy

diff --git a/.gitmodules b/.gitmodules
index f4788ba4..e69de29b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "subprojects/libhandy"]
-	path = subprojects/libhandy
-	url = https://source.puri.sm/Librem5/libhandy.git
diff --git a/meson.build b/meson.build
index c8e0c277..0bb4eea5 100644
--- a/meson.build
+++ b/meson.build
@@ -79,7 +79,7 @@ gthread = dependency('gthread-2.0', version: '>=' + target_glib)
 iso_codes = dependency('iso-codes')
 javascriptcoregtk = dependency('javascriptcoregtk-4.0', version: '>=' + target_webkit)
 json_glib = dependency('json-glib-1.0', version: '>= 1.0')
-libhandy = dependency('libhandy-0.0', version: '>= 0.0.9', required: false)
+libhandy = dependency('libhandy-0.0', version: '>= 0.0.10')
 libmath = cc.find_library('m')
 libpeas = dependency('libpeas-1.0', version: '>= 1.24.0')
 libsecret = dependency('libsecret-1', version: '>= 0.11')
@@ -100,26 +100,6 @@ if not enchant.found()
   enchant = dependency('enchant', version: '>=1.6')
 endif
 
-# Handy isn't necessarily packaged by distros, so fall back to a
-# subproject until it is.
-if not libhandy.found()
-  libhandy_subproj = subproject(
-    'libhandy',
-    default_options: [
-      'examples=false',
-      'glade_catalog=disabled',
-      'tests=false',
-    ]
-  )
-
-  libhandy = declare_dependency(
-    dependencies: [
-      libhandy_subproj.get_variable('libhandy_dep'),
-      libhandy_subproj.get_variable('libhandy_vapi'),
-    ]
-  )
-endif
-
 # Libunwind system dependencies above ensures appropriate versions,
 # but this declared depencency is what we actually build against so we
 # can include the custom VAPI correctly. We need to add unwind_lib to
diff --git a/org.gnome.Geary.json b/org.gnome.Geary.json
index be08b087..093939f4 100644
--- a/org.gnome.Geary.json
+++ b/org.gnome.Geary.json
@@ -180,7 +180,8 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://source.puri.sm/Librem5/libhandy.git"
+                    "url": "https://source.puri.sm/Librem5/libhandy.git",
+                    "branch": "v0.0.13"
                 }
             ]
         },
diff --git a/org.gnome.Geary.yml b/org.gnome.Geary.yml
index b8bb7336..d2c7f232 100644
--- a/org.gnome.Geary.yml
+++ b/org.gnome.Geary.yml
@@ -184,6 +184,7 @@ modules:
     sources:
       - type: git
         url: https://source.puri.sm/Librem5/libhandy.git
+        branch: v0.0.13
 
   # Geary dependency
   - name: libpeas
diff --git a/subprojects/libhandy b/subprojects/libhandy
deleted file mode 160000
index b6ff87ea..00000000
--- a/subprojects/libhandy
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b6ff87ea07c69171aa7c743d8c2740527b525271