From 041c7bceca4113454fb77b9ab37bf8f9567c4596 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Sun, 4 Sep 2022 22:14:44 +0200
Subject: [PATCH] Update some subprojects
---
lib/structs/events/ephemeral/receipt.cpp | 3 ++-
subprojects/gtest.wrap | 12 ++++++------
subprojects/nlohmann_json.wrap | 11 ++++-------
subprojects/spdlog.wrap | 15 ++++++++-------
4 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/lib/structs/events/ephemeral/receipt.cpp b/lib/structs/events/ephemeral/receipt.cpp
index 34f4d9d25..fa95b816f 100644
--- a/lib/structs/events/ephemeral/receipt.cpp
+++ b/lib/structs/events/ephemeral/receipt.cpp
@@ -14,7 +14,8 @@ from_json(const nlohmann::json &obj, Receipt &content)
Receipt::ReceiptType t = Receipt::Read;
if (receiptsByType.key() == "m.read")
t = Receipt::Read;
- else if (receiptsByType.key() == "m.read.private" || receiptsByType.key() == "org.matrix.msc2285.read.private")
+ else if (receiptsByType.key() == "m.read.private" ||
+ receiptsByType.key() == "org.matrix.msc2285.read.private")
t = Receipt::ReadPrivate;
else
continue;
diff --git a/subprojects/gtest.wrap b/subprojects/gtest.wrap
index 8513793f5..730de1aef 100644
--- a/subprojects/gtest.wrap
+++ b/subprojects/gtest.wrap
@@ -1,11 +1,11 @@
[wrap-file]
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.11.0.tar.gz
+source_filename = gtest-1.11.0.tar.gz
+source_hash = b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5
+patch_filename = gtest_1.11.0-2_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/gtest_1.11.0-2/get_patch
+patch_hash = 764530d812ac161c9eab02a8cfaec67c871fcfc5548e29fd3d488070913d4e94
[provide]
gtest = gtest_dep
diff --git a/subprojects/nlohmann_json.wrap b/subprojects/nlohmann_json.wrap
index f5f41d618..857277a67 100644
--- a/subprojects/nlohmann_json.wrap
+++ b/subprojects/nlohmann_json.wrap
@@ -1,12 +1,9 @@
[wrap-file]
-directory = nlohmann_json-3.9.1
+directory = nlohmann_json-3.10.5
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
+source_url = https://github.com/nlohmann/json/releases/download/v3.10.5/include.zip
+source_filename = nlohmann_json-3.10.5.zip
+source_hash = b94997df68856753b72f0d7a3703b7d484d4745c567f3584ef97c96c25a5798e
[provide]
nlohmann_json = nlohmann_json_dep
diff --git a/subprojects/spdlog.wrap b/subprojects/spdlog.wrap
index bfa499568..03a6d4c31 100644
--- a/subprojects/spdlog.wrap
+++ b/subprojects/spdlog.wrap
@@ -1,11 +1,12 @@
[wrap-file]
-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/v2/spdlog_1.8.5-1/get_patch
-patch_filename = spdlog-1.8.5-1-wrap.zip
-patch_hash = 3c38f275d5792b1286391102594329e98b17737924b344f98312ab09929b74be
+directory = spdlog-1.10.0
+source_url = https://github.com/gabime/spdlog/archive/v1.10.0.tar.gz
+source_filename = v1.10.0.tar.gz
+source_hash = 697f91700237dbae2326b90469be32b876b2b44888302afbc7aceb68bcfe8224
+patch_filename = spdlog_1.10.0-3_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/spdlog_1.10.0-3/get_patch
+patch_hash = 5bb07b4af1e971817d4b886efbe077aaf6c36d72d3d7e461bbcf6631f3725704
+wrapdb_version = 1.10.0-3
[provide]
spdlog = spdlog_dep
--
GitLab