From 16ee64a21c1ee455d0f683d96903996b87677a92 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 23 Feb 2023 23:31:26 +0100 Subject: [PATCH] rebase of the patch --- debian/patches/protobuf_3.21.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/patches/protobuf_3.21.patch b/debian/patches/protobuf_3.21.patch index 6ffe27a0..cdbf273d 100644 --- a/debian/patches/protobuf_3.21.patch +++ b/debian/patches/protobuf_3.21.patch @@ -1,15 +1,15 @@ -Index: llvm-toolchain-snapshot_16~++20221126040739+502c246519ec/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp +Index: llvm-toolchain-snapshot_17~++20230223111257+4f0aa2517d0c/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20221126040739+502c246519ec.orig/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp -+++ llvm-toolchain-snapshot_16~++20221126040739+502c246519ec/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp -@@ -67,8 +67,8 @@ int main(int argc, char *argv[]) { - google::protobuf::util::MessageToJsonString(Response, &Output, Options); +--- llvm-toolchain-snapshot_17~++20230223111257+4f0aa2517d0c.orig/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp ++++ llvm-toolchain-snapshot_17~++20230223111257+4f0aa2517d0c/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp +@@ -68,8 +68,9 @@ int main(int argc, char *argv[]) { if (!JsonStatus.ok()) { clang::clangd::elog("Can not convert response ({0}) to JSON ({1}): {2}\n", -- Response.DebugString(), JsonStatus.error_code(), -- JsonStatus.error_message().as_string()); -+ Response.DebugString(), (int)JsonStatus.code(), -+ JsonStatus.message().as_string()); + Response.DebugString(), +- static_cast(JsonStatus.code()), ++ (int)JsonStatus.code(), + JsonStatus.message().as_string()); ++ return -1; } llvm::outs() << Output;