From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id F1FAB138206 for ; Sat, 30 Apr 2016 15:21:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 329AFE0835; Sat, 30 Apr 2016 15:21:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C916CE0835 for ; Sat, 30 Apr 2016 15:21:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 689AA340D57 for ; Sat, 30 Apr 2016 15:21:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2A3A6188 for ; Sat, 30 Apr 2016 15:21:31 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1462029672.295de3a6c62704f437339af9c5e3751bfa65f601.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/ignition-transport/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/ignition-transport/files/protobuf3.patch X-VCS-Directories: net-libs/ignition-transport/files/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 295de3a6c62704f437339af9c5e3751bfa65f601 X-VCS-Branch: master Date: Sat, 30 Apr 2016 15:21:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e0ccbad2-7b2d-4e70-a186-055afdfbed4c X-Archives-Hash: 4566a8f5e8223586016fcf5d356cee39 commit: 295de3a6c62704f437339af9c5e3751bfa65f601 Author: Alexis Ballier gentoo org> AuthorDate: Sat Apr 30 15:20:39 2016 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Sat Apr 30 15:21:12 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=295de3a6 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 gentoo.org> net-libs/ignition-transport/files/protobuf3.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net-libs/ignition-transport/files/protobuf3.patch b/net-libs/ignition-transport/files/protobuf3.patch index c5cdd32..fffe229 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 ++#if GOOGLE_PROTOBUF_VERSION >= 3000000 +#include ++#endif #ifdef _MSC_VER #pragma warning(pop) #endif