[geary/mjog/flatpak-ci-handy-submodule: 1/2] Remove libhandy git submodule, bump minimum version to 0.10



commit e86ef7e2157d9d596abbe08216e8784df4a15b2c
Author: Michael Gratton <mike vee net>
Date:   Thu Jan 23 22:56:17 2020 +1100

    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 +---------------------
 subprojects/libhandy |  1 -
 3 files changed, 1 insertion(+), 25 deletions(-)
---
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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]