From c4e2162100ff5ea3c958df03902e2353c929ba85 Mon Sep 17 00:00:00 2001
From: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Fri, 15 Dec 2023 00:22:24 +0800
Subject: databases/mysql-connector-c++: Fix build with protobuf 22+

---
 databases/mysql-connector-c++/files/patch-protobuf | 56 ++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 databases/mysql-connector-c++/files/patch-protobuf

(limited to 'databases/mysql-connector-c++/files')

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 <mysql/cdk/foundation/common.h>
+ #include <google/protobuf/io/zero_copy_stream.h>
++#include <absl/base/log_severity.h>
+ 
+ /*
+   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
-- 
cgit v1.2.3