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

[Alexis Ballier]

commit:     95e570de0e3d40f44629d177ba0a427ee5e783ce
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 11:16:58 2019 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Jul 20 11:23:16 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95e570de

dev-ros/roscpp: upstream boost fix

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

 dev-ros/roscpp/files/boost.patch                   | 26 ++++++++++++++++++++++
 ...oscpp-1.14.3.ebuild => roscpp-1.14.3-r1.ebuild} |  1 +
 2 files changed, 27 insertions(+)

diff --git a/dev-ros/roscpp/files/boost.patch b/dev-ros/roscpp/files/boost.patch
new file mode 100644
index 00000000000..1d509a8ab6c
--- /dev/null
+++ b/dev-ros/roscpp/files/boost.patch
@@ -0,0 +1,26 @@
+commit 41f18edc9f2f0b1ef304ea25f148bd56a6bf3d70
+Author: Maarten de Vries <maarten@××××××.es>
+Date:   Thu Jan 31 00:58:29 2019 +0100
+
+    Remove signals from find_package(Boost COMPONENTS ...) (#1580)
+    
+    The packages use signals2, not signals. Only boost libraries with
+    compiled code should be passed to find_package(Boost COMPONENTS ...),
+    and the signals2 library has always been header only.
+    
+    Boost 1.69 has removed the deprecated signals library, so the otherwise
+    useless but harmless `signals` component now breaks the build.
+
+diff --git a/clients/roscpp/CMakeLists.txt b/clients/roscpp/CMakeLists.txt
+index a5d354ea6..8f462df2c 100644
+--- a/clients/roscpp/CMakeLists.txt
++++ b/clients/roscpp/CMakeLists.txt
+@@ -22,7 +22,7 @@ list(GET roscpp_VERSION_LIST 2 roscpp_VERSION_PATCH)
+ 
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/ros/common.h.in ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}/ros/common.h)
+ 
+-find_package(Boost REQUIRED COMPONENTS chrono filesystem signals system)
++find_package(Boost REQUIRED COMPONENTS chrono filesystem system)
+ 
+ include_directories(include ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}/ros ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
+ 

diff --git a/dev-ros/roscpp/roscpp-1.14.3.ebuild b/dev-ros/roscpp/roscpp-1.14.3-r1.ebuild
similarity index 94%
rename from dev-ros/roscpp/roscpp-1.14.3.ebuild
rename to dev-ros/roscpp/roscpp-1.14.3-r1.ebuild
index 4d1d63e2e34..15e970883b2 100644
--- a/dev-ros/roscpp/roscpp-1.14.3.ebuild
+++ b/dev-ros/roscpp/roscpp-1.14.3-r1.ebuild
@@ -28,3 +28,4 @@ RDEPEND="
 	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boost.patch" )