diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-09-27 05:29:59 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-09-27 05:29:59 +0100 |
| commit | e466209c898f09389f2308d193286ff62b46c1dc (patch) | |
| tree | 377a0205ab4bdd44402dc4ffd5be756ebae9d6f2 /app-i18n/mozc/files | |
| parent | b544d842bfe55df1b59d40fb8059d5d240e4f42b (diff) | |
gentoo auto-resync : 27:09:2023 - 05:29:59
Diffstat (limited to 'app-i18n/mozc/files')
| -rw-r--r-- | app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0-fcitx4.patch | 29 | ||||
| -rw-r--r-- | app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0.patch | 29 |
2 files changed, 29 insertions, 29 deletions
diff --git a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0-fcitx4.patch b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0-fcitx4.patch new file mode 100644 index 000000000000..b7ebce42348e --- /dev/null +++ b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0-fcitx4.patch @@ -0,0 +1,29 @@ +diff --git a/src/unix/fcitx/surrounding_text_util.cc b/src/unix/fcitx/surrounding_text_util.cc +index b2d533c..76357cd 100644 +--- a/src/unix/fcitx/surrounding_text_util.cc ++++ b/src/unix/fcitx/surrounding_text_util.cc +@@ -233,9 +233,9 @@ bool GetSurroundingText(FcitxInstance* instance, + + const size_t selection_start = std::min(cursor_pos, anchor_pos); + const size_t selection_length = std::abs(info->relative_selected_length); +- info->preceding_text = Util::Utf8SubString(surrounding_text, 0, selection_start); +- info->selection_text = Util::Utf8SubString(surrounding_text, selection_start, selection_length); +- info->following_text = Util::Utf8SubString(surrounding_text, selection_start + selection_length); ++ info->preceding_text = std::string(Util::Utf8SubString(surrounding_text, 0, selection_start)); ++ info->selection_text = std::string(Util::Utf8SubString(surrounding_text, selection_start, selection_length)); ++ info->following_text = std::string(Util::Utf8SubString(surrounding_text, selection_start + selection_length)); + return true; + } + +diff --git a/src/unix/fcitx/eim.cc b/src/unix/fcitx/eim.cc +index 4da2e80..fc7a9ff 100644 +--- a/src/unix/fcitx/eim.cc ++++ b/src/unix/fcitx/eim.cc +@@ -33,6 +33,7 @@ + #include <fcitx/module.h> + #include <fcitx/keys.h> + #include <fcitx-config/xdg.h> ++#undef InvokeFunction + #include "fcitx_mozc.h" + #include "mozc_connection.h" + #include "mozc_response_parser.h diff --git a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0.patch b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0.patch index fcc1be4d4b8d..5e134bd1f003 100644 --- a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0.patch +++ b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0.patch @@ -11,32 +11,3 @@ index 932f6ac..35e5a22 100644 ], }, }, -diff --git a/src/unix/fcitx/surrounding_text_util.cc b/src/unix/fcitx/surrounding_text_util.cc -index b2d533c..76357cd 100644 ---- a/src/unix/fcitx/surrounding_text_util.cc -+++ b/src/unix/fcitx/surrounding_text_util.cc -@@ -233,9 +233,9 @@ bool GetSurroundingText(FcitxInstance* instance, - - const size_t selection_start = std::min(cursor_pos, anchor_pos); - const size_t selection_length = std::abs(info->relative_selected_length); -- info->preceding_text = Util::Utf8SubString(surrounding_text, 0, selection_start); -- info->selection_text = Util::Utf8SubString(surrounding_text, selection_start, selection_length); -- info->following_text = Util::Utf8SubString(surrounding_text, selection_start + selection_length); -+ info->preceding_text = std::string(Util::Utf8SubString(surrounding_text, 0, selection_start)); -+ info->selection_text = std::string(Util::Utf8SubString(surrounding_text, selection_start, selection_length)); -+ info->following_text = std::string(Util::Utf8SubString(surrounding_text, selection_start + selection_length)); - return true; - } - -diff --git a/src/unix/fcitx/eim.cc b/src/unix/fcitx/eim.cc -index 4da2e80..fc7a9ff 100644 ---- a/src/unix/fcitx/eim.cc -+++ b/src/unix/fcitx/eim.cc -@@ -33,6 +33,7 @@ - #include <fcitx/module.h> - #include <fcitx/keys.h> - #include <fcitx-config/xdg.h> -+#undef InvokeFunction - #include "fcitx_mozc.h" - #include "mozc_connection.h" - #include "mozc_response_parser.h |