[patch] Reformatted patch

c5eae90a06072c6982e483f8154e490b47e620f7.patch (text/plain), 1.93 KB, created by Mike Lothian on 2023-08-21 22:45:57 UTC

From c5eae90a06072c6982e483f8154e490b47e620f7 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <[e-mail]>
Date: Wed, 5 Jul 2023 00:59:11 +0530
Subject: [PATCH] vendor/extras: Fix building with newer protobuf versions

---
 ...parse-Fix-build-after-protobuf-util-Status-.patch | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/patches/extras/0002-libjsonpbparse-Fix-build-after-protobuf-util-Status-.patch b/patches/extras/0002-libjsonpbparse-Fix-build-after-protobuf-util-Status-.patch
index 35cc08e..783694d 100644
--- a/vendor/extras/libjsonpb/parse/jsonpb.cpp
+++ b/vendor/extras/libjsonpb/parse/jsonpb.cpp
-@@ -48,7 +48,11 @@ ErrorOr<std::string> MessageToJsonString(const Message& message) {
+@@ -48,7 +48,13 @@ ErrorOr<std::string> MessageToJsonString(const Message& message) {
                                    &json, options);
 
   if (!status.ok()) {
+#if GOOGLE_PROTOBUF_VERSION < 3016000
+    return MakeError<std::string>(status.error_message().as_string());
+#else
+#elif GOOGLE_PROTOBUF_VERSION < 4022000
     return MakeError<std::string>(status.message().as_string());
+#else
+    return MakeError<std::string>(std::string(status.message()));
+#endif
   }
   return ErrorOr<std::string>(std::move(json));
 }
-@@ -61,7 +65,11 @@ ErrorOr<std::monostate> JsonStringToMessage(const std::string& content, Message*
+@@ -61,7 +67,13 @@ ErrorOr<std::monostate> JsonStringToMessage(const std::string& content, Message*
   std::string binary;
   auto status = JsonToBinaryString(resolver.get(), GetTypeUrl(*message), content, &binary);
   if (!status.ok()) {
+#if GOOGLE_PROTOBUF_VERSION < 3016000
+    return MakeError<std::monostate>(status.error_message().as_string());
+#else
+#elif GOOGLE_PROTOBUF_VERSION < 4022000
     return MakeError<std::monostate>(status.message().as_string());
+#else
+    return MakeError<std::monostate>(std::string(status.message()));
+#endif
   }
   if (!message->ParseFromString(binary)) {