From: Alexis Ballier <aballier@gentoo.org>
Date: Sat, 30 Apr 2016 15:20:39 +0000 (+0200)
Subject: net-libs/ignition-transport: add version guards to the protobuf3 patch so that protob... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=295de3a6c62704f437339af9c5e3751bfa65f601;p=gentoo.git

net-libs/ignition-transport: add version guards to the protobuf3 patch so that protobuf2 support still works. Bug #581214 by Victor Mataré.

Package-Manager: portage-2.2.28
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
---

diff --git a/net-libs/ignition-transport/files/protobuf3.patch b/net-libs/ignition-transport/files/protobuf3.patch
index c5cdd32a714b..fffe2296ac0d 100644
--- a/net-libs/ignition-transport/files/protobuf3.patch
+++ b/net-libs/ignition-transport/files/protobuf3.patch
@@ -2,11 +2,13 @@ Index: ignition-transport-1.1.0/include/ignition/transport/RepHandler.hh
 ===================================================================
 --- ignition-transport-1.1.0.orig/include/ignition/transport/RepHandler.hh
 +++ ignition-transport-1.1.0/include/ignition/transport/RepHandler.hh
-@@ -22,6 +22,7 @@
+@@ -22,6 +22,9 @@
  #pragma warning(push, 0)
  #endif
  #include <google/protobuf/message.h>
++#if GOOGLE_PROTOBUF_VERSION >= 3000000
 +#include <google/protobuf/stubs/casts.h>
++#endif
  #ifdef _MSC_VER
  #pragma warning(pop)
  #endif