| 1 |
commit: 295de3a6c62704f437339af9c5e3751bfa65f601 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 30 15:20:39 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 30 15:21:12 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=295de3a6 |
| 7 |
|
| 8 |
net-libs/ignition-transport: add version guards to the protobuf3 patch so that protobuf2 support still works. Bug #581214 by Victor Mataré. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 12 |
|
| 13 |
net-libs/ignition-transport/files/protobuf3.patch | 4 +++- |
| 14 |
1 file changed, 3 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/net-libs/ignition-transport/files/protobuf3.patch b/net-libs/ignition-transport/files/protobuf3.patch |
| 17 |
index c5cdd32..fffe229 100644 |
| 18 |
--- a/net-libs/ignition-transport/files/protobuf3.patch |
| 19 |
+++ b/net-libs/ignition-transport/files/protobuf3.patch |
| 20 |
@@ -2,11 +2,13 @@ Index: ignition-transport-1.1.0/include/ignition/transport/RepHandler.hh |
| 21 |
=================================================================== |
| 22 |
--- ignition-transport-1.1.0.orig/include/ignition/transport/RepHandler.hh |
| 23 |
+++ ignition-transport-1.1.0/include/ignition/transport/RepHandler.hh |
| 24 |
-@@ -22,6 +22,7 @@ |
| 25 |
+@@ -22,6 +22,9 @@ |
| 26 |
#pragma warning(push, 0) |
| 27 |
#endif |
| 28 |
#include <google/protobuf/message.h> |
| 29 |
++#if GOOGLE_PROTOBUF_VERSION >= 3000000 |
| 30 |
+#include <google/protobuf/stubs/casts.h> |
| 31 |
++#endif |
| 32 |
#ifdef _MSC_VER |
| 33 |
#pragma warning(pop) |
| 34 |
#endif |
Archives