From 6d85af35c294b4640b38539e341501a20bb893d2 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Thu, 1 Dec 2022 16:33:54 +0000 Subject: [PATCH] Add patch for protobuf 3.21 --- .../clangd/index/remote/monitor/Monitor.cpp | 5 ++--- debian/changelog | 5 ++++- debian/patches/protobuf-3.21.patch | 15 +++++++++++++++ debian/patches/series | 1 + 4 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 debian/patches/protobuf-3.21.patch diff --git a/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp b/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp index 96451f7764..7d06928c2d 100644 --- a/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp +++ b/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp @@ -66,9 +66,8 @@ int main(int argc, char *argv[]) { const auto JsonStatus = 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()); + clang::clangd::elog("Can not convert response ({0}) to JSON: {1}\n", + Response.DebugString(), JsonStatus.ToString()); return -1; } llvm::outs() << Output; diff --git a/debian/changelog b/debian/changelog index aabede26a3..787f6183b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,7 +43,10 @@ llvm-toolchain-13 (1:13.0.1-9+rpi1) bookworm-staging; urgency=medium [changes brought forward from 1:13.0.0-9+rpi2 by Peter Michael Green at Tue, 23 Nov 2021 22:37:30 +0000] * Remove armhf from architecture list for libunwind-13-dev dependency. - -- Raspbian forward porter Tue, 29 Nov 2022 14:57:58 +0000 + [changes introduced in 1:13.0.1-9+rpi1 by Peter Michael Green] + * Apply patch from László Böszörményi (GCS) for protobuf 3.21 (Closes: #1023532) + + -- Peter Michael Green Thu, 01 Dec 2022 16:32:37 +0000 llvm-toolchain-13 (1:13.0.1-9) unstable; urgency=medium diff --git a/debian/patches/protobuf-3.21.patch b/debian/patches/protobuf-3.21.patch new file mode 100644 index 0000000000..1906b74448 --- /dev/null +++ b/debian/patches/protobuf-3.21.patch @@ -0,0 +1,15 @@ +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 +@@ -66,9 +66,8 @@ + const auto JsonStatus = + 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()); ++ clang::clangd::elog("Can not convert response ({0}) to JSON: {1}\n", ++ Response.DebugString(), JsonStatus.ToString()); + return -1; + } + llvm::outs() << Output; diff --git a/debian/patches/series b/debian/patches/series index 62bd62c2e7..36d8b6fb1c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -135,3 +135,4 @@ llvm-objcopy-COFF-Fix-test-for-debug-dir-presence.patch lldb/lldb-swig-2.diff lldb/lldb-swig.diff raspbian-triplet.patch +protobuf-3.21.patch -- 2.30.2