[epiphany] build: Add libhandy-0.0 dependency
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] build: Add libhandy-0.0 dependency
- Date: Thu, 29 Nov 2018 20:22:52 +0000 (UTC)
commit ed4b901e3a51bc448344ec5fd89e8f4430bb2262
Author: Adrien Plazas <kekun plazas laposte net>
Date: Tue Nov 27 06:56:06 2018 +0100
build: Add libhandy-0.0 dependency
This is needed to access widgets to make the title widget adaptive.
This also adds libhandy as a submodule and will make use of that version
if it isn't available otherwise.
meson.build | 11 +++++++++++
src/meson.build | 1 +
subprojects/libhandy.wrap | 4 ++++
3 files changed, 16 insertions(+)
---
diff --git a/meson.build b/meson.build
index ccfc48088..4db469a1a 100644
--- a/meson.build
+++ b/meson.build
@@ -86,6 +86,7 @@ icu_uc_dep = dependency('icu-uc', version: '>= 4.6')
iso_codes_dep = dependency('iso-codes', version: '>= 0.35')
json_glib_dep = dependency('json-glib-1.0', version: '>= 1.2.4')
libdazzle_dep = dependency('libdazzle-1.0', version: '>= 3.29.4', required: false)
+libhandy_dep = dependency('libhandy-0.0', version: '>= 0.0.5', required: false)
libnotify_dep = dependency('libnotify', version: '>= 0.5.1')
libsecret_dep = dependency('libsecret-1', version: '>= 0.14')
libsoup_dep = dependency('libsoup-2.4', version: '>= 2.48.0')
@@ -104,6 +105,16 @@ if not libdazzle_dep.found()
'with_vapi=false']).get_variable('libdazzle_dep')
endif
+# Ubuntu 18.04 doesn't have libhandy at all, and we need 0.0.5, so bundle it if
+# the system copy is missing or too old.
+if not libhandy_dep.found()
+ libhandy_dep = subproject('libhandy', default_options: ['examples=false',
+ 'glade_catalog=false',
+ 'introspection=false',
+ 'tests=false',
+ 'vapi=false']).get_variable('libhandy_dep')
+endif
+
cc = meson.get_compiler('c')
gmp_dep = cc.find_library('gmp')
m_dep = cc.find_library('m', required: false)
diff --git a/src/meson.build b/src/meson.build
index 3d4c6d137..967ea1143 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -53,6 +53,7 @@ libephymain_deps = [
ephymisc_dep,
ephysync_dep,
ephywidgets_dep,
+ libhandy_dep,
libnotify_dep
]
diff --git a/subprojects/libhandy.wrap b/subprojects/libhandy.wrap
new file mode 100644
index 000000000..343f11104
--- /dev/null
+++ b/subprojects/libhandy.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory=libhandy
+url=https://source.puri.sm/Librem5/libhandy.git
+revision=9c99704e4cc02d8aff8c03ebd583197677f67e52
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]