[gnome-boxes/libhandy-as-submodule] subprojects: Turn libhandy into a submodule when not found
- From: Felipe Borges <felipeborges src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-boxes/libhandy-as-submodule] subprojects: Turn libhandy into a submodule when not found
- Date: Tue, 22 Sep 2020 14:03:47 +0000 (UTC)
commit 455a56db2987230c755ba7ff2b6a9ebec498897d
Author: Felipe Borges <felipeborges gnome org>
Date: Tue Sep 22 15:28:41 2020 +0200
subprojects: Turn libhandy into a submodule when not found
Fixes #597
.gitmodules | 4 ++++
src/meson.build | 17 ++++++++++++++++-
subprojects/libhandy | 1 +
subprojects/libhandy.wrap | 4 ++++
4 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/.gitmodules b/.gitmodules
index 524c0083..7744bc3a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,3 +5,7 @@
[submodule "subprojects/libovf-glib"]
path = subprojects/libovf-glib
url = https://gitlab.gnome.org/felipeborges/libovf-glib.git
+
+[submodule "subprojects/libhandy"]
+ path = subprojects/libhandy
+ url = https://gitlab.gnome.org/GNOME/libhandy.git
diff --git a/src/meson.build b/src/meson.build
index 0e053a15..19e55e20 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -146,7 +146,6 @@ dependencies = [
dependency ('tracker-sparql-3.0'),
dependency ('vte-2.91', version: '>= 0.40.2'),
dependency ('webkit2gtk-4.0', version: '>= 2.26.0'),
- dependency ('libhandy-0.0', version: '>= 0.0.11'),
cc.find_library('m', required : false),
valac.find_library ('gio-2.0-workaround', dirs: vapi_dir),
valac.find_library ('linux'),
@@ -154,6 +153,22 @@ dependencies = [
valac.find_library ('spice-client-gtk-3.0'),
]
+libhandy = dependency ('libhandy-0.0', version: '>= 0.0.11', required: false)
+if not libhandy.found()
+ libhandy = subproject(
+ 'libhandy',
+ default_options: [
+ 'package_subdir=' + meson.project_name(),
+ 'examples=false',
+ 'glade_catalog=disabled',
+ 'tests=false',
+ ]
+ )
+ dependencies += libhandy.get_variable('libhandy_vapi')
+else
+ dependencies += libhandy
+endif
+
if get_option('rdp')
vala_sources += ['rdp-display.vala']
diff --git a/subprojects/libhandy b/subprojects/libhandy
new file mode 160000
index 00000000..aa6b6f43
--- /dev/null
+++ b/subprojects/libhandy
@@ -0,0 +1 @@
+Subproject commit aa6b6f43d505383538a2a3e7b4fcdd6a8ada85ff
diff --git a/subprojects/libhandy.wrap b/subprojects/libhandy.wrap
new file mode 100644
index 00000000..5bfca8ba
--- /dev/null
+++ b/subprojects/libhandy.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory=libhandy
+url=https://gitlab.gnome.org/gnome/libhandy.git
+revision=libhandy-0-0
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]