From 420fa92a6ff86d72f822a02eacedb806d5d1af8f Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 19 Dec 2019 07:54:02 +0100 Subject: [PATCH] Include patch to build against protobuf 3.11 --- community-mysql-protobuf-3-11.patch | 26 ++++++++++++++++++++++++++ community-mysql.spec | 9 ++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 community-mysql-protobuf-3-11.patch diff --git a/community-mysql-protobuf-3-11.patch b/community-mysql-protobuf-3-11.patch new file mode 100644 index 0000000..ca7abce --- /dev/null +++ b/community-mysql-protobuf-3-11.patch @@ -0,0 +1,26 @@ +Problem report: https://bugs.mysql.com/bug.php?id=97246 +Patch source: https://github.com/Homebrew/homebrew-core/pull/45383/commits/4b4dfa1c153a05f1fd4b83c2df741f2dc5f43237 + + +diff -urN a/plugin/x/client/mysqlxclient/xmessage.h b/plugin/x/client/mysqlxclient/xmessage.h +--- a/plugin/x/client/mysqlxclient/xmessage.h 2019-09-20 18:30:51.000000000 +1000 ++++ b/plugin/x/client/mysqlxclient/xmessage.h 2019-10-16 09:12:15.000000000 +1000 +@@ -36,7 +36,6 @@ + #include + #include + #include +-#include + + #ifdef USE_MYSQLX_FULL_PROTO + +diff -urN a/plugin/x/ngs/include/ngs/protocol/protocol_protobuf.h b/plugin/x/ngs/include/ngs/protocol/protocol_protobuf.h +--- a/plugin/x/ngs/include/ngs/protocol/protocol_protobuf.h 2019-09-20 18:30:51.000000000 +1000 ++++ b/plugin/x/ngs/include/ngs/protocol/protocol_protobuf.h 2019-10-16 09:11:27.000000000 +1000 +@@ -38,7 +38,6 @@ + #include + #include + #include +-#include + + #ifdef USE_MYSQLX_FULL_PROTO + #include "plugin/x/generated/protobuf/mysqlx.pb.h" diff --git a/community-mysql.spec b/community-mysql.spec index 5909f7a..a54429d 100644 --- a/community-mysql.spec +++ b/community-mysql.spec @@ -67,7 +67,7 @@ Name: community-mysql Version: 8.0.18 -Release: 5%{?with_debug:.debug}%{?dist} +Release: 6%{?with_debug:.debug}%{?dist} Summary: MySQL client programs and shared libraries URL: http://www.mysql.com @@ -106,6 +106,9 @@ Patch52: %{pkgnamepatch}-sharedir.patch Patch55: %{pkgnamepatch}-rpath.patch Patch75: %{pkgnamepatch}-arm32-timer.patch +# Patch to build against protobuf-3.11 +Patch76: %{pkgnamepatch}-protobuf-3-11.patch + # Patches taken from boost 1.59 Patch115: boost-1.58.0-pool.patch Patch125: boost-1.57.0-mpl-print.patch @@ -352,6 +355,7 @@ the MySQL sources. %patch52 -p1 %patch55 -p1 %patch75 -p1 +%patch76 -p1 # Patch Boost pushd boost/boost_1_??_0 @@ -802,6 +806,9 @@ fi %endif %changelog +* Thu Dec 19 2019 Adrian Reber - 8.0.18-6 +- Include patch to build against protobuf 3.11 + * Thu Dec 19 2019 Orion Poplawski - 8.0.18-5 - Rebuild for protobuf 3.11