[gnome-bluetooth: 1/6] meson: Add the libhandy 0.0.7 subproject
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-bluetooth: 1/6] meson: Add the libhandy 0.0.7 subproject
- Date: Wed, 30 Jan 2019 09:32:26 +0000 (UTC)
commit b2385d7d0a1477c94e1f364e24386c71d1715228
Author: Adrien Plazas <kekun plazas laposte net>
Date: Thu Sep 20 17:28:15 2018 +0200
meson: Add the libhandy 0.0.7 subproject
This will be needed by the next commit to access HdyColumn.
This also lets the CI recursively update the submodules so it can pass.
.gitlab-ci.yml | 1 +
.gitmodules | 3 +++
lib/meson.build | 1 +
meson.build | 12 ++++++++++++
subprojects/libhandy | 1 +
5 files changed, 18 insertions(+)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33e46eb5..d550e760 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,7 @@ variables:
DEPENDENCIES: gtk-doc gobject-introspection-devel
gtk3-devel systemd-devel libcanberra-devel libnotify-devel
meson redhat-rpm-config gcc glibc-devel
+ GIT_SUBMODULE_STRATEGY: recursive
build_stable:
before_script:
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..f4788ba4
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "subprojects/libhandy"]
+ path = subprojects/libhandy
+ url = https://source.puri.sm/Librem5/libhandy.git
diff --git a/lib/meson.build b/lib/meson.build
index cc37fcd1..258ff28f 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -74,6 +74,7 @@ deps = [
private_deps = [
gio_unix_dep,
libcanberra_gtk_dep,
+ libhandy_dep,
libnotify_dep,
libudev_dep,
]
diff --git a/meson.build b/meson.build
index ed6dc268..0fa969ab 100644
--- a/meson.build
+++ b/meson.build
@@ -100,6 +100,18 @@ gio_dep = dependency('gio-2.0')
gio_unix_dep = dependency('gio-unix-2.0')
gtk_dep = dependency('gtk+-3.0', version: '>= 3.12.0')
libcanberra_gtk_dep = dependency('libcanberra-gtk3')
+libhandy = subproject(
+ 'libhandy',
+ default_options: [
+ 'examples=false',
+ 'glade_catalog=disabled',
+ 'introspection=disabled',
+ 'static=true',
+ 'tests=false',
+ 'vapi=false',
+ ]
+)
+libhandy_dep = libhandy.get_variable('libhandy_dep')
libnotify_dep = dependency('libnotify', version: '>= 0.7.0')
libudev_dep = dependency('libudev')
diff --git a/subprojects/libhandy b/subprojects/libhandy
new file mode 160000
index 00000000..2abaa61b
--- /dev/null
+++ b/subprojects/libhandy
@@ -0,0 +1 @@
+Subproject commit 2abaa61b6af8bb1ab0672756415a264822d0fc5b
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]