summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Sarnie <sarnex@gentoo.org>2023-09-25 13:19:41 -0400
committerNick Sarnie <sarnex@gentoo.org>2023-09-25 13:22:20 -0400
commit7b7b4ffeec3bf8f7badb711a05a44865e9c7a341 (patch)
tree8a09138dbb52d30b675f1d887d226490ed0735e5 /app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0.patch
parentdev-python/sqlalchemy: Stabilize 2.0.20 sparc, #914696 (diff)
downloadgentoo-7b7b4ffeec3bf8f7badb711a05a44865e9c7a341.tar.gz
gentoo-7b7b4ffeec3bf8f7badb711a05a44865e9c7a341.tar.bz2
gentoo-7b7b4ffeec3bf8f7badb711a05a44865e9c7a341.zip
app-i18n/mozc: Fix build with new abseil
Closes: https://bugs.gentoo.org/912776 Closes: https://bugs.gentoo.org/913243 Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
Diffstat (limited to 'app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0.patch')
-rw-r--r--app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0.patch42
1 files changed, 42 insertions, 0 deletions
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
new file mode 100644
index 000000000000..fcc1be4d4b8d
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0.patch
@@ -0,0 +1,42 @@
+diff --git a/src/base/absl.gyp b/src/base/absl.gyp
+index 932f6ac..35e5a22 100644
+--- a/src/base/absl.gyp
++++ b/src/base/absl.gyp
+@@ -398,7 +398,7 @@
+ 'all_dependent_settings': {
+ 'link_settings': {
+ 'libraries': [
+- '-labsl_synchronization -labsl_flags -labsl_graphcycles_internal',
++ '-labsl_synchronization -labsl_flags -labsl_graphcycles_internal -labsl_string_view',
+ ],
+ },
+ },
+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