<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e580e721cc73a3e2fd8fd2cdbf41a06ecd8eb0a1">https://github.com/macports/macports-ports/commit/e580e721cc73a3e2fd8fd2cdbf41a06ecd8eb0a1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e580e721cc73a3e2fd8fd2cdbf41a06ecd8eb0a1
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Sep 19 13:03:32 2019 -0700

<span style='display:block; white-space:pre;color:#404040;'>    percona: switch dependency to protobuf version 3
</span>---
 databases/percona/Portfile                  |  5 +++--
 databases/percona/files/patch-protobuf.diff | 21 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/percona/Portfile b/databases/percona/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8987889..d89a443 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/percona/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/percona/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ set name_package    ${name}-server
</span> set version_mysql   8.0.15
 set release         6
 # Please set revision_client and revision_server to 0 if you bump version_mysql or release.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set revision_client 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_client 3
</span> set revision_server 1
 set boost_version   1.68.0
 version             ${version_mysql}-${release}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,6 +48,7 @@ if {$subport eq $name} {
</span> 
     patchfiles          patch-cmake-install_layout.cmake.diff \
                         patch-cmake-lzma.cmake.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                        patch-protobuf.diff \
</span>                         patch-libmysql-CMakeLists.txt.diff
 
     checksums           ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,7 +64,7 @@ if {$subport eq $name} {
</span>                         port:icu \
                         port:libevent \
                         port:lz4 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:protobuf-cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:protobuf3-cpp \
</span>                         port:re2 \
                         port:zlib \
                         port:tcp_wrappers
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/percona/files/patch-protobuf.diff b/databases/percona/files/patch-protobuf.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..245f625
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/percona/files/patch-protobuf.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Removed header files no longer include in recent versions of protobuf.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- plugin/x/ngs/include/ngs_common/protocol_protobuf.h.orig       2019-08-14 07:25:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ plugin/x/ngs/include/ngs_common/protocol_protobuf.h    2019-09-17 20:10:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,7 +38,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <google/protobuf/repeated_field.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <google/protobuf/text_format.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <google/protobuf/wire_format_lite.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <google/protobuf/wire_format_lite_inl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef USE_MYSQLX_FULL_PROTO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "plugin/x/generated/protobuf/mysqlx.pb.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- plugin/x/client/mysqlxclient/xmessage.h.orig   2019-08-14 07:25:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ plugin/x/client/mysqlxclient/xmessage.h        2019-09-17 20:10:41.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,7 +36,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <google/protobuf/repeated_field.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <google/protobuf/text_format.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <google/protobuf/wire_format_lite.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <google/protobuf/wire_format_lite_inl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef USE_MYSQLX_FULL_PROTO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span></pre><pre style='margin:0'>

</pre>