[gnome-online-accounts/carlosgc/libsoup3: 6/10] Add libsoup3 and librest-1.0 as subprojects
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-online-accounts/carlosgc/libsoup3: 6/10] Add libsoup3 and librest-1.0 as subprojects
- Date: Thu, 16 Jun 2022 19:48:19 +0000 (UTC)
commit 7d5b523c18f4ca7a488f3d46b1492dc2966dc5d3
Author: Emmanuele Bassi <ebassi gnome org>
Date: Thu Jun 16 12:46:03 2022 +0100
Add libsoup3 and librest-1.0 as subprojects
This avoids issues like depending on distribution quirks.
meson.build | 8 ++++++--
subprojects/.gitignore | 2 ++
subprojects/librest.wrap | 4 ++++
subprojects/libsoup.wrap | 4 ++++
4 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index 80a17d8d..791c3d4e 100644
--- a/meson.build
+++ b/meson.build
@@ -100,9 +100,13 @@ if enable_goabackend
javascript_core_gtk_dep = dependency('javascriptcoregtk-4.1', version: '>= 2.33.1')
json_glib_dep = dependency('json-glib-1.0')
libsecret_dep = dependency('libsecret-1')
- libsoup_dep = dependency('libsoup-3.0', version: '>= 2.99.8')
+ libsoup_dep = dependency('libsoup-3.0', version: '>= 3.0', fallback: ['libsoup'])
libxml_dep = dependency('libxml-2.0')
- rest_dep = dependency('rest-1.0')
+ rest_dep = dependency('rest-1.0',
+ version: '>= 0.9.0',
+ fallback: ['librest', 'librest_dep'],
+ default_options: ['soup2=false'],
+ )
webkit_gtk_dep = dependency('webkit2gtk-4.1', version: '>= 2.33.1')
endif
config_h.set('GOA_BACKEND_ENABLED', enable_goabackend)
diff --git a/subprojects/.gitignore b/subprojects/.gitignore
new file mode 100644
index 00000000..feddb5df
--- /dev/null
+++ b/subprojects/.gitignore
@@ -0,0 +1,2 @@
+librest/
+libsoup/
diff --git a/subprojects/librest.wrap b/subprojects/librest.wrap
new file mode 100644
index 00000000..d5219a00
--- /dev/null
+++ b/subprojects/librest.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory=librest
+url=https://gitlab.gnome.org/gnome/librest.git
+revision=master
diff --git a/subprojects/libsoup.wrap b/subprojects/libsoup.wrap
new file mode 100644
index 00000000..812076d1
--- /dev/null
+++ b/subprojects/libsoup.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory=libsoup
+url=https://gitlab.gnome.org/gnome/libsoup.git
+revision=master
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]