git: 5e342f868530 - main - japanese/fcitx-mozc: Fix build with protobuf 22+
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 25 Dec 2023 09:11:41 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=5e342f86853071e530e07f126901e8dddc23c6f0
commit 5e342f86853071e530e07f126901e8dddc23c6f0
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-12-25 09:03:14 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-12-25 09:03:14 +0000
japanese/fcitx-mozc: Fix build with protobuf 22+
PR: 275768
Reported by: Tomoaki AOKI <junchoon@dec.sakura.ne.jp>
Obtained from: https://github.com/fcitx/mozc/commit/131f6bf4ea9d1f49200f7ccd149fd30eae89ee97
---
japanese/mozc-server/files/patch-src_unix_fcitx_eim.cc | 15 +++++++++++++++
1 file changed, 15 insertions(+)
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 <fcitx/module.h>
+ #include <fcitx/keys.h>
+ #include <fcitx-config/xdg.h>
++
++// Resolve macro naming conflict with absl.
++#undef InvokeFunction
++
+ #include "fcitx_mozc.h"
+ #include "mozc_connection.h"
+ #include "mozc_response_parser.h"