Merge pull request #116 from igaw/update-json-c-wrap

Update json c wrap

Author: dwsuse

meson.build

@@ -120,8 +120,8 @@ conf.set10(
     description: 'Is isblank() available?'
 )
 
-config_h = configure_file(
-    output: 'config.h',
+configure_file(
+    output: 'libnvme-config.h',
     configuration: conf
 )
 
@@ -137,7 +137,8 @@ configure_file(
 )
 
 ################################################################################
-add_project_arguments(['-fomit-frame-pointer', '-D_GNU_SOURCE', '-include', 'config.h'], language : 'c')
+add_project_arguments(['-fomit-frame-pointer', '-D_GNU_SOURCE',
+                       '-include', 'libnvme-config.h'], language : 'c')
 incdir = include_directories(['.', 'ccan', 'src'])
 
 ################################################################################

subprojects/json-c.wrap

@@ -3,9 +3,9 @@ directory = json-c-0.15
 source_url = https://s3.amazonaws.com/json-c_releases/releases/json-c-0.15.tar.gz
 source_filename = json-c-0.15.tar.gz
 source_hash = b8d80a1ddb718b3ba7492916237bbf86609e9709fb007e7f7d4322f02341a4c6
-patch_filename = json-c_0.15-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/json-c_0.15-1/get_patch
-patch_hash = 002b44f87063a129b5f518ffb2dba7d107ecc665ba29f97e5547ffcae41de3a9
+patch_filename = json-c_0.15-2_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/json-c_0.15-2/get_patch
+patch_hash = 2c5c95cf463804ac61309930c76ba9f57b157fef6247d1c6da4395b31a5bfac7
 
 [provide]
 json-c = json_c_dep