[gnome-builder] build: Use jsonrpc-glib subproject as fallback



commit dfe0b3ef35d820d25fa1ca481ffe710f489dc206
Author: Patrick Griffis <tingping tingping se>
Date:   Mon Jun 5 18:03:45 2017 -0400

    build: Use jsonrpc-glib subproject as fallback

 .gitmodules              |    3 +++
 meson.build              |    4 +++-
 subprojects/jsonrpc-glib |    1 +
 3 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index 054b71c..c73af41 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "subprojects/libgd"]
        path = subprojects/libgd
        url = https://git.gnome.org/browse/libgd
+[submodule "subprojects/jsonrpc-glib"]
+       path = subprojects/jsonrpc-glib
+       url = https://git.gnome.org/browse/jsonrpc-glib
diff --git a/meson.build b/meson.build
index 7af7998..d391556 100644
--- a/meson.build
+++ b/meson.build
@@ -127,7 +127,9 @@ libm_dep = cc.find_library('m', required: false)
 libjson_glib_dep = dependency('json-glib-1.0', version: '>= 1.2.0')
 libdazzle_dep = dependency('libdazzle-1.0', version: '>= 0.1.0')
 libtemplate_glib_dep = dependency('template-glib-1.0', version: '>= 3.25.2')
-libjsonrpc_glib_dep = dependency('jsonrpc-glib-1.0', version: '>= 3.25.2')
+libjsonrpc_glib_dep = dependency('jsonrpc-glib-1.0', version: '>= 3.25.2',
+  fallback: ['jsonrpc-glib', 'libjsonrpc_glib_dep']
+)
 
 libgd = subproject('libgd',
   default_options: [
diff --git a/subprojects/jsonrpc-glib b/subprojects/jsonrpc-glib
new file mode 160000
index 0000000..21810e6
--- /dev/null
+++ b/subprojects/jsonrpc-glib
@@ -0,0 +1 @@
+Subproject commit 21810e6cbb88e586d432f424e9d72e124563ff99


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]