From 19f47cc924022223bf4905aa37c49c3577765211 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 14 Nov 2022 11:15:50 +0100 Subject: [PATCH] Adjust to protobuf 3.21 (Closes: #1023533) --- debian/changelog | 1 + debian/patches/protobuf_3.21.patch | 14 ++++++++++++++ debian/patches/series | 1 + 3 files changed, 16 insertions(+) create mode 100644 debian/patches/protobuf_3.21.patch diff --git a/debian/changelog b/debian/changelog index 69e7b502..43eecfa5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-14 (1:14.0.6-8) unstable; urgency=medium * Fix the lldb swig issues (closes: #1023444) * Enable LLVM_USE_RELATIVE_PATHS_IN_DEBUG_INFO to help with caching + * Adjust to protobuf 3.21 (Closes: #1023533) -- Sylvestre Ledru Fri, 04 Nov 2022 19:36:56 +0100 diff --git a/debian/patches/protobuf_3.21.patch b/debian/patches/protobuf_3.21.patch new file mode 100644 index 00000000..da7d45da --- /dev/null +++ b/debian/patches/protobuf_3.21.patch @@ -0,0 +1,14 @@ +diff -Nur a/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp b/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp +--- a/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp 2022-01-23 01:26:53.000000000 +0100 ++++ b/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp 2022-09-08 19:17:39.103577486 +0200 +@@ -67,8 +67,8 @@ + google::protobuf::util::MessageToJsonString(Response, &Output, Options); + 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()); + return -1; + } + llvm::outs() << Output; diff --git a/debian/patches/series b/debian/patches/series index 5852e004..b3563d78 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -159,3 +159,4 @@ ubuntu-kinetic.patch fix-typo-1018770.diff lldb/lldb-swig.diff lldb/lldb-swig-2.diff +protobuf_3.21.patch