From: "Nick Sarnie" <sarnex@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/files/, app-i18n/mozc/
Date: Tue, 26 Sep 2023 22:45:59 +0000 (UTC) [thread overview]
Message-ID: <1695768303.494dc91fdb70986d73ece89c1ee94c8a70b8dd85.sarnex@gentoo> (raw)
commit: 494dc91fdb70986d73ece89c1ee94c8a70b8dd85
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 22:45:03 2023 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 22:45:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=494dc91f
app-i18n/mozc: Fix build with -fcitx4
Closes: https://bugs.gentoo.org/914770
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
...c-2.28.5029.102-abseil-20230802.0-fcitx4.patch} | 13 ----------
.../mozc-2.28.5029.102-abseil-20230802.0.patch | 29 ----------------------
app-i18n/mozc/mozc-2.28.5029.102-r1.ebuild | 1 +
3 files changed, 1 insertion(+), 42 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-fcitx4.patch
similarity index 74%
copy from app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0.patch
copy to app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0-fcitx4.patch
index fcc1be4d4b8d..b7ebce42348e 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-fcitx4.patch
@@ -1,16 +1,3 @@
-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
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
diff --git a/app-i18n/mozc/mozc-2.28.5029.102-r1.ebuild b/app-i18n/mozc/mozc-2.28.5029.102-r1.ebuild
index f9b3f38102d8..df14388aa428 100644
--- a/app-i18n/mozc/mozc-2.28.5029.102-r1.ebuild
+++ b/app-i18n/mozc/mozc-2.28.5029.102-r1.ebuild
@@ -154,6 +154,7 @@ src_unpack() {
src_prepare() {
if use fcitx4; then
cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die
+ PATCHES+=( "${FILESDIR}"/mozc-2.28.5029.102-abseil-20230802.0-fcitx4.patch )
fi
pushd "${WORKDIR}/${P}" > /dev/null || die
next reply other threads:[~2023-09-26 22:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-26 22:45 Nick Sarnie [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-08-28 4:47 [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/files/, app-i18n/mozc/ WANG Xuerui
2024-01-14 0:41 Yixun Lan
2023-09-25 17:22 Nick Sarnie
2022-01-29 15:20 Yixun Lan
2020-12-27 18:39 Mike Gilbert
2019-12-29 19:33 Mike Gilbert
2019-12-29 19:33 Mike Gilbert
2019-05-05 19:05 Mike Gilbert
2018-04-16 18:29 Mike Gilbert
2017-11-01 20:54 Mike Gilbert
2017-10-05 18:57 Mike Gilbert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1695768303.494dc91fdb70986d73ece89c1ee94c8a70b8dd85.sarnex@gentoo \
--to=sarnex@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox