commit: f38525e82f030af3bab3b6e8e833f668c69d99c9 Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Tue Sep 16 20:59:30 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Oct 9 21:47:13 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f38525e8
app-i18n/mozc: always prefer tarball use tarball instead of zip for japanese-usage-dict to avoid CI failure Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/43597 Signed-off-by: Sam James <sam <AT> gentoo.org> app-i18n/mozc/Manifest | 2 +- app-i18n/mozc/mozc-2.31.5851.102.ebuild | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest index acaa12aed647..e37158933444 100644 --- a/app-i18n/mozc/Manifest +++ b/app-i18n/mozc/Manifest @@ -9,7 +9,7 @@ DIST cpython-3.11.10+20241016-x86_64-unknown-linux-gnu-install_only.tar.gz 29718 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 japanese-usage-dictionary-20180701040110.tar.gz 71285 BLAKE2B dfad056a1d5061b6764f583da15b9ad60a3c4421cee0430c4665d1c2779a64f9b31473c1746a3e2b9bda5167349432e51dcf7d4d48f75fde9543e9c16ff74c0d SHA512 68b4d3f52dd6cd4f00a8012a870b4f5929519cd69815b1729f3881d1f964802308f4aa101e236824b4c0f832183a9e8097437ed620403f2a652f126e7cdc1eb3 -DIST japanese-usage-dictionary-2025-01-25.zip 72776 BLAKE2B 8a0813fa8a6b179be96894e011635e905b876cd4e54917fcb00b12b81f3f7463392a2f37c6c58279fddc6681c5df95bd2f7eb266f02557537f22705002050091 SHA512 e2d71432836855192bee9ccf45781aef797d0112a0444684c782a5310cec35ff96793c2d4aba80ad2e71b789839f4fa1c70eb175be09a1c92e747639b0f6ab3e +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 diff --git a/app-i18n/mozc/mozc-2.31.5851.102.ebuild b/app-i18n/mozc/mozc-2.31.5851.102.ebuild index 7754cfbf3471..9c0df6304d20 100644 --- a/app-i18n/mozc/mozc-2.31.5851.102.ebuild +++ b/app-i18n/mozc/mozc-2.31.5851.102.ebuild @@ -17,6 +17,8 @@ MOZC_FCITX_HASH="f16444e45bd3c7f7a0af718f4af86ad181b6dd8b" ABS_VER="20250127.0" GTEST_VER="1.15.2" JUD_VER="2025-01-25" +# sha256sum of tarball +JUD_CHECKSUM="ebfc8681eb207f14a2c36a7a71522b1aa8a405d10ab36a83a9a024d4ce58c0ca" PROTO_VER="29.3" # to simplify update @@ -42,8 +44,8 @@ SRC_URI=" https://github.com/bazelbuild/bazel-central-registry/archive/${BAZEL_BCR_HASH}.tar.gz -> ${PN}-bcr-${BAZEL_BCR_HASH}.tar.gz https://github.com/abseil/abseil-cpp/releases/download/${ABS_VER}/abseil-cpp-${ABS_VER}.tar.gz - https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JUD_VER}.zip - -> japanese-usage-dictionary-${JUD_VER}.zip + https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JUD_VER}.tar.gz + -> japanese-usage-dictionary-${JUD_VER}.tar.gz https://github.com/protocolbuffers/protobuf/releases/download/v${PROTO_VER}/protobuf-${PROTO_VER}.zip https://github.com/bazelbuild/apple_support/releases/download/1.16.0/apple_support.1.16.0.tar.gz https://github.com/bazel-contrib/bazel_features/releases/download/v1.21.0/bazel_features-v1.21.0.tar.gz @@ -138,7 +140,7 @@ src_unpack() { for dep in *.{tar.gz,zip,png,svg}; do ln -sfT "${DISTDIR}/${dep}" "${WORKDIR}/bazel_dist/${dep#${P}-}" || die done - ln -sfT "${DISTDIR}"/japanese-usage-dictionary-${JUD_VER}.zip "${WORKDIR}"/bazel_dist/${JUD_VER}.zip || die + ln -sfT "${DISTDIR}"/japanese-usage-dictionary-${JUD_VER}.tar.gz "${WORKDIR}"/bazel_dist/${JUD_VER}.tar.gz || die popd || die if use fcitx5; then @@ -164,6 +166,11 @@ mozc_icons() { src_prepare() { default + # use tarball instead of zip for japanese-usage-dictionary (avoid CI failure) + sed -e "/^ *module_name = \"ja_usage_dict\"/,/^ *sha256/s/sha256 =.*,$/sha256 = \"${JUD_CHECKSUM}\",/" \ + -e "\@.*github.com/hiroyuki-komatsu/japanese-usage-dictionary@s:%s.zip:%s.tar.gz:" \ + -i MODULE.bazel || die + # patch applied by bazel with MODULE.bazel patched cp "${FILESDIR}"/${PN}-2.31.5851.102-bazel_patch-fix_shebang.patch bazel/rules_python_fix_shebang.patch || die # fix shebang
