From nobody Mon Feb 28 12:54:09 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2F16919F873C; Mon, 28 Feb 2022 12:54:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K6gLT50nRz3l43; Mon, 28 Feb 2022 12:54:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646052849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/zyLV8Kr6MBm4oKWXEjo8HoehvN5uijhwqSVY9mYtT0=; b=mKj2bLVSMKDQDi4cefCMkZbUBNTrHjAON9RH4+LgTz3aiQWYdYa96YM0Oq5BYtYYXV06we 0RgmYDy6zXPWOtgioyHjZAPhQmhlRyk+cuKW5WFWw+BED/A9cRYFCKwcNn+c7+O3kwnRsi dN072apg1me421W3jaaEP09VpRpyWE59c8YUxZAHYzVfleqtO5LMq2OJwQbYydLZmklJNl 6rC0yPT/38TFBItzdaTxqMx/uN2m/ZxjmgTZ5giSsJTVuZ5gFZuLZ4+oVy6sIsr/OWDKA8 tc4yzLBPwRtU8R8psStHFzuF+lYc6riuzJoLnPIi6sF2X5CaQzaSJRT1YoGOhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3B8A71BC35; Mon, 28 Feb 2022 12:54:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21SCs9Ra067731; Mon, 28 Feb 2022 12:54:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21SCs9wW067730; Mon, 28 Feb 2022 12:54:09 GMT (envelope-from git) Date: Mon, 28 Feb 2022 12:54:09 GMT Message-Id: <202202281254.21SCs9wW067730@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 4f0d214b6c92 - main - japanese/mozc-server: Fix build with protobuf 3.18.0+ List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f0d214b6c92e90f499a708503fb6dfb12cbd267 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646052849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/zyLV8Kr6MBm4oKWXEjo8HoehvN5uijhwqSVY9mYtT0=; b=w6VfsTs1uX7HQXzFCc2aiG6qqU1TfGKqkgaZ11mLjGiOhcpRr20/SrGaRi48aH+djvjYV7 Q9ds9l4CwOEzCwSAyFBL6/qp1f7MKbgP73XJzaMOp3oY+isxCLrDiR0rbH0ex1kT1zN4Wc tgxhU1GEibXxp8mlecGmSjaM0wg3yp6D/TSemyRLIc9OCppJGsQwXpeQB9b2RBrIRoDwyQ aD1sJT2IUwttKQ2WeWzD80yI1gHEEg3g5FMDxflb1JzJUyFGcnvqs0mLjZPicCtc748hPS zrl+WALlWRlFpPru1SKv2FaTQ7CnptUDZcNgzpTbbKGRVoGWnSqfVLfXDCbJkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646052849; a=rsa-sha256; cv=none; b=VmRWtlT1eA/LMOZ7KjpHR3szUU8rEcDvULU5a5B3UtFXW5xvZu6JUEz34VOAEqCLmzTZOS MKyLJ9gngzsKMl5i5piLKCz9MzrE+kVR6HbjvIsIFQKs+aEyTV6eXDRlzVcL/LLN2fa8FK KhZ2V1CpopIzc+7Vdwf/TPF4Fx9kSe1gTa3zjdV5ybf9QJIRX96llepcDcHAgrdYda9SFK KH2SJtvIjIOVZDoWkflpaNvyIUGtXZ0SpwdZEqb28dn9n6uAeSlVW6zGXiCGF7g2oLkRxM fUSBHVIaI7nCyWLBnLWdSshUjIT66qFPI55n/Zj/SNSS9o3KXD+wAlyWw6DQ1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=4f0d214b6c92e90f499a708503fb6dfb12cbd267 commit 4f0d214b6c92e90f499a708503fb6dfb12cbd267 Author: Po-Chuan Hsieh AuthorDate: 2022-02-28 09:43:08 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-02-28 12:46:45 +0000 japanese/mozc-server: Fix build with protobuf 3.18.0+ Deprecated 2-parameter SetTotalBytesLimit() has be removed since protobuf 3.18.0. Reference: https://github.com/protocolbuffers/protobuf/commit/cda795437d00a15f375d3d5e2659adac715459c6 --- ...tch-src_dictionary_user__dictionary__storage.cc | 34 ++++++++++++---------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/japanese/mozc-server/files/patch-src_dictionary_user__dictionary__storage.cc b/japanese/mozc-server/files/patch-src_dictionary_user__dictionary__storage.cc index ffcff76f194a..1350964f72cb 100644 --- a/japanese/mozc-server/files/patch-src_dictionary_user__dictionary__storage.cc +++ b/japanese/mozc-server/files/patch-src_dictionary_user__dictionary__storage.cc @@ -1,10 +1,12 @@ ---- src/dictionary/user_dictionary_storage.cc.orig 2019-03-04 18:35:55 UTC +--- src/dictionary/user_dictionary_storage.cc.orig 2020-08-14 17:09:18 UTC +++ src/dictionary/user_dictionary_storage.cc -@@ -109,7 +109,7 @@ bool UserDictionaryStorage::LoadInternal +@@ -108,8 +108,8 @@ bool UserDictionaryStorage::LoadInternal() { + // 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, -1); - if (!ParseFromCodedStream(&decoder)) { ++ decoder.SetTotalBytesLimit(kDefaultTotalBytesLimit); + if (!user_dictionary_storage_base.ParseFromCodedStream(&decoder)) { LOG(ERROR) << "Failed to parse"; if (!decoder.ConsumedEntireMessage() || !ifs.eof()) { @@ -34,7 +36,7 @@ LOG(ERROR) << "SerializeToString failed"; last_error_type_ = SYNC_FAILURE; return false; -@@ -227,7 +227,7 @@ bool UserDictionaryStorage::ExportDictio +@@ -227,7 +227,7 @@ bool UserDictionaryStorage::ExportDictionary( return false; } @@ -43,7 +45,7 @@ for (size_t i = 0; i < dic.entries_size(); ++i) { const UserDictionaryEntry &entry = dic.entries(i); ofs << entry.key() << "\t" << entry.value() << "\t" -@@ -241,7 +241,7 @@ bool UserDictionaryStorage::ExportDictio +@@ -241,7 +241,7 @@ bool UserDictionaryStorage::ExportDictionary( bool UserDictionaryStorage::CreateDictionary( const string &dic_name, uint64 *new_dic_id) { UserDictionaryCommandStatus::Status status = @@ -52,7 +54,7 @@ // Update last_error_type_ switch (status) { case UserDictionaryCommandStatus::DICTIONARY_NAME_EMPTY: -@@ -273,7 +273,7 @@ bool UserDictionaryStorage::CreateDictio +@@ -273,7 +273,7 @@ bool UserDictionaryStorage::CreateDictionary( } bool UserDictionaryStorage::DeleteDictionary(uint64 dic_id) { @@ -61,7 +63,7 @@ // Failed to delete dictionary. last_error_type_ = INVALID_DICTIONARY_ID; return false; -@@ -304,8 +304,8 @@ bool UserDictionaryStorage::RenameDictio +@@ -304,8 +304,8 @@ bool UserDictionaryStorage::RenameDictionary(uint64 di return true; } @@ -72,7 +74,7 @@ last_error_type_ = DUPLICATED_DICTIONARY_NAME; LOG(ERROR) << "duplicated dictionary name"; return false; -@@ -318,14 +318,14 @@ bool UserDictionaryStorage::RenameDictio +@@ -318,14 +318,14 @@ bool UserDictionaryStorage::RenameDictionary(uint64 di } int UserDictionaryStorage::GetUserDictionaryIndex(uint64 dic_id) const { @@ -91,7 +93,7 @@ return true; } } -@@ -335,7 +335,7 @@ bool UserDictionaryStorage::GetUserDicti +@@ -335,7 +335,7 @@ bool UserDictionaryStorage::GetUserDictionaryId(const user_dictionary::UserDictionary *UserDictionaryStorage::GetUserDictionary( uint64 dic_id) { @@ -100,7 +102,7 @@ } UserDictionaryStorage::UserDictionaryStorageErrorType -@@ -352,8 +352,8 @@ bool UserDictionaryStorage::AddToAutoReg +@@ -352,8 +352,8 @@ bool UserDictionaryStorage::AddToAutoRegisteredDiction } int auto_index = -1; @@ -111,7 +113,7 @@ auto_index = i; break; } -@@ -361,17 +361,17 @@ bool UserDictionaryStorage::AddToAutoReg +@@ -361,17 +361,17 @@ bool UserDictionaryStorage::AddToAutoRegisteredDiction UserDictionary *dic = NULL; if (auto_index == -1) { @@ -133,7 +135,7 @@ } if (dic == NULL) { -@@ -410,13 +410,13 @@ bool UserDictionaryStorage::AddToAutoReg +@@ -410,13 +410,13 @@ bool UserDictionaryStorage::AddToAutoRegisteredDiction } bool UserDictionaryStorage::ConvertSyncDictionariesToNormalDictionaries() { @@ -150,7 +152,7 @@ if (!dic->syncable()) { continue; } -@@ -433,10 +433,10 @@ bool UserDictionaryStorage::ConvertSyncD +@@ -433,10 +433,10 @@ bool UserDictionaryStorage::ConvertSyncDictionariesToN // Delete removed or unused sync dictionaries. if (dic->removed() || dic->entries_size() == 0) { @@ -164,7 +166,7 @@ continue; } -@@ -445,7 +445,7 @@ bool UserDictionaryStorage::ConvertSyncD +@@ -445,7 +445,7 @@ bool UserDictionaryStorage::ConvertSyncDictionariesToN kDictionaryNameConvertedFromSyncableDictionary; int index = 0; while (UserDictionaryUtil::ValidateDictionaryName( @@ -173,7 +175,7 @@ != UserDictionaryCommandStatus::USER_DICTIONARY_COMMAND_SUCCESS) { ++index; new_dictionary_name = Util::StringPrintf( -@@ -456,7 +456,7 @@ bool UserDictionaryStorage::ConvertSyncD +@@ -456,7 +456,7 @@ bool UserDictionaryStorage::ConvertSyncDictionariesToN dic->set_syncable(false); } @@ -182,7 +184,7 @@ return true; } -@@ -487,7 +487,7 @@ size_t UserDictionaryStorage::max_dictio +@@ -487,7 +487,7 @@ size_t UserDictionaryStorage::max_dictionary_size() { bool UserDictionaryStorage::IsValidDictionaryName(const string &name) { UserDictionaryCommandStatus::Status status = UserDictionaryUtil::ValidateDictionaryName(