From 5a45e3cc6d123790a07822bd840c608cbedc378d Mon Sep 17 00:00:00 2001 From: Nicolas Werner <nicolas.werner@hotmail.de> Date: Tue, 5 Oct 2021 00:47:35 +0200 Subject: [PATCH] Update wraps --- subprojects/Olm.wrap | 2 +- subprojects/gtest.wrap | 19 ++++++++++++------- subprojects/nlohmann_json.wrap | 7 ++++++- subprojects/spdlog.wrap | 2 +- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/subprojects/Olm.wrap b/subprojects/Olm.wrap index db184479b..aebfdcf82 100644 --- a/subprojects/Olm.wrap +++ b/subprojects/Olm.wrap @@ -1,6 +1,6 @@ [wrap-git] directory = Olm url = https://git.matrix.org/git/olm.git -revision = 3.1.4 +revision = 3.2.6 buildsystem = cmake diff --git a/subprojects/gtest.wrap b/subprojects/gtest.wrap index ca5d699ec..8513793f5 100644 --- a/subprojects/gtest.wrap +++ b/subprojects/gtest.wrap @@ -1,10 +1,15 @@ [wrap-file] -directory = googletest-release-1.10.0 +directory = googletest-release-1.11.0 +source_url = https://github.com/google/googletest/archive/release-1.11.0.zip +source_filename = gtest-1.11.0.zip +source_hash = 353571c2440176ded91c2de6d6cd88ddd41401d14692ec1f99e35d013feda55a +patch_filename = gtest_1.11.0-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/gtest_1.11.0-1/get_patch +patch_hash = d38c39184384608b08419be52aed1d0f9d9d1b5ed71c0c35e51cccbdddab7084 -source_url = https://github.com/google/googletest/archive/release-1.10.0.zip -source_filename = gtest-1.10.0.zip -source_hash = 94c634d499558a76fa649edb13721dce6e98fb1e7018dfaeba3cd7a083945e91 +[provide] +gtest = gtest_dep +gtest_main = gtest_main_dep +gmock = gmock_dep +gmock_main = gmock_main_dep -patch_url = https://wrapdb.mesonbuild.com/v1/projects/gtest/1.10.0/1/get_zip -patch_filename = gtest-1.10.0-1-wrap.zip -patch_hash = 04ff14e8880e4e465f6260221e9dfd56fea6bc7cce4c4aff0dc528e4a2c8f514 diff --git a/subprojects/nlohmann_json.wrap b/subprojects/nlohmann_json.wrap index abdd8685d..f5f41d618 100644 --- a/subprojects/nlohmann_json.wrap +++ b/subprojects/nlohmann_json.wrap @@ -1,8 +1,13 @@ [wrap-file] +directory = nlohmann_json-3.9.1 lead_directory_missing = true source_url = https://github.com/nlohmann/json/releases/download/v3.9.1/include.zip source_filename = nlohmann_json-3.9.1.zip source_hash = 6bea5877b1541d353bd77bdfbdb2696333ae5ed8f9e8cc22df657192218cad91 +patch_url = https://wrapdb.mesonbuild.com/v2/nlohmann_json_3.9.1-1/get_patch +patch_filename = nlohmann_json-3.9.1-1-wrap.zip +patch_hash = 1774e5506fbe3897d652f67e41973194b948d2ab851cf464a742f35f160a1435 [provide] -nlohmann_json = nlohmann_json_multiple_headers +nlohmann_json = nlohmann_json_dep + diff --git a/subprojects/spdlog.wrap b/subprojects/spdlog.wrap index 27cb98547..bfa499568 100644 --- a/subprojects/spdlog.wrap +++ b/subprojects/spdlog.wrap @@ -3,7 +3,7 @@ directory = spdlog-1.8.5 source_url = https://github.com/gabime/spdlog/archive/v1.8.5.tar.gz source_filename = v1.8.5.tar.gz source_hash = 944d0bd7c763ac721398dca2bb0f3b5ed16f67cef36810ede5061f35a543b4b8 -patch_url = https://wrapdb.mesonbuild.com/v1/projects/spdlog/1.8.5/1/get_zip +patch_url = https://wrapdb.mesonbuild.com/v2/spdlog_1.8.5-1/get_patch patch_filename = spdlog-1.8.5-1-wrap.zip patch_hash = 3c38f275d5792b1286391102594329e98b17737924b344f98312ab09929b74be -- GitLab