From nobody Mon Dec 25 09:11:41 2023 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 4SzBwt0myYz54MCw; Mon, 25 Dec 2023 09:11:42 +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 4SzBws68y7z3fBP; Mon, 25 Dec 2023 09:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703495501; 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=WGC1unZG82qvcFiit/SiPpeUP16jIO5pO8wtv3/nBNY=; b=qLZTSEyUlx3UrioiL+/7S9tmj1LH2Ff4Dh6u4QR4wJEZ2QAq7vIys+6qHL3BpvGsg112Tv RYFenh2zkaJpEnFjhRuskhhXcvZEFgF0FL0n8H7+DqsEBwisqNl9XX2e8G6Z9NqExPGSnh o7rN2fR2EG6Qn0YDMp9HmufOW6gCib11A1KyLJEPs2jdEeZ4pLeiYIstJlYgXgr+0AkxR3 6RRTpIlOsJESmMakWx0rEbNyo63X9U4N8yuZH69HO0YtdEZiT/hSHIME9eq0AeMQ7vOqwK Iar35o9p14jmqRIR+v9ErYlg7LDhp8K9CdsnwRwWDhvgzlUoE+Ap47+wLAtGog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703495501; a=rsa-sha256; cv=none; b=Vbpu725LRzMOHTwYuD7ukmcHPDlNlSewkF8ZdNqVOpGlnPHRFrBi3YFIG9zO159jvzv+GP vnCiPGwahbZFMGgiywRXbRz+jbdeqhKi/Q9kunLZjz/CLSisCv9lj8EOzPAAIDOKnStPax pe6P+ZGPKdsJPcwqoHE7iabOT/8NFppU2JA7IOFL03BI5D9ws5/k1UPecbTa6TpAUq0mdO 7Jgj5oQN4k8vDrrOUqf+RO3OPms0BjxqRImu1RMZA9nYlQ7YdqwKLVnteRoi4cvrpJwUzm Ri1fK/OxXnht2xDmsHT8Gg9Tr4kpCJs6zAo/oewmL9zQ7tI/zfiVOrdWtT3XIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703495501; 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=WGC1unZG82qvcFiit/SiPpeUP16jIO5pO8wtv3/nBNY=; b=NkuqPwusxhwH5QIMIXIplKo7ZSQqFm8oxiZxMNoce3MYCHVmRSSGhwg7kbldr3I1YVFXBn ecw6dEu/slge2KDKWqg+BKc/e6uvVSextBZ6F17sthoPohuyY/g2rWqCvcAjOlDXRnvVxV XwTAG35hQWBCL9eK5yV016XzCfYZg5Uvh+3kPsQjE1xdK1Zdl25VnUOmW1nZZ17Is4bYdW uD8Whj9t/gTal9ymoq+kYup8vyXLlPEUsfyK2vvKvbzsrZlYWRFpklaF6cSlNKRkI+Nm41 I+TAhPNSPdhrIXzKADW07IvVbrZF0im+g4CXjeZd4rbzRGh0tC7IA90Ddbka/A== 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 4SzBws59lzz150X; Mon, 25 Dec 2023 09:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BP9Bfen086962; Mon, 25 Dec 2023 09:11:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BP9BfwK086959; Mon, 25 Dec 2023 09:11:41 GMT (envelope-from git) Date: Mon, 25 Dec 2023 09:11:41 GMT Message-Id: <202312250911.3BP9BfwK086959@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: 5e342f868530 - main - japanese/fcitx-mozc: Fix build with protobuf 22+ 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: 5e342f86853071e530e07f126901e8dddc23c6f0 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=5e342f86853071e530e07f126901e8dddc23c6f0 commit 5e342f86853071e530e07f126901e8dddc23c6f0 Author: Po-Chuan Hsieh AuthorDate: 2023-12-25 09:03:14 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-12-25 09:03:14 +0000 japanese/fcitx-mozc: Fix build with protobuf 22+ PR: 275768 Reported by: Tomoaki AOKI Obtained from: https://github.com/fcitx/mozc/commit/131f6bf4ea9d1f49200f7ccd149fd30eae89ee97 --- japanese/mozc-server/files/patch-src_unix_fcitx_eim.cc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/japanese/mozc-server/files/patch-src_unix_fcitx_eim.cc b/japanese/mozc-server/files/patch-src_unix_fcitx_eim.cc new file mode 100644 index 000000000000..4c4b39a686d3 --- /dev/null +++ b/japanese/mozc-server/files/patch-src_unix_fcitx_eim.cc @@ -0,0 +1,15 @@ +Obtained from: https://github.com/fcitx/mozc/commit/131f6bf4ea9d1f49200f7ccd149fd30eae89ee97 + +--- src/unix/fcitx/eim.cc.orig 2020-08-14 17:09:18 UTC ++++ src/unix/fcitx/eim.cc +@@ -33,6 +33,10 @@ + #include + #include + #include ++ ++// Resolve macro naming conflict with absl. ++#undef InvokeFunction ++ + #include "fcitx_mozc.h" + #include "mozc_connection.h" + #include "mozc_response_parser.h"