From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 61B4D158087 for ; Sat, 29 Jan 2022 15:20:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A32C82BC00C; Sat, 29 Jan 2022 15:20:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 392C42BC00C for ; Sat, 29 Jan 2022 15:20:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CE76E3433F4 for ; Sat, 29 Jan 2022 15:20:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 327052B0 for ; Sat, 29 Jan 2022 15:20:10 +0000 (UTC) From: "Yixun Lan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" Message-ID: <1643469515.da6212a99d181d54f22c73fb2a9b8a9a5df2d21b.dlan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/files/, app-i18n/mozc/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/mozc/files/mozc-2.23.2815.102-protobuf-3.18.patch app-i18n/mozc/mozc-2.23.2815.102-r1.ebuild app-i18n/mozc/mozc-2.23.2815.102.ebuild X-VCS-Directories: app-i18n/mozc/files/ app-i18n/mozc/ X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan X-VCS-Revision: da6212a99d181d54f22c73fb2a9b8a9a5df2d21b X-VCS-Branch: master Date: Sat, 29 Jan 2022 15:20:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a1e3c7d4-26e9-4906-b694-a94b527d359e X-Archives-Hash: 5a67253d793f147d6a2def0b0055c28c commit: da6212a99d181d54f22c73fb2a9b8a9a5df2d21b Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Wed Jan 12 00:00:00 2022 +0000 Commit: Yixun Lan gentoo org> CommitDate: Sat Jan 29 15:18:35 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da6212a9 app-i18n/mozc: Fix building with >=dev-libs/protobuf-3.18.0 Closes: https://bugs.gentoo.org/828527 Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org> Signed-off-by: Yixun Lan gentoo.org> app-i18n/mozc/files/mozc-2.23.2815.102-protobuf-3.18.patch | 13 +++++++++++++ ...zc-2.23.2815.102-r1.ebuild => mozc-2.23.2815.102.ebuild} | 7 ++++--- 2 files changed, 17 insertions(+), 3 deletions(-) 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 similarity index 98% rename from app-i18n/mozc/mozc-2.23.2815.102-r1.ebuild rename to app-i18n/mozc/mozc-2.23.2815.102.ebuild index 0d8162f9bcdb..88ce0b3c1c22 100644 --- a/app-i18n/mozc/mozc-2.23.2815.102-r1.ebuild +++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild @@ -1,4 +1,4 @@ -# Copyright 2010-2021 Gentoo Authors +# Copyright 2010-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -41,13 +41,13 @@ REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwritin RESTRICT="!test? ( test )" BDEPEND="${PYTHON_DEPS} - =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.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"