From 5e342f86853071e530e07f126901e8dddc23c6f0 Mon Sep 17 00:00:00 2001 From: Po-Chuan Hsieh Date: Mon, 25 Dec 2023 17:03:14 +0800 Subject: [PATCH] japanese/fcitx-mozc: Fix build with protobuf 22+ PR: 275768 Reported by: Tomoaki AOKI Obtained from: https://github.com/fcitx/mozc/commit/131f6bf4ea9d1f49200f7ccd149fd30eae89ee97 --- .../mozc-server/files/patch-src_unix_fcitx_eim.cc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 japanese/mozc-server/files/patch-src_unix_fcitx_eim.cc diff --git a/japanese/mozc-server/files/patch-src_unix_fcitx_eim.cc b/japanese/mozc-server/files/patch-src_unix_fcitx_eim.cc new file mode 100644 index 000000000000..4c4b39a686d3 --- /dev/null +++ b/japanese/mozc-server/files/patch-src_unix_fcitx_eim.cc @@ -0,0 +1,15 @@ +Obtained from: https://github.com/fcitx/mozc/commit/131f6bf4ea9d1f49200f7ccd149fd30eae89ee97 + +--- src/unix/fcitx/eim.cc.orig 2020-08-14 17:09:18 UTC ++++ src/unix/fcitx/eim.cc +@@ -33,6 +33,10 @@ + #include + #include + #include ++ ++// Resolve macro naming conflict with absl. ++#undef InvokeFunction ++ + #include "fcitx_mozc.h" + #include "mozc_connection.h" + #include "mozc_response_parser.h"