[gentoo-commits] repo/gentoo:master commit in: dev-ros/tf/files/, dev-ros/tf/

[gentoo-commits] repo/gentoo:master commit in: dev-ros/tf/files/, dev-ros/tf/

[Alexis Ballier]

commit:     4d893616106d03558c8f403911e33b42ef3b731d
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 25 18:21:20 2019 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Aug 25 18:21:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d893616

dev-ros/tf: upstream fix for boost 1.70.0

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 dev-ros/tf/files/boost.patch | 28 ++++++++++++++++++++++++++++
 dev-ros/tf/tf-1.12.0.ebuild  |  3 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/dev-ros/tf/files/boost.patch b/dev-ros/tf/files/boost.patch
new file mode 100644
index 00000000000..dd926cf0584
--- /dev/null
+++ b/dev-ros/tf/files/boost.patch
@@ -0,0 +1,28 @@
+From 2eed72cb7b63fc4ee98af695c625d9a741a09897 Mon Sep 17 00:00:00 2001
+From: Maarten de Vries <maarten@de-vri.es>
+Date: Thu, 17 Jan 2019 21:40:28 +0100
+Subject: [PATCH] Remove `signals` from find_package(Boost COMPONENTS ...)
+
+tf is using signals2, which is not the same library as signals.
+Additionally, signals2 has always been header only, and header only
+libraries must not be listed in find_package.
+
+Boost 1.69 removed the old signals library entirely, so the otherwise
+useless `COMPONENTS signals` actually breaks the build.
+---
+ tf/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tf/CMakeLists.txt b/tf/CMakeLists.txt
+index 04dcb4e8..b469f658 100644
+--- a/tf/CMakeLists.txt
++++ b/tf/CMakeLists.txt
+@@ -15,7 +15,7 @@ find_package(catkin REQUIRED COMPONENTS
+     std_msgs
+     tf2_ros
+ )
+-find_package(Boost REQUIRED COMPONENTS thread signals system)
++find_package(Boost REQUIRED COMPONENTS thread system)
+ 
+ catkin_python_setup()
+ 

diff --git a/dev-ros/tf/tf-1.12.0.ebuild b/dev-ros/tf/tf-1.12.0.ebuild
index d129d24ee28..201cf57ee6b 100644
--- a/dev-ros/tf/tf-1.12.0.ebuild
+++ b/dev-ros/tf/tf-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,3 +36,4 @@ DEPEND="${RDEPEND}
 		dev-cpp/gtest
 		dev-python/nose[${PYTHON_USEDEP}]
 	)"
+PATCHES=( "${FILESDIR}/boost.patch" )