Include patch to build against protobuf 3.11
This commit is contained in:
parent
5a33d598a1
commit
1a0ed504de
26
community-mysql-protobuf-3-11.patch
Normal file
26
community-mysql-protobuf-3-11.patch
Normal file
@ -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 <google/protobuf/repeated_field.h>
|
||||||
|
#include <google/protobuf/text_format.h>
|
||||||
|
#include <google/protobuf/wire_format_lite.h>
|
||||||
|
-#include <google/protobuf/wire_format_lite_inl.h>
|
||||||
|
|
||||||
|
#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 <google/protobuf/repeated_field.h>
|
||||||
|
#include <google/protobuf/text_format.h>
|
||||||
|
#include <google/protobuf/wire_format_lite.h>
|
||||||
|
-#include <google/protobuf/wire_format_lite_inl.h>
|
||||||
|
|
||||||
|
#ifdef USE_MYSQLX_FULL_PROTO
|
||||||
|
#include "plugin/x/generated/protobuf/mysqlx.pb.h"
|
@ -67,7 +67,7 @@
|
|||||||
|
|
||||||
Name: community-mysql
|
Name: community-mysql
|
||||||
Version: 8.0.18
|
Version: 8.0.18
|
||||||
Release: 5%{?with_debug:.debug}%{?dist}
|
Release: 6%{?with_debug:.debug}%{?dist}
|
||||||
Summary: MySQL client programs and shared libraries
|
Summary: MySQL client programs and shared libraries
|
||||||
URL: http://www.mysql.com
|
URL: http://www.mysql.com
|
||||||
|
|
||||||
@ -106,6 +106,9 @@ Patch52: %{pkgnamepatch}-sharedir.patch
|
|||||||
Patch55: %{pkgnamepatch}-rpath.patch
|
Patch55: %{pkgnamepatch}-rpath.patch
|
||||||
Patch75: %{pkgnamepatch}-arm32-timer.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
|
# Patches taken from boost 1.59
|
||||||
Patch115: boost-1.58.0-pool.patch
|
Patch115: boost-1.58.0-pool.patch
|
||||||
Patch125: boost-1.57.0-mpl-print.patch
|
Patch125: boost-1.57.0-mpl-print.patch
|
||||||
@ -352,6 +355,7 @@ the MySQL sources.
|
|||||||
%patch52 -p1
|
%patch52 -p1
|
||||||
%patch55 -p1
|
%patch55 -p1
|
||||||
%patch75 -p1
|
%patch75 -p1
|
||||||
|
%patch76 -p1
|
||||||
|
|
||||||
# Patch Boost
|
# Patch Boost
|
||||||
pushd boost/boost_1_??_0
|
pushd boost/boost_1_??_0
|
||||||
@ -802,6 +806,9 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Dec 19 2019 Adrian Reber <adrian@lisas.de> - 8.0.18-6
|
||||||
|
- Include patch to build against protobuf 3.11
|
||||||
|
|
||||||
* Thu Dec 19 2019 Orion Poplawski <orion@nwra.com> - 8.0.18-5
|
* Thu Dec 19 2019 Orion Poplawski <orion@nwra.com> - 8.0.18-5
|
||||||
- Rebuild for protobuf 3.11
|
- Rebuild for protobuf 3.11
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user