Remove libhandy git submodule, bump minimum version to 0.10

Fixes Flatpak CI FTB, distros are all packaging it anyway.
This commit is contained in:
Michael Gratton 2020-01-23 22:56:17 +11:00 committed by Michael James Gratton
parent 411a7198e3
commit 3d86c345be
5 changed files with 4 additions and 26 deletions

3
.gitmodules vendored
View file

@ -1,3 +0,0 @@
[submodule "subprojects/libhandy"]
path = subprojects/libhandy
url = https://source.puri.sm/Librem5/libhandy.git

View file

@ -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

View file

@ -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"
}
]
},

View file

@ -184,6 +184,7 @@ modules:
sources:
- type: git
url: https://source.puri.sm/Librem5/libhandy.git
branch: v0.0.13
# Geary dependency
- name: libpeas

@ -1 +0,0 @@
Subproject commit b6ff87ea07c69171aa7c743d8c2740527b525271