commit: 186dc3e928418cff09f86e898fcfad9fd63ebcf9 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Dec 14 23:15:00 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Dec 26 20:33:21 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=186dc3e9
app-i18n/mozc: drop 2.28.5029.102-r6 Closes: https://bugs.gentoo.org/943518 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-i18n/mozc/Manifest | 4 - ...zc-2.28.5029.102-abseil-20230802.0-fcitx5.patch | 19 - .../mozc-2.28.5029.102-abseil-20230802.0.patch | 13 - .../files/mozc-2.28.5029.102-abseil-20240116.patch | 50 --- .../files/mozc-2.28.5029.102-abseil-20250127.patch | 46 --- .../files/mozc-2.28.5029.102-abseil-20250512.patch | 13 - .../mozc/files/mozc-2.28.5029.102-abseil.patch | 15 - app-i18n/mozc/files/mozc-2.28.5029.102-cxx20.patch | 23 -- app-i18n/mozc/mozc-2.28.5029.102-r6.ebuild | 423 --------------------- 9 files changed, 606 deletions(-) diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest index b8345eebde33..663c997ba4a2 100644 --- a/app-i18n/mozc/Manifest +++ b/app-i18n/mozc/Manifest @@ -14,13 +14,9 @@ DIST cpython-3.11.10+20241016-aarch64-unknown-linux-gnu-install_only.tar.gz 2592 DIST cpython-3.11.10+20241016-x86_64-unknown-linux-gnu-install_only.tar.gz 29718798 BLAKE2B cc5c8c49bc58dee4562438ca22d0cf91540942e6f6525d581077e7e447d428b6cd0d846ebf38367c0c47b9886bfd96da868a3f09845f2d0e1164932d249fa37d SHA512 0249257a1c50e58cfddd76bfc89a437e02fdae367c3949a9fb678bb9314f149d0c7e3c257a8c0db33d68008315f8ccd0da2aba47f583e19c8ce6c403771ec14a DIST cpython-3.11.13+20250610-aarch64-unknown-linux-gnu-install_only.tar.gz 40970497 BLAKE2B e86c0988d8f60a836e569060402b80ebdc39b81c2de5e099299369a6b7466f61e1de03cd32c414631419e7c4da3e21842fff596a8c1148c209e1420417e5859f SHA512 1dae1385e6bf5009cf16d7cde8e25c214036183a62f59f0f390c6c36421fb25343bbd4241ee15cbd545a0c116a1a55087993230a92a69de9de9bf1f72a5cfc34 DIST cpython-3.11.13+20250610-x86_64-unknown-linux-gnu-install_only.tar.gz 48611228 BLAKE2B 8ea831fe64cb31eed977e1a1ff65d318e335c0cc7eddf8f0fffbe75ac349f417b137fd3b318795f7225de5009d915cfcbb6c855cb1d85be0c44fb48b08bc8d8e SHA512 c4aa3a09324abcbc1a2d9aa6a6278645d74af63cad76666224e53c50620450fb686c067db0f799afe84fefe575e0b2bea13b1b952f55e7e075562194b8e5ac43 -DIST fcitx-mozc-2.28.5029.102-2.28.5029.102.tar.gz 37246575 BLAKE2B 54381968e33870f2d9f769184cf49428548d04de66e767140c8f053fad7873f1b2e3b02be81ce54e51b824d2c9cd971da37bff8b60efe60c9e2c748ff298afbd SHA512 4962e9505b79d4680a260c257719ba2486a6fe127018298758728faa9535504bc2dd6b1bfb430ac2982cb377cda52c145430531afd0968f49f91d366fdd43d92 DIST googletest-1.15.2.tar.gz 872667 BLAKE2B 2525d7a8572364cc2c2c129197201fc31e3cb4aadf4be37a995447a9b8e393205628e666dd190dca9a169b693883a5a2a5cafd6432cc3d1263a0c834ff8cf121 SHA512 9046841044a2bf7edfd96854ad9c44ffae4fcb9fb59a075b367507c0762a98eb32cb6968d46663228272e26321e96f4dd287c95baa22c6af9bad902b8b6ede4e DIST googletest-1.17.0.tar.gz 885595 BLAKE2B 194df0cbe44905b9748c3df75ce3e91f0b11d766c845a11a9b86bb65249d21448b6eac1c2ea9fc3c189105f173d2330af5d0622b051f712dbf661ba5917bc96b SHA512 0f57e9ef06925e5b7722df1eb92ef5850e8dce79220ea16a8aaff586a71c0b01460ef1713649ee24ffedb2e6ad5a51e9198c5a5ae1b2789e43feb1f494e7d45c -DIST japanese-usage-dictionary-20180701040110.tar.gz 71285 BLAKE2B dfad056a1d5061b6764f583da15b9ad60a3c4421cee0430c4665d1c2779a64f9b31473c1746a3e2b9bda5167349432e51dcf7d4d48f75fde9543e9c16ff74c0d SHA512 68b4d3f52dd6cd4f00a8012a870b4f5929519cd69815b1729f3881d1f964802308f4aa101e236824b4c0f832183a9e8097437ed620403f2a652f126e7cdc1eb3 DIST japanese-usage-dictionary-2025-01-25.tar.gz 72003 BLAKE2B 3eef55aa1bd45c209e6457c6ef68105b2c157403be89b8d12cb2401f2e9d75b8b40d381a0ab24a6b99cf284208100fcc57213b4699db1a31a669a43ba7533aae SHA512 ac4be3e60f16804c8aba3491c6bd858bae13834951ea63d90a7d8811ee7a23221f56d161ed9009e5cc9c1df9f0379eee82668f0728c8674cd820051a54baf547 -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 DIST mozc-2.31.5851.102-dictionary.png 205 BLAKE2B f92fdeae34eff41473c6c9b0f6fb5a3c784b7b98fd6932b03953131f78ab97c961eb94f88e542f593acf0d2af176e28a3d638e50e912aa695de882477117b2d6 SHA512 aac820bbf51b2dfe23a9e0de57c2c9f4301e021c3ae29047ec8918ccb22b698f775ceee1dfe5ceaf21ada9228085ae1a36e65ab33fd811acf072e4d380225d9c DIST mozc-2.31.5851.102-dictionary.svg 294 BLAKE2B 24464c7238fc58056c4c9e94f72c9ece8313a09ef1fd57f07b2178dcf78b722fff4965d42ac867c135db969a905306f99e7d6e4f5c028029646b77d6eee3de33 SHA512 648b486ec244c117ae25aadbff1f14211a311df37161b7777c442aff2f7f8dd61d41912d81891a0de29383e3430ee80ecdad7d9b1fb9e0ea7addcbf97af018c3 DIST mozc-2.31.5851.102-jigyosyo.zip 773836 BLAKE2B 0ba255d0cce6d44a8d87409867ee61c0e4ff49546dd9b530ba83ad523220edb2b53ac23b2d30bd2ce32bbeb3c0c9f576648b7f2fb3bfd36ddf7af39f64890e13 SHA512 8bae9f210c6795af933dd2b50efc1dda614f4dfdc4fa8d645a1612c7f365e1450800855677f0f2b27b386d5cc5091cd9e7381e8cf4603a4e2fc60ecbe0825b7b diff --git a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0-fcitx5.patch b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0-fcitx5.patch deleted file mode 100644 index 3ad06cf0e3a5..000000000000 --- a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0-fcitx5.patch +++ /dev/null @@ -1,19 +0,0 @@ -Adapted fcitx5 path from https://github.com/fcitx/mozc/commit/748ddfb45b7615283f1d40e03c23940750031ac1 - ---- a/src/unix/fcitx5/surrounding_text_util.cc -+++ b/src/unix/fcitx5/surrounding_text_util.cc -@@ -211,11 +211,11 @@ - 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); -+ std::string(Util::Utf8SubString(surrounding_text, 0, selection_start)); - info->selection_text = -- Util::Utf8SubString(surrounding_text, selection_start, selection_length); -+ std::string(Util::Utf8SubString(surrounding_text, selection_start, selection_length)); - info->following_text = -- Util::Utf8SubString(surrounding_text, selection_start + selection_length); -+ std::string(Util::Utf8SubString(surrounding_text, selection_start + selection_length)); - return true; - } - 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 deleted file mode 100644 index 5e134bd1f003..000000000000 --- a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20240116.patch b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20240116.patch deleted file mode 100644 index 804b4d9ff3d4..000000000000 --- a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20240116.patch +++ /dev/null @@ -1,50 +0,0 @@ -Exported from my fork: https://github.com/xen0n/mozc, branch -gentoo-2.28.5029.102. - -From: WANG Xuerui <[email protected]> -Date: Tue, 27 Aug 2024 16:44:13 +0800 -Subject: [PATCH] fix build with abseil-cpp 20240116 - -Signed-off-by: WANG Xuerui <[email protected]> ---- a/src/base/absl.gyp -+++ b/src/base/absl.gyp -@@ -128,7 +128,7 @@ - 'all_dependent_settings': { - 'link_settings': { - 'libraries': [ -- '-labsl_flags -labsl_flags_internal -labsl_synchronization -labsl_flags_reflection -labsl_flags_marshalling', -+ '-labsl_flags_internal -labsl_raw_hash_set -labsl_city -labsl_hash -labsl_low_level_hash -labsl_synchronization -labsl_flags_reflection -labsl_flags_marshalling', - ], - }, - }, -@@ -178,7 +178,7 @@ - 'all_dependent_settings': { - 'link_settings': { - 'libraries': [ -- '-labsl_flags_commandlineflag_internal -labsl_flags_usage -labsl_flags_usage_internal -labsl_flags_internal -labsl_flags -labsl_flags_private_handle_accessor -labsl_flags_program_name -labsl_flags_parse', -+ '-labsl_flags_commandlineflag_internal -labsl_flags_usage -labsl_flags_usage_internal -labsl_flags_internal -labsl_flags_private_handle_accessor -labsl_flags_program_name -labsl_flags_parse', - ], - }, - }, -@@ -398,7 +398,7 @@ - 'all_dependent_settings': { - 'link_settings': { - 'libraries': [ -- '-labsl_synchronization -labsl_flags -labsl_graphcycles_internal -labsl_string_view', -+ '-labsl_synchronization -labsl_graphcycles_internal -labsl_string_view', - ], - }, - }, ---- a/src/dictionary/file/codec.cc -+++ b/src/dictionary/file/codec.cc -@@ -42,6 +42,10 @@ - #include "dictionary/file/codec_interface.h" - #include "dictionary/file/codec_util.h" - #include "dictionary/file/section.h" -+#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION >= 20240116 -+// Abseil 20240116.0 needs explicit inclusion for StrCat -+#include "absl/strings/str_cat.h" -+#endif - #include "absl/status/status.h" - - namespace mozc { diff --git a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20250127.patch b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20250127.patch deleted file mode 100644 index 77c3946f1e7a..000000000000 --- a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20250127.patch +++ /dev/null @@ -1,46 +0,0 @@ -Exported from my fork: https://github.com/xen0n/mozc, branch -gentoo-2.28.5029.102. - -From: WANG Xuerui <[email protected]> -Date: Thu, 29 May 2025 00:47:10 +0800 -Subject: [PATCH] fix build with abseil-cpp 20250127 - -Signed-off-by: WANG Xuerui <[email protected]> ---- a/src/base/absl.gyp -+++ b/src/base/absl.gyp -@@ -46,7 +46,7 @@ - 'all_dependent_settings': { - 'link_settings': { - 'libraries': [ -- '-labsl_base -labsl_city -labsl_hash -labsl_malloc_internal -labsl_raw_hash_set -labsl_raw_logging_internal -labsl_spinlock_wait -labsl_status -labsl_strings -labsl_strings_internal -labsl_throw_delegate -labsl_debugging_internal -labsl_synchronization -labsl_time', -+ '-labsl_base -labsl_city -labsl_hash -labsl_malloc_internal -labsl_raw_hash_set -labsl_raw_logging_internal -labsl_spinlock_wait -labsl_status -labsl_strings -labsl_strings_internal -labsl_throw_delegate -labsl_debugging_internal -labsl_synchronization -labsl_tracing_internal -labsl_time', - ], - }, - }, -@@ -96,7 +96,7 @@ - 'all_dependent_settings': { - 'link_settings': { - 'libraries': [ -- '-labsl_stacktrace -labsl_symbolize -labsl_debugging_internal -labsl_debug -labsl_synchronization', -+ '-labsl_stacktrace -labsl_symbolize -labsl_debugging_internal -labsl_debug -labsl_synchronization -labsl_tracing_internal', - ], - }, - }, -@@ -128,7 +128,7 @@ - 'all_dependent_settings': { - 'link_settings': { - 'libraries': [ -- '-labsl_flags_internal -labsl_raw_hash_set -labsl_city -labsl_hash -labsl_low_level_hash -labsl_synchronization -labsl_flags_reflection -labsl_flags_marshalling', -+ '-labsl_flags_internal -labsl_raw_hash_set -labsl_city -labsl_hash -labsl_low_level_hash -labsl_synchronization -labsl_tracing_internal -labsl_flags_reflection -labsl_flags_marshalling', - ], - }, - }, -@@ -398,7 +398,7 @@ - 'all_dependent_settings': { - 'link_settings': { - 'libraries': [ -- '-labsl_synchronization -labsl_graphcycles_internal -labsl_string_view', -+ '-labsl_synchronization -labsl_graphcycles_internal -labsl_string_view -labsl_tracing_internal', - ], - }, - }, diff --git a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20250512.patch b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20250512.patch deleted file mode 100644 index 355a2c8d2fb0..000000000000 --- a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20250512.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/base/absl.gyp b/src/base/absl.gyp -index a022b31..45749d8 100644 ---- a/src/base/absl.gyp -+++ b/src/base/absl.gyp -@@ -275,7 +275,7 @@ - 'all_dependent_settings': { - 'link_settings': { - 'libraries': [ -- '-labsl_random_distributions -labsl_random_internal_pool_urbg -labsl_random_internal_randen -labsl_random_internal_randen_hwaes -labsl_random_internal_randen_hwaes_impl -labsl_random_internal_randen_slow -labsl_random_internal_seed_material -labsl_random_seed_gen_exception -labsl_random_seed_sequences', -+ '-labsl_random_distributions -labsl_random_internal_entropy_pool -labsl_random_internal_randen -labsl_random_internal_randen_hwaes -labsl_random_internal_randen_hwaes_impl -labsl_random_internal_randen_slow -labsl_random_internal_seed_material -labsl_random_seed_gen_exception -labsl_random_seed_sequences', - ], - }, - }, diff --git a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil.patch b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil.patch deleted file mode 100644 index 08421910d098..000000000000 --- a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://bugs.gentoo.org/912776 -Adapted from https://src.fedoraproject.org/rpms/mozc/raw/aa3cba136c9a28e176d246f450465d3a8a4e8533/f/mozc-build-new-abseil.patch ---- a/src/base/init_mozc.cc -+++ b/src/base/init_mozc.cc -@@ -87,7 +87,10 @@ std::string GetLogFilePathFromProgramName(const std::string &program_name) { - void ParseCommandLineFlags(int argc, char **argv) { - absl::flags_internal::ParseCommandLineImpl( - argc, argv, -+ #if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20230802 -+ // Abseil 20230802.0 does not use ArgvListAction - absl::flags_internal::ArgvListAction::kRemoveParsedArgs, -+ #endif - // Suppress help messages invoked by --help and others. - // Use UsageFlagsAction::kHandleUsage to enable it. - absl::flags_internal::UsageFlagsAction::kIgnoreUsage, diff --git a/app-i18n/mozc/files/mozc-2.28.5029.102-cxx20.patch b/app-i18n/mozc/files/mozc-2.28.5029.102-cxx20.patch deleted file mode 100644 index e8bb1f04b8df..000000000000 --- a/app-i18n/mozc/files/mozc-2.28.5029.102-cxx20.patch +++ /dev/null @@ -1,23 +0,0 @@ -Gentoo-bug: https://bugs.gentoo.org/960019 -Thanks-to: Guillaume Lespinasse - ---- a/src/gyp/common.gypi -+++ b/src/gyp/common.gypi -@@ -219,7 +219,7 @@ - }], - ['compiler_target=="clang" or compiler_target=="gcc"', { - 'cflags_cc': [ -- '-std=c++17', -+ '-std=c++20', - ], - }], - ], -@@ -239,7 +239,7 @@ - }], - ['compiler_host=="clang" or compiler_host=="gcc"', { - 'cflags_cc': [ -- '-std=c++17', -+ '-std=c++20', - ], - }], - ], diff --git a/app-i18n/mozc/mozc-2.28.5029.102-r6.ebuild b/app-i18n/mozc/mozc-2.28.5029.102-r6.ebuild deleted file mode 100644 index b4128efba4ba..000000000000 --- a/app-i18n/mozc/mozc-2.28.5029.102-r6.ebuild +++ /dev/null @@ -1,423 +0,0 @@ -# Copyright 2010-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -PYTHON_COMPAT=( python3_{11..14} ) - -inherit desktop edo elisp-common multiprocessing python-any-r1 savedconfig toolchain-funcs xdg - -DESCRIPTION="Mozc - Japanese input method editor" -HOMEPAGE="https://github.com/google/mozc"; - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/google/mozc"; - EGIT_SUBMODULES=(src/third_party/japanese_usage_dictionary) -else - MOZC_GIT_REVISION="305e9a7374254148474d067c46d55a4ee6081837" - MOZC_DATE="${PV#*_p}" - MOZC_DATE="${MOZC_DATE%%_p*}" - - FCITX_MOZC_GIT_REVISION="242b4f703cba27d4ff4dc123c713a478f964e001" - FCITX_MOZC_DATE="${PV#*_p}" - FCITX_MOZC_DATE="${FCITX_MOZC_DATE#*_p}" - FCITX_MOZC_DATE="${FCITX_MOZC_DATE%%_p*}" - - JAPANESE_USAGE_DICTIONARY_GIT_REVISION="a4a66772e33746b91e99caceecced9a28507e925" - JAPANESE_USAGE_DICTIONARY_DATE="20180701040110" - SRC_URI=" - https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz - -> ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz - https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz - -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz - https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.28.5029.102-patches.tar.xz - fcitx5? ( - https://github.com/fcitx/${PN}/archive/${FCITX_MOZC_GIT_REVISION}.tar.gz - -> fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz - ) - " - S="${WORKDIR}/${P}/src" - KEYWORDS="amd64 arm64 ~loong ~ppc64 x86" -fi - -# Mozc: BSD -# src/data/dictionary_oss: ipadic, public-domain -# src/data/unicode: unicode -# japanese-usage-dictionary: BSD-2 -LICENSE="BSD BSD-2 ipadic public-domain unicode" -SLOT="0" -IUSE="debug emacs fcitx5 +gui +ibus renderer test" -REQUIRED_USE="|| ( emacs fcitx5 ibus )" -RESTRICT="!test? ( test )" - -BDEPEND=" - dev-build/gyp - $(python_gen_any_dep ' - dev-python/six[${PYTHON_USEDEP}] - ') - <dev-libs/protobuf-32[protoc(+)] - app-alternatives/ninja - virtual/pkgconfig - emacs? ( app-editors/emacs:* ) - fcitx5? ( sys-devel/gettext ) -" -DEPEND=" - =dev-cpp/abseil-cpp-20250512*:= - <dev-libs/protobuf-32:= - fcitx5? ( - app-i18n/fcitx:5 - app-i18n/libime - sys-devel/gettext - virtual/libintl - ) - gui? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - ibus? ( - >=app-i18n/ibus-1.4.1 - dev-libs/glib:2 - x11-libs/libxcb - ) - renderer? ( - dev-libs/glib:2 - x11-libs/cairo - x11-libs/gtk+:2 - x11-libs/pango - ) - test? ( - >=dev-cpp/gtest-1.8.0 - dev-libs/jsoncpp - )" -RDEPEND=" - =dev-cpp/abseil-cpp-20250512*:=[cxx17(+)] - <dev-libs/protobuf-32:= - emacs? ( app-editors/emacs:* ) - fcitx5? ( - app-i18n/fcitx:5 - app-i18n/libime - sys-devel/gettext - virtual/libintl - ) - gui? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - ibus? ( - >=app-i18n/ibus-1.4.1 - dev-libs/glib:2 - x11-libs/libxcb - ) - renderer? ( - dev-libs/glib:2 - x11-libs/cairo - x11-libs/gtk+:2 - x11-libs/pango - ) -" - -SITEFILE="50${PN}-gentoo.el" - -PATCHES=( - "${WORKDIR}/${P}-patches" - "${FILESDIR}/${P}-abseil.patch" - "${FILESDIR}/${P}-abseil-20230802.0.patch" - "${FILESDIR}/${P}-abseil-20240116.patch" - "${FILESDIR}/${P}-abseil-20250127.patch" - "${FILESDIR}/${P}-abseil-20250512.patch" - "${FILESDIR}/${P}-cxx20.patch" # bug 960019 -) - -python_check_deps() { - python_has_version "dev-python/six[${PYTHON_USEDEP}]" -} - -src_unpack() { - if [[ "${PV}" == "9999" ]]; then - git-r3_src_unpack - - if use fcitx5; then - local EGIT_SUBMODULES=() - git-r3_fetch https://github.com/fcitx/mozc refs/heads/fcitx - git-r3_checkout https://github.com/fcitx/mozc "${WORKDIR}/fcitx-mozc" - cp -pr "${WORKDIR}"/fcitx{,5}-mozc || die - fi - else - unpack ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz - mv mozc-${MOZC_GIT_REVISION} ${P} || die - - unpack ${P}-patches.tar.xz - - unpack japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz - cp -p \ - japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}/usage_dict.txt \ - ${P}/src/third_party/japanese_usage_dictionary || die - - if use fcitx5; then - unpack fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz - cp -pr mozc-${FCITX_MOZC_GIT_REVISION} fcitx5-${PN} || die - rm -r mozc-${FCITX_MOZC_GIT_REVISION} || die - fi - fi -} - -src_prepare() { - if use fcitx5; then - cp -pr "${WORKDIR}/fcitx5-mozc/src/unix/fcitx5" unix || die - PATCHES+=( "${FILESDIR}/${P}-abseil-20230802.0-fcitx5.patch" ) - fi - - pushd "${WORKDIR}/${P}" > /dev/null || die - default - popd > /dev/null || die - - sed \ - -e "s/def GypMain(options, unused_args):/def GypMain(options, gyp_args):/" \ - -e "s/RunOrDie(gyp_command + gyp_options)/RunOrDie(gyp_command + gyp_options + gyp_args)/" \ - -e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs "${MAKEOPTS}" 999)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \ - -i build_mozc.py || die - - local ar=($(tc-getAR)) - local cc=($(tc-getCC)) - local cxx=($(tc-getCXX)) - local ld=($(tc-getLD)) - local nm=($(tc-getNM)) - local readelf=($(tc-getREADELF)) - - # Use absolute paths. Non-absolute paths are mishandled by GYP. - ar[0]=$(type -P ${ar[0]}) - cc[0]=$(type -P ${cc[0]}) - cxx[0]=$(type -P ${cxx[0]}) - ld[0]=$(type -P ${ld[0]}) - nm[0]=$(type -P ${nm[0]}) - readelf[0]=$(type -P ${readelf[0]}) - - sed \ - -e "s:<!(which ar):${ar[@]}:" \ - -e "s:<!(which clang):${cc[@]}:" \ - -e "s:<!(which clang++):${cxx[@]}:" \ - -e "s:<!(which ld):${ld[@]}:" \ - -e "s:<!(which nm):${nm[@]}:" \ - -e "s:<!(which readelf):${readelf[@]}:" \ - -i gyp/common.gypi || die - - # https://github.com/google/mozc/issues/489 - sed \ - -e "/'-lc++'/d" \ - -e "/'-stdlib=libc++'/d" \ - -i gyp/common.gypi || die - - # bug #877765 - restore_config mozcdic-ut.txt - if [[ -f /mozcdic-ut.txt && -s mozcdic-ut.txt ]]; then - einfo "mozcdic-ut.txt found. Adding to mozc dictionary..." - cat mozcdic-ut.txt >> "${WORKDIR}/${P}/src/data/dictionary_oss/dictionary00.txt" || die - fi -} - -src_configure() { - if use debug; then - BUILD_TYPE="Debug" - else - BUILD_TYPE="Release" - fi - - local gyp_arguments=() - - if tc-is-gcc; then - gyp_arguments+=(-D compiler_host=gcc -D compiler_target=gcc) - elif tc-is-clang; then - gyp_arguments+=(-D compiler_host=clang -D compiler_target=clang) - else - gyp_arguments+=(-D compiler_host=unknown -D compiler_target=unknown) - fi - - gyp_arguments+=(-D debug_extra_cflags=) - gyp_arguments+=(-D release_extra_cflags=) - - gyp_arguments+=(-D use_fcitx5=$(usex fcitx5 YES NO)) - gyp_arguments+=(-D use_libibus=$(usex ibus 1 0)) - gyp_arguments+=(-D use_libprotobuf=1) - gyp_arguments+=(-D use_system_abseil_cpp=1) - gyp_arguments+=(-D use_system_gtest=$(usex test 1 0)) - gyp_arguments+=(-D use_system_jsoncpp=$(usex test 1 0)) - gyp_arguments+=(-D enable_gtk_renderer=$(usex renderer 1 0)) - - gyp_arguments+=(-D server_dir="${EPREFIX}/usr/libexec/mozc") - gyp_arguments+=(-D document_dir="${EPREFIX}/usr/libexec/mozc/documents") - - if use ibus; then - gyp_arguments+=(-D ibus_mozc_path="${EPREFIX}/usr/libexec/ibus-engine-mozc") - gyp_arguments+=(-D ibus_mozc_icon_path="${EPREFIX}/usr/share/ibus-mozc/product_icon.png") - fi - - unset AR CC CXX LD NM READELF - - edo "${PYTHON}" build_mozc.py gyp \ - --gypdir="${EPREFIX}/usr/bin" \ - --server_dir="${EPREFIX}/usr/libexec/mozc" \ - --verbose \ - $(usex gui "" --noqt) \ - -- "${gyp_arguments[@]}" -} - -src_compile() { - local targets=(server/server.gyp:mozc_server) - if use emacs; then - targets+=(unix/emacs/emacs.gyp:mozc_emacs_helper) - fi - if use fcitx5; then - targets+=(unix/fcitx5/fcitx5.gyp:fcitx5-mozc) - fi - if use gui; then - targets+=(gui/gui.gyp:mozc_tool) - fi - if use ibus; then - targets+=(unix/ibus/ibus.gyp:ibus_mozc) - fi - if use renderer; then - targets+=(renderer/renderer.gyp:mozc_renderer) - fi - if use test; then - targets+=(gyp/tests.gyp:unittests) - fi - - if use ibus; then - GYP_IBUS_FLAG="--use_gyp_for_ibus_build" - fi - - edo "${PYTHON}" build_mozc.py build -c ${BUILD_TYPE} ${GYP_IBUS_FLAG} -v "${targets[@]}" - - if use emacs; then - elisp-compile unix/emacs/*.el - fi -} - -src_test() { - edo "${PYTHON}" build_mozc.py runtests -c ${BUILD_TYPE} --test_jobs 1 -} - -src_install() { - exeinto /usr/libexec/mozc - doexe out_linux/${BUILD_TYPE}/mozc_server - - [[ -s mozcdic-ut.txt ]] && save_config mozcdic-ut.txt - - if use gui; then - doexe out_linux/${BUILD_TYPE}/mozc_tool - fi - - if use renderer; then - doexe out_linux/${BUILD_TYPE}/mozc_renderer - fi - - insinto /usr/libexec/mozc/documents - doins data/installer/credits_en.html - - if use emacs; then - dobin out_linux/${BUILD_TYPE}/mozc_emacs_helper - elisp-install ${PN} unix/emacs/*.{el,elc} - elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN} - fi - - if use fcitx5; then - exeinto /usr/$(get_libdir)/fcitx5 - doexe out_linux/${BUILD_TYPE}/fcitx5-mozc.so - - insinto /usr/share/fcitx5/addon - newins unix/fcitx5/mozc-addon.conf mozc.conf - - insinto /usr/share/fcitx5/inputmethod - doins unix/fcitx5/mozc.conf - - local orgfcitx5="org.fcitx.Fcitx5.fcitx-mozc" - newicon -s 128 data/images/product_icon_32bpp-128.png ${orgfcitx5}.png - newicon -s 128 data/images/product_icon_32bpp-128.png fcitx-mozc.png - newicon -s 32 data/images/unix/ime_product_icon_opensource-32.png ${orgfcitx5}.png - newicon -s 32 data/images/unix/ime_product_icon_opensource-32.png fcitx-mozc.png - for uiimg in ../../fcitx5-mozc/scripts/icons/ui-*.png; do - dimg=${uiimg#*ui-} - newicon -s 48 ${uiimg} ${orgfcitx5}-${dimg/_/-} - newicon -s 48 ${uiimg} fcitx-mozc-${dimg/_/-} - done - - local locale mo_file - for mo_file in unix/fcitx5/po/*.po; do - locale="${mo_file##*/}" - locale="${locale%.po}" - msgfmt ${mo_file} -o ${mo_file/.po/.mo} || die - insinto /usr/share/locale/${locale}/LC_MESSAGES - newins "${mo_file/.po/.mo}" fcitx5-mozc.mo - done - msgfmt --xml -d unix/fcitx5/po/ --template unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml.in -o \ - unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml || die - insinto /usr/share/metainfo - doins unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml - fi - - if use ibus; then - exeinto /usr/libexec - newexe out_linux/${BUILD_TYPE}/ibus_mozc ibus-engine-mozc - - insinto /usr/share/ibus/component - doins out_linux/${BUILD_TYPE}/gen/unix/ibus/mozc.xml - - insinto /usr/share/ibus-mozc - newins data/images/unix/ime_product_icon_opensource-32.png product_icon.png - local image - for image in data/images/unix/ui-*.png; do - newins "${image}" "${image#data/images/unix/ui-}" - done - fi -} - -pkg_postinst() { - elog - elog "ENVIRONMENTAL VARIABLES" - elog - elog "MOZC_SERVER_DIRECTORY" - elog " Mozc server directory" - elog " Value used by default: \"${EPREFIX}/usr/libexec/mozc\"" - elog "MOZC_DOCUMENTS_DIRECTORY" - elog " Mozc documents directory" - elog " Value used by default: \"${EPREFIX}/usr/libexec/mozc/documents\"" - elog "MOZC_CONFIGURATION_DIRECTORY" - elog " Mozc configuration directory" - elog " Value used by default: \"~/.mozc\"" - elog - if use emacs; then - elog - elog "USAGE IN EMACS" - elog - elog "mozc-mode is minor mode to input Japanese text using Mozc server." - elog "mozc-mode can be used via LEIM (Library of Emacs Input Method)." - elog - elog "In order to use mozc-mode by default, the following settings should be added to" - elog "Emacs init file (~/.emacs.d/init.el or ~/.emacs):" - elog - elog " (require 'mozc)" - elog " (set-language-environment \"Japanese\")" - elog " (setq default-input-method \"japanese-mozc\")" - elog - elog "With the above settings, typing C-\\ (which is bound to \"toggle-input-method\"" - elog "by default) will enable mozc-mode." - elog - elog "Alternatively, at run time, after loading mozc.el, mozc-mode can be activated by" - elog "calling \"set-input-method\" and entering \"japanese-mozc\"." - elog - - elisp-site-regen - fi - xdg_pkg_postinst -} - -pkg_postrm() { - if use emacs; then - elisp-site-regen - fi - xdg_pkg_postrm -}
