From 2e650c1f5f2f79e7db10dec5dcdd1cffcaf47891 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 26 Jul 2022 07:11:40 +0200 Subject: Merging upstream version 2.1~rc0 (Closes: #1015722). Signed-off-by: Daniel Baumann --- subprojects/json-c.wrap | 15 ++++++++------- subprojects/libnvme.wrap | 2 +- subprojects/uuid.wrap | 6 ++++++ 3 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 subprojects/uuid.wrap (limited to 'subprojects') diff --git a/subprojects/json-c.wrap b/subprojects/json-c.wrap index 4ce9ab8..5084932 100644 --- a/subprojects/json-c.wrap +++ b/subprojects/json-c.wrap @@ -1,11 +1,12 @@ [wrap-file] -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-2_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/json-c_0.15-2/get_patch -patch_hash = 2c5c95cf463804ac61309930c76ba9f57b157fef6247d1c6da4395b31a5bfac7 +directory = json-c-0.16 +source_url = https://s3.amazonaws.com/json-c_releases/releases/json-c-0.16.tar.gz +source_filename = json-c-0.16.tar.gz +source_hash = 8e45ac8f96ec7791eaf3bb7ee50e9c2100bbbc87b8d0f1d030c5ba8a0288d96b +patch_filename = json-c_0.16-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/json-c_0.16-1/get_patch +patch_hash = 69db1e0c391c6a00c42d05c0d845bd551d92db10171f4a40d0b070f29f918101 +wrapdb_version = 0.16-1 [provide] json-c = json_c_dep diff --git a/subprojects/libnvme.wrap b/subprojects/libnvme.wrap index e90127c..45c3f4b 100644 --- a/subprojects/libnvme.wrap +++ b/subprojects/libnvme.wrap @@ -1,6 +1,6 @@ [wrap-git] url = https://github.com/linux-nvme/libnvme.git -revision = 033449f7c61c130fd21f0a747075dc15069f73f0 +revision = 6c5aedd78690b042250f3dc82b48b7302ea91dbd [provide] libnvme = libnvme_dep diff --git a/subprojects/uuid.wrap b/subprojects/uuid.wrap new file mode 100644 index 0000000..0692c4e --- /dev/null +++ b/subprojects/uuid.wrap @@ -0,0 +1,6 @@ +[wrap-git] +url = https://github.com/util-linux/util-linux.git +revision = eefff5aac7bce6979c950e3931a578efe03acbac + +[provide] +dependency_names = uuid \ No newline at end of file -- cgit v1.2.3