Adjust to protobuf 3.21 (Closes: #1023533)

This commit is contained in:
Sylvestre Ledru 2022-11-14 11:15:50 +01:00
parent 5e129ea18e
commit 19f47cc924
3 changed files with 16 additions and 0 deletions

1
debian/changelog vendored
View File

@ -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 <sylvestre@debian.org> Fri, 04 Nov 2022 19:36:56 +0100

14
debian/patches/protobuf_3.21.patch vendored Normal file
View File

@ -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;

View File

@ -159,3 +159,4 @@ ubuntu-kinetic.patch
fix-typo-1018770.diff
lldb/lldb-swig.diff
lldb/lldb-swig-2.diff
protobuf_3.21.patch