summaryrefslogtreecommitdiff
path: root/app-i18n/mozc
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-02-02 01:39:05 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-02-02 01:39:05 +0000
commitfcc5224904648a8e6eb528d7603154160a20022f (patch)
tree3bfce096b38a9cea8eed13fc70c1526c456e9abd /app-i18n/mozc
parent2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)
gentoo resync : 02.02.2022
Diffstat (limited to 'app-i18n/mozc')
-rw-r--r--app-i18n/mozc/Manifest7
-rw-r--r--app-i18n/mozc/files/mozc-2.23.2815.102-protobuf-3.18.patch13
-rw-r--r--app-i18n/mozc/mozc-2.23.2815.102.ebuild (renamed from app-i18n/mozc/mozc-2.23.2815.102-r1.ebuild)11
-rw-r--r--app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild (renamed from app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429-r1.ebuild)12
-rw-r--r--app-i18n/mozc/mozc-9999.ebuild4
5 files changed, 31 insertions, 16 deletions
diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index f231ceb8111e..4b073e661da7 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -3,6 +3,7 @@ AUX mozc-2.20.2673.102-tests_build.patch 1037 BLAKE2B 8f3c0b3361371a994957a89f5b
AUX mozc-2.20.2673.102-tests_skipping.patch 2086 BLAKE2B a104d6a83b02b49e1208be1b39699b90ad419d8befa29ed0366f7cbc454fe9ce27361f21897a5c74dadfc2d9eb31a30d7237e20db8c1fb205b8e71b40f4a0e57 SHA512 4a2e5a35c5e65ebeb737f656d6efb313c660c2c7cf62abd5d9295fd16e2dffde21d069cd74fd0cfd2454cd7f7c9d136dfbadbf79832db8441c619ff37c7e4b0e
AUX mozc-2.23.2815.102-environmental_variables.patch 4636 BLAKE2B 2c1d952899b50d0205127fe5f708c8cc8ad115db35f1ebfe5b589550203ee64fe06b0d66b10989c12063feff96f679ebd6ee4562651ac81681019634e6e9c462 SHA512 40e87a52d96794a91f5cf77f387d341b7d58a4b27e3d1455c4230fbe75107c09c3bd4784394437265548ee2704a4d1838cc0965f0333e554484dafe8b106cb7b
AUX mozc-2.23.2815.102-gcc-8.patch 496 BLAKE2B 318fcda19cf4f7e95920b5df4f5638621bcae992891941fa6f220d4dac1b2eac0faeda7a857a587baed41b361608f20c4bbda0d9a69a60b823572482c6789f46 SHA512 9c2b0e9695f4cd050f0d5f35d0e23f22715b9c6e5607629c7dc023560a5191bd755497fe6fe5306789c00e68d5bd9b7179d5515c982967788fca432134b71cad
+AUX mozc-2.23.2815.102-protobuf-3.18.patch 610 BLAKE2B 7df20afc96279c6419e7941f11f1c71451b23d46efcbb6b57b17472dbaf3c5070e4672b417ffe8ae47774aa586e4fe4e6f792f99eea174a9e765f46dc90e409e SHA512 53e4db422c39a6c31ab2f31bc1ec6f4ca8cb9f025fa140068755201f9c224c40f0191269561b8c6fad479519a7165fd543b0074a49ec9d3985e5b4265bfa7a00
AUX mozc-2.23.2815.102-python-3_1.patch 19991 BLAKE2B e553f5b3beb7a82f9f91f585a17004f96d9bb3883b432af2f4232211de3d8c4e348cf0d1327fe2e49410112540a01533068ca76464a7deb79429bfa7c49f58c8 SHA512 7d51f282fa3132d279b979ae96d2d7a1a3009c2ad96544033084deb0b739638ae69263b0067172a890d5ca3dd7e47f412af05b8f57ee64505a040cbdb77af388
AUX mozc-2.23.2815.102-python-3_2.patch 17794 BLAKE2B 53849d003e3821a6d07e5019d0defb9b4558f91938da2367e82cf5327d2c69e13107eb91b7c05b731e1693ca02ca1e61771b81c29d391e412a43fd0fe64973b8 SHA512 a8d017d9b5aa7c89638fcb464a016b8e98b2e20dacc0c68c4362824cad315e0c76c15cabce84059de4a3d2184c1388289f253ebd22f1c640a3946a1189955d72
AUX mozc-2.23.2815.102-python-3_3.patch 17011 BLAKE2B b7a40ec699da304130ab8b0e149d57ebc1b31c608c03fb35104918e0d33289eb5b40211a18f2083a2addcaed68b691ef2d029c106e2f2fec861f416a2e5f2134 SHA512 52b5cd4ee5e61582f2b9172a927e9e54bf07aea90462448fd63385c7be12c37b19cbdd784a21db3950ec4269249221f4f3bb3570ce0068d5a2448db63a33463c
@@ -22,7 +23,7 @@ DIST japanese-usage-dictionary-20180701040110.tar.gz 71285 BLAKE2B dfad056a1d506
DIST mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch 40296 BLAKE2B 982f43fa68031eb0f779ec4d034fef838a4fce7834291db889c9edffba3df4acd5bfdf187dd4a52ee8fd0714de943f9d5112070cd69502e1449dab4dbf8543b2 SHA512 6e05b2f22663ddbfb24a8344928ec24c0b4cf523728c1623367970b8f263142af95c056c82d0827414833d5b9f26c3a024a04a688851021601a5cbcc1474e754
DIST mozc-2.23.2815.102.tar.gz 47739041 BLAKE2B 045a8a4a07e09cf923b67824111cdf672febc30256a6aef951ae779a3f582b3860042750d766120e376898c63be5b4baea870798a192cee34b0d48647e1ec5e6 SHA512 a3face616ca89990bca52371dcc8003604ebe0e9633116a64550add070152b1bc4d9b21e9f102c5afa6f8b1aa11d8dbc4bafbcebfaf4a12a934f085f245d548f
DIST mozc-2.26.4220-20201212102434.tar.gz 37106063 BLAKE2B 7d3c236809c8feb017f35e3f7a9b024ac34204f483c69913a2d1ae6b771054548f7f81afde35ed3a6887c9f7503584cee0fc646653fc7cde6fd015158de9c3d3 SHA512 9d87947b9b9256a3cc66cb23ab6caf4b6974142090b0d315c101bdc700fd289c259d09cb7f02f5f9e7462f48d652cd2d5b4822a645751fdcaed88b939520c429
-EBUILD mozc-2.23.2815.102-r1.ebuild 11243 BLAKE2B 505b4fed9085449137278b129bd958ac0dcb008c2f351aa0f7f97b537466fab362607b7ef0de78a7684b5ded21d04cf3d743c95eb88b0bbcef52695a33bb4f49 SHA512 2d5277039f39b5355b33cb823e1f7830c435e9e0651770a1d9360fd8bec0b8d78be440143a76408cd7103153c99474dbeb6eb755a4da2a045f63b02b4d5ccf96
-EBUILD mozc-2.26.4220_p20201212102434_p20201219202429-r1.ebuild 10397 BLAKE2B 386373c9d31a2a1c2406f3cd77a36d6d7810fe70aff8f168cb46730e118947bf80c74567d8c8e5f12143ea55a214fb13bebbc9d8e0006533bfc8930be42abc31 SHA512 50703513f3fecb8b5093164f14d0a1b5c30c5614884a0bcaf47db6ec3c53885c680132b723e8263308b0c5a7cad1f81835901159016acedbb0c270e2ea5eabec
-EBUILD mozc-9999.ebuild 10244 BLAKE2B 0d4c7ddd0473ef83919b242940df83d078875478113ac40e359c9520c38492b233afe34bbcd4e588b3b08218ad3566e17d1cfee71c2bd96f1bb2299b7bd8e522 SHA512 8af2b58ea4dcb680ff82106f0a4b9223346a4cd787c52726447c822a1890c7afc0d4c837ac952204a08b0b2a07972ebae2f721c8987b5e5ddb45cdfae5f98a5c
+EBUILD mozc-2.23.2815.102.ebuild 11311 BLAKE2B b72bbc79a438821b1304d0b03411e71e6622d737da822ab4ea7a9f714d8dd4dd80438ce60f71adefec6a8561e28f93b672d8c8eb92e59e31bc498c8ecb356102 SHA512 e1a85a72689e4c012270a5e730fc3a519274419782dcfd977890f2b6609a68963f3a9733ab8227885d59ee71e6729d27417517410657ecc5b865af1ab444b725
+EBUILD mozc-2.26.4220_p20201212102434_p20201219202429.ebuild 10406 BLAKE2B f38f270a88bd55d859d18b3f024bc3f1e4fdf16a2b8d05e325cf2e7e3537f7a0ffa571cb93e6952323b9e14c783318db64efa0324d8031a1e5a1f4e823410372 SHA512 3343db4d9e58608265dc688fe2d2d3fe8256a563d7dd78b14e1b7fbd267e792ef7764ea41d049160484f5e63b7995580e48d6dce2998c36a10c40ab11605b18f
+EBUILD mozc-9999.ebuild 10241 BLAKE2B ed2748f5a233f05bfa1aa502405adde852b5ac1113da79396a98db3a7a70dcf05bc632d81b0f83d98d15bf47f238ca1174d69441548e61a68999f404003a99ab SHA512 36e9989834338051fa10cd06dbcdc533f45534f9c579c574f720fe86960a7f0552febf2ef009dfe5986e8dd46db71d75b71123192f570364083708ebb5c94ca9
MISC metadata.xml 1016 BLAKE2B f038acf8faac7a92025ac8ab40384152bcdf7c18c31bbe48118b76e719c967633c9eb63b4c8b190607bf5dd448866a3fb180461e0d954a62671196cda2259516 SHA512 63bf48d503b5feddd94393f1a0ff1958122f271880099115332b2849cbe6454cdf3e67899e4363ae35df0ba9447acdeecb7682714f092c3dda6c752aafbd7483
diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-protobuf-3.18.patch b/app-i18n/mozc/files/mozc-2.23.2815.102-protobuf-3.18.patch
new file mode 100644
index 000000000000..15077bb1752a
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.23.2815.102-protobuf-3.18.patch
@@ -0,0 +1,13 @@
+Fix building with Protocol Buffers >=3.18.
+
+--- /src/dictionary/user_dictionary_storage.cc
++++ /src/dictionary/user_dictionary_storage.cc
+@@ -108,7 +108,7 @@
+ // wants to use more than 512MB.
+ mozc::protobuf::io::IstreamInputStream zero_copy_input(&ifs);
+ mozc::protobuf::io::CodedInputStream decoder(&zero_copy_input);
+- decoder.SetTotalBytesLimit(kDefaultTotalBytesLimit, -1);
++ decoder.SetTotalBytesLimit(kDefaultTotalBytesLimit);
+ if (!user_dictionary_storage_base.ParseFromCodedStream(&decoder)) {
+ LOG(ERROR) << "Failed to parse";
+ if (!decoder.ConsumedEntireMessage() || !ifs.eof()) {
diff --git a/app-i18n/mozc/mozc-2.23.2815.102-r1.ebuild b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
index 0d8162f9bcdb..b859d8cf38a2 100644
--- a/app-i18n/mozc/mozc-2.23.2815.102-r1.ebuild
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2010-2021 Gentoo Authors
+# Copyright 2010-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+EAPI="8"
+PYTHON_COMPAT=( python3_{8..10} )
inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
@@ -41,13 +41,13 @@ REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwritin
RESTRICT="!test? ( test )"
BDEPEND="${PYTHON_DEPS}
- <dev-libs/protobuf-3.19
+ >=dev-libs/protobuf-3.0.0
dev-util/gyp
dev-util/ninja
virtual/pkgconfig
emacs? ( app-editors/emacs:* )
fcitx4? ( sys-devel/gettext )"
-RDEPEND="<dev-libs/protobuf-3.19:=
+RDEPEND=">=dev-libs/protobuf-3.0.0:=
emacs? ( app-editors/emacs:* )
fcitx4? (
app-i18n/fcitx:4
@@ -113,6 +113,7 @@ src_prepare() {
eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-system_libraries.patch"
eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-gcc-8.patch"
eapply -p2 "${DISTDIR}/${PN}-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch"
+ eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-protobuf-3.18.patch"
eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-environmental_variables.patch"
eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-reiwa.patch"
eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-server_path_check.patch"
diff --git a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429-r1.ebuild b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
index dd114a8b310c..8ac56d51c502 100644
--- a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429-r1.ebuild
+++ b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2010-2021 Gentoo Authors
+# Copyright 2010-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+EAPI="8"
+PYTHON_COMPAT=( python3_{8..10} )
inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
@@ -47,14 +47,14 @@ REQUIRED_USE="|| ( emacs fcitx4 ibus )"
RESTRICT="!test? ( test )"
BDEPEND="$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
- <dev-libs/protobuf-3.19
+ >=dev-libs/protobuf-3.0.0
dev-util/gyp
dev-util/ninja
virtual/pkgconfig
emacs? ( app-editors/emacs:* )
fcitx4? ( sys-devel/gettext )"
DEPEND="=dev-cpp/abseil-cpp-20200923*[cxx17(+)]
- <dev-libs/protobuf-3.19:=
+ >=dev-libs/protobuf-3.0.0:=
fcitx4? (
app-i18n/fcitx:4
virtual/libintl
@@ -134,7 +134,7 @@ src_unpack() {
if use fcitx4; then
unpack fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz
- mv mozc-${FCITX_MOZC_GIT_REVISION} fcitx-${PN}
+ mv mozc-${FCITX_MOZC_GIT_REVISION} fcitx-${PN} || die
fi
fi
}
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
index 020c3b037550..911bfa462a43 100644
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2010-2020 Gentoo Authors
+# Copyright 2010-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+PYTHON_COMPAT=( python3_{8..9} )
inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 18:19:18 +0000