[gnome-builder/wip/chergert/razzledazzle] build: use external dependency for jsonrpc-glib



commit e0a331479bfc7c630223febb32ebf187b4b3265a
Author: Christian Hergert <chergert redhat com>
Date:   Sat Jun 3 02:06:42 2017 -0700

    build: use external dependency for jsonrpc-glib

 contrib/jsonrpc-glib/jsonrpc-client.c              | 1387 --------------------
 contrib/jsonrpc-glib/jsonrpc-client.h              |  116 --
 contrib/jsonrpc-glib/jsonrpc-glib.h                |   38 -
 .../jsonrpc-glib/jsonrpc-input-stream-private.h    |   30 -
 contrib/jsonrpc-glib/jsonrpc-input-stream.c        |  381 ------
 contrib/jsonrpc-glib/jsonrpc-input-stream.h        |   60 -
 contrib/jsonrpc-glib/jsonrpc-message.c             |  494 -------
 contrib/jsonrpc-glib/jsonrpc-message.h             |  192 ---
 contrib/jsonrpc-glib/jsonrpc-output-stream.c       |  431 ------
 contrib/jsonrpc-glib/jsonrpc-output-stream.h       |   68 -
 contrib/jsonrpc-glib/jsonrpc-server.c              |  159 ---
 contrib/jsonrpc-glib/jsonrpc-server.h              |   62 -
 contrib/jsonrpc-glib/jsonrpc-version.h.in          |   98 --
 contrib/jsonrpc-glib/meson.build                   |   89 --
 contrib/jsonrpc-glib/test-message.c                |  179 ---
 contrib/jsonrpc-glib/test-server.c                 |  179 ---
 contrib/jsonrpc-glib/test-stress.c                 |  213 ---
 libide/meson.build                                 |   11 +-
 meson.build                                        |    2 +-
 19 files changed, 6 insertions(+), 4183 deletions(-)
---
diff --git a/libide/meson.build b/libide/meson.build
index b7712be..79e212f 100644
--- a/libide/meson.build
+++ b/libide/meson.build
@@ -603,7 +603,6 @@ libide_deps = [
   dependency('pangoft2', version: '>= 1.38.0'),
   dependency('gspell-1', version: '>= 1.2.0'),
   dependency('enchant'),
-  libdazzle_dep,
   libgtksource_dep,
   libgio_dep,
   libgiounix_dep,
@@ -615,7 +614,7 @@ libide_deps = [
   libgd_dep,
   libnautilus_dep,
   libjson_glib_dep,
-  libjsonrpc_dep,
+  libjsonrpc_glib_dep,
 ]
 
 contrib_dir = join_paths(meson.source_root(), 'contrib/')
@@ -685,9 +684,9 @@ libide_dep = declare_dependency(
                          libgio_dep,
                          libgtk_dep,
                          libgtksource_dep,
-                         libdazzle_dep,
                          libtemplate_glib_dep,
-                         libjson_glib_dep ],
+                         libjson_glib_dep,
+                         libjsonrpc_glib_dep ],
             link_with: libide,
   include_directories: include_directories('.'),
 )
@@ -700,9 +699,9 @@ libide_plugin_dep = declare_dependency(
                          libgio_dep,
                          libgtk_dep,
                          libgtksource_dep,
-                         libdazzle_dep,
                          libtemplate_glib_dep,
-                         libjson_glib_dep ],
+                         libjson_glib_dep,
+                         libjsonrpc_glib_dep ],
 )
 
 if get_option('with_introspection')
diff --git a/meson.build b/meson.build
index acdc1ef..f7f41d7 100644
--- a/meson.build
+++ b/meson.build
@@ -127,6 +127,7 @@ 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')
 
 if get_option('with_flatpak') or get_option('with_git')
   libgit_dep = dependency('libgit2-glib-1.0', version: '>= 0.25.0')
@@ -176,7 +177,6 @@ subdir('data/gsettings')
 subdir('data/icons')
 subdir('data/style-schemes')
 subdir('contrib/gd')
-subdir('contrib/jsonrpc-glib')
 subdir('contrib/libeditorconfig')
 subdir('contrib/nautilus')
 subdir('contrib/xml')


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