From nobody Thu Dec 14 17:03:22 2023 X-Original-To: dev-commits-ports-all@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 4SrdwB2vTSz52l3w; Thu, 14 Dec 2023 17:03:22 +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 4SrdwB2VBQz3YZn; Thu, 14 Dec 2023 17:03:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702573402; 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=N+IUFFJyCv658yIcz3ZHXvIvmsu5YAuLVJDZFPELX7g=; b=CghZIWY4HbZJ0QO/Wp9z+7Hypeh2zB92NNedzNpw+62yxYMTzhhLDqR0TF8y3ojJ5sZ/LQ Pm/AMh9Kwz5LKymHA3sRmj90uTzsnBZgFCFHObgthKb68ErM3viITC3UN3az/KPxsxptBp RIJl7gvI0I1+lXlxwY+uR7HirayKVjZAjTznAcf6n+jZIVFAIjTiqLRDOILN/C1zRbwiRv wrFEIasrgS14qjHyIw9MjAmEe3s7TK2ponCX28jgd30jLW9ZKgwJKcwYxJ3QGqTWDJc7EB 2sWb2BirzCrvpxP+GMfESTlneQzxuU18DJ6Jd2noQve6c/qnvEAzFnlsiQXmyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702573402; a=rsa-sha256; cv=none; b=UOZhxgCgJv4AmTw6nbKEMugt3np4vk0V3bcTTDJ3TlEm/zOTQkW+E4Pdp8/AJEcf/AKPYj kIiHJ5XN+CVvB6gGYZFgAwtXlBz8XzN3TKVDW68RbTFDQjw/2EYuHjIEI8FBW9oXG4HscW WzDZPj7HPv2EOPfcqbtkZs+znDJlh5v1bU7TCwVFfN0AoK58M2VToeVoiacuAdbzBw34SH 9rY0Z8yUBhAq0gW8SCVXiKBqURvMicEn5pqGqSWyw63T6EC/FCp3XahusjHiBbjFbkvBE4 k09EcJLTsLutscDREw8a1Kcab7jTzhEUMidHXFkf6g3BkSavecFxwUQ38usVaw== 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=1702573402; 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=N+IUFFJyCv658yIcz3ZHXvIvmsu5YAuLVJDZFPELX7g=; b=JZ2uNDcu1aluuFtr55pbS6XlkjmHEBDWjRPc/m6JPDWX3mOTvDzl2iU6GhSckF2w9c9/43 3gjF4AdDpQCyBeudKrh+U/ydOo+D0dbWKoLOXtWues232w7nllS12TeAlKTHFnpdc0iK2f rhSp0qwULyNzCcn8kQs9X2QQLEvBe31vdRfAwDKaX4LNXjAnuz2cPdBv2NeX8yFM3iieDe UQS7wxgbXthqmHsRG62kwVU1AX9mi4pA6vZwf2L6K4rJBNm/il1dVg/tf4G+UqBhvgSfka GhQfBpltIDXNUm2FcJvizbcIf4yrTS1cqSq9YQwJDoVfALMXnIw0uh2asbLkdQ== 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 4SrdwB1c61zbh6; Thu, 14 Dec 2023 17:03:22 +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 3BEH3MZ5016470; Thu, 14 Dec 2023 17:03:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEH3MZX016467; Thu, 14 Dec 2023 17:03:22 GMT (envelope-from git) Date: Thu, 14 Dec 2023 17:03:22 GMT Message-Id: <202312141703.3BEH3MZX016467@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: c4e2162100ff - main - databases/mysql-connector-c++: Fix build with protobuf 22+ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: c4e2162100ff5ea3c958df03902e2353c929ba85 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=c4e2162100ff5ea3c958df03902e2353c929ba85 commit c4e2162100ff5ea3c958df03902e2353c929ba85 Author: Po-Chuan Hsieh AuthorDate: 2023-12-14 16:22:24 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-12-14 17:03:03 +0000 databases/mysql-connector-c++: Fix build with protobuf 22+ --- databases/mysql-connector-c++/files/patch-protobuf | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/databases/mysql-connector-c++/files/patch-protobuf b/databases/mysql-connector-c++/files/patch-protobuf new file mode 100644 index 000000000000..bef66563c69a --- /dev/null +++ b/databases/mysql-connector-c++/files/patch-protobuf @@ -0,0 +1,56 @@ +--- cdk/protocol/mysqlx/protocol.cc.orig 2023-03-23 16:32:48 UTC ++++ cdk/protocol/mysqlx/protocol.cc +@@ -37,6 +37,7 @@ + + #include + #include ++#include + + /* + Note: On Windows the INIT_ONCE structure was added only in later +@@ -117,7 +118,7 @@ namespace mysqlx { + Protobuf log handler initialization. + */ + +-static void log_handler(LogLevel level, const char* filename, int line, const std::string& message); ++static void log_handler(absl::LogSeverity level, const char* filename, int line, const std::string& message); + + #ifdef _WIN32 + BOOL CALLBACK log_handler_init(PINIT_ONCE, PVOID, PVOID*) +@@ -128,7 +129,6 @@ BOOL CALLBACK log_handler_init(PINIT_ONCE, PVOID, PVOI + #else + static void log_handler_init() + { +- SetLogHandler(log_handler); + } + #endif + +@@ -290,14 +290,14 @@ Message* mk_message(Protocol_side side, msg_type_t msg + */ + + static void log_handler( +- LogLevel level, const char* /*filename*/, int /*line*/, ++ absl::LogSeverity level, const char* /*filename*/, int /*line*/, + const std::string& message + ) + { + switch(level) + { +- case LOGLEVEL_FATAL: +- case LOGLEVEL_ERROR: ++ case absl::LogSeverity::kFatal: ++ case absl::LogSeverity::kError: + /* + With this code the error description is: + +@@ -311,8 +311,8 @@ static void log_handler( + */ + throw_error(cdkerrc::protobuf_error, message); + +- case LOGLEVEL_WARNING: +- case LOGLEVEL_INFO: ++ case absl::LogSeverity::kWarning: ++ case absl::LogSeverity::kInfo: + default: + { + // just ignore for now