Closed sgn closed 2 years ago
There are two new build failure, attached is 2 patches to fix those failures.
mozc::FileUtil::FileExists changes return type from bool to absl::Status
mozc::FileUtil::FileExists
bool
absl::Status
--- a/mozc/src/unix/fcitx/fcitx_mozc.cc +++ b/mozc/src/unix/fcitx/fcitx_mozc.cc @@ -413,7 +413,7 @@ void FcitxMozc::InitializeBar() ); if ( mozc::FileUtil::FileExists ( mozc::FileUtil::JoinPath (
fcitx
InvokeFunction
--- a/mozc/src/unix/fcitx/surrounding_text_util.cc +++ b/mozc/src/unix/fcitx/surrounding_text_util.cc @@ -34,6 +34,10 @@ #include <fcitx/instance.h> #include <fcitx/module/clipboard/fcitx-clipboard.h>
+#ifdef InvokeFunction +#undef InvokeFunction +#endif +
Doesn't src/unix/fcitx/eim.cc also need #undef InvokeFunction?
There are two new build failure, attached is 2 patches to fix those failures.
mozc::FileUtil::FileExists
changes return type frombool
toabsl::Status
fcitx
defines a macro namedInvokeFunction
which is conflict with abseil.+#ifdef InvokeFunction +#undef InvokeFunction +#endif +
include "base/port.h"
include "base/logging.h"
include "base/util.h"