Add patch for protobuf 3.21

diff --git a/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp b/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
index 96451f77646757458a7dfa669f07d8d8679e88b8..7d06928c2ddd15f7b4aa1996f98599fe8ee6974b 100644 (file)
--- 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 aabede26a325f75a039a40fc74ce7544c1c166db..787f6183b6c0950233308074f3bd4820ad4e968d 100644 (file)
--- 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 <plugwash@raspbian.org> at Tue, 23 Nov 2021 22:37:30 +0000]
   * Remove armhf from architecture list for libunwind-13-dev dependency.
 
- -- Raspbian forward porter <root@raspbian.org>  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 <plugwash@raspbian.org>  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 (file)
index 0000000..1906b74
--- /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 62bd62c2e76e22933066589b1406baaf2fb995b6..36d8b6fb1cc7722233eb2563d4e9be0a38e1332d 100644 (file)
--- 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