gentoo auto-resync : 27:09:2023 - 05:29:59

5 files changed, 33 insertions, 31 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 5364e2ae4513..553e31bc4ab0 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index fde4141344b0..ac9c85139c8a 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -4,7 +4,8 @@ AUX mozc-2.26.4220-server_path_check.patch 3455 BLAKE2B aa54893a6efb49e111a83e5b
 AUX mozc-2.26.4220-system_abseil-cpp.patch 14344 BLAKE2B d64e3abde60eb856bfb7bee6de68b6d8fa0939dafc9b02ee398a89ccf566e3235a86123067dc0fd98d63a395b9e0815c281f3baa578a64d67ace39e7f114f8e2 SHA512 8fd816e665f1aa84faa036e71be443bc4811b538449a1a8475c6ff9a674a20a5d4fac07c9a0c5e265cc4570120f4606c470964421704da321cc0f8129342d363
 AUX mozc-2.26.4220-system_gtest.patch 4755 BLAKE2B c0d98f949e8942bc4f3025c77be8d7949b131209a2383eed809ffbb0f5527f16a3388ce69e6101e7d219ebb830e16ca65772bab9d4ad8620d2e970e6debd2e37 SHA512 cd1260d0b10b40a4d832a50cd81e79a7ebe6e7d3a215ec80fd01c596161ad6fd69b78a046cda80f35bd5fac7d874e0ad08ae79a01ccf3d5e3f9e2a285de8e3fc
 AUX mozc-2.26.4220-system_jsoncpp.patch 3475 BLAKE2B e6643c1cb2f87d55aec6359fca8f0cdbae34f5b4f57456532e9bae40cf5a6a2debcba662e931dc6bb76157972a479ed773703fa6954af290b3d4c2bca986fd74 SHA512 5f65d9f1019ddfddc18bf60abbd3d88fc0add4c247b869e74e1bf1dcc7fca180dc7364807a4c46f5cae1536a46e6179af851a8012398f7d19fc3aa7dbddae24c
-AUX mozc-2.28.5029.102-abseil-20230802.0.patch 1925 BLAKE2B 0ab6fe7ab35ca3361e76bf72338a79d4b422f7ffd2ab8abad6cc7b2ebc1a553a81d1689506f84468e3b6bb57b51163ffc42d08107464c4eae28d551a466ce3ec SHA512 9c05ab1ab715b6eae8a25fb67c603c7e5ceb14de7069492d908c24bc56912ac486b0d6464174f81eaf7207bb64b95ee52d917c17c743340fe5ff178252e7798c
+AUX mozc-2.28.5029.102-abseil-20230802.0-fcitx4.patch 1440 BLAKE2B 6ad295704b5091cb63cd9fc6e0043d88dae4db15dceb4b6161f272f80a803e23e8103ba2336ab756326e7af051ac20bccfd0c5aaf2b917783381c61e8b2879c9 SHA512 41f3b983521a1c9055a7a640c76aacb37ca19473d2a99409c23bc82f04685e671e7be9f8cf1eb6fc146426408a5ff9d56ad48bb6742835d9f2b5e89700b3d251
+AUX mozc-2.28.5029.102-abseil-20230802.0.patch 485 BLAKE2B e7ea30b1dc1f4441fa4415cadb98e51f9e08e3eeab75a74363d7848049e686b0b1787b4468ae5b96dba78cbef7ce94a821eaae3dac24dcd94af191f3142d04b2 SHA512 54eef6ca15e6fd4b3909c62075c589033c6e99175e1775ca776c06140180b4ec349201429bd2980c0acbf347660d1900d543e86e9b8c10e90f3e9a8809913b48
 AUX mozc-2.28.5029.102-abseil.patch 831 BLAKE2B 1d76f9d3a077a448966b96311a76caa1a0468e0a47a51db2971764a1408ec0c72db2ea1fd8fba64b6d8f7ea3730b4f0038449701a86b1457387b5b3813ff6c74 SHA512 0c1809d9066faa4a960bd94204e31e3942feeee36db9ffc58b2686ea7d14d043831d7820ef1fb0d7f747744855f02a67639af1431402728b558eb944c0b4e9d0
 DIST fcitx-mozc-2.26.4220-20201219202429.tar.gz 37174759 BLAKE2B 3f320523103ee7a35a763f6613889e282e8a654db8ef11b5a1168db12611387e300621f015977875ffec3c10c055e36b3cb525a1e8559013f3ac42bc5b0cc296 SHA512 823e64267aa69e4d30dd7408f946a54072994f9a2d68691a3d393b216a15e70fd28bcb24705f9d9f483a2291517c48c5a1aeda893d2315f9a1d9cd352fb3feb2
 DIST fcitx-mozc-2.28.5029.102-2.28.5029.102.tar.gz 37246575 BLAKE2B 54381968e33870f2d9f769184cf49428548d04de66e767140c8f053fad7873f1b2e3b02be81ce54e51b824d2c9cd971da37bff8b60efe60c9e2c748ff298afbd SHA512 4962e9505b79d4680a260c257719ba2486a6fe127018298758728faa9535504bc2dd6b1bfb430ac2982cb377cda52c145430531afd0968f49f91d366fdd43d92
@@ -13,6 +14,6 @@ DIST mozc-2.26.4220-20201212102434.tar.gz 37106063 BLAKE2B 7d3c236809c8feb017f35
 DIST mozc-2.28.5029.102-2.28.5029.102.tar.gz 37247099 BLAKE2B 4bb528991102d34a26321e6fa00a73cc83cb103e0b765f1ebb837dd6894387288b13ed75cc255003d07d6f0c4a82f963684fa4f2bd9b5043cfaddb57a5f5cef0 SHA512 b20aa45757db92f66d1c135eacf907b4cec937226a8d09e5f9f6768ae22a6b8464e3b75276773ce55413f2002ffcc3d8cae136e7fd3acfc0733e48bccf848d5b
 DIST mozc-2.28.5029.102-patches.tar.xz 224380 BLAKE2B 377d2cac6ec8a9c90661f10c0b105d8347ca8080ec43cee3dfd4660feadfe2d9b204d6e4b9e22bd11a5fdbbf26e7f6f298b703b88fb1621ea1847741408c1953 SHA512 5836a19ea68de271475b3ca1efce928b0ad012c96ff7ecdc4474b05daf8b8df022203eb46ec839b76e7d50be7a75b8f278d534d762fac0e612a8f09ae13c7c16
 EBUILD mozc-2.26.4220_p20201212102434_p20201219202429.ebuild 10424 BLAKE2B c19e305e4ed43d17935391c715ba54d2d2875cbc4b4d31462df99021773d0b8005c2cdc86e6cdbc58ef9394e5e8d3ca3d0a8cdf356b93f7730b81f097cca1e78 SHA512 c0382b61832a9cb0356bb03b1464c1c5e988644c425fbdec68dda046dddcac9dd6d235d5adc161a54cd23ffb0ed2273664282094dd9b4ee47398814b28d2f935
-EBUILD mozc-2.28.5029.102-r1.ebuild 10771 BLAKE2B e1b5780d76a1fb26fe83d30e6532df7c3576acb36af44d98c1839525961e9b3443479648f4552e8cccdaf5f79ee42f83987138840578f8e7f6936918dfa85221 SHA512 91480743ac8f1b6c7da8b9636df12dfe95dab1f8e09c911a1e2c71da94c646d7718fc087724fa5ae0b8d4ec448c5d5ae25ff3d9b94b72a1745f4a809b3e6812f
+EBUILD mozc-2.28.5029.102-r1.ebuild 10850 BLAKE2B 3cb8231ebc45cd8d57e6bc7c21cb3a93c32fcda8ea8eca0b75aa4ff9d09fdd660cfa1e60e45061e4d217614664e5f4e139b4fdc3f49a783b6e72b622bec62692 SHA512 8906ffd13026aa33e5e965073e7915e53e9b85d83765c03c216274627f56ebd08b28b9f870d1d7fd0b236db533999e1f550dd96ab207633b3f50b96c8c995758
 EBUILD mozc-2.28.5029.102.ebuild 10718 BLAKE2B 799e9a5bb90a0328f9177bdcbc8d01285b16eae80463189d83d11d4d219b4152e7140897b70a3cdce34f5e86628c560616203fbbcd907f97629ddfdd2e8c6bad SHA512 09a0dcd52893998d1949b835321e55e01f2934cf1802ab09a9509ee5df56b15ca33f8369743ac007ce01b64311fdcf8bbd951babfb5397de17a4f6727bd400d8
 MISC metadata.xml 759 BLAKE2B 4a5a13fcee5848044c4fb7f47435c75e82ec5fc31d3666b101356a7ec14743eb4a997629066fbffc216caba1aff743653d92e491cd3ce2f54ee22019eff959b1 SHA512 a97788b46f15e7e7dd578dbc229334c694dda9cde84093a1fde53cb4a877773ed0a336247e3cb80dcc5962b27fc7946242634f2cad87c602c569262670f31ffa
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
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