Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/image_cb_detector/, dev-ros/image_cb_detector/files/
Date: Wed, 28 Aug 2019 17:24:10
Message-Id: 1567013036.c32cfbec3d05b6fbcfb1f557f1897a2af3f6a09e.aballier@gentoo
1 commit: c32cfbec3d05b6fbcfb1f557f1897a2af3f6a09e
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 28 17:23:38 2019 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 28 17:23:56 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c32cfbec
7
8 dev-ros/image_cb_detector: fix build with boost 1.70
9
10 Package-Manager: Portage-2.3.73, Repoman-2.3.17
11 Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
12
13 dev-ros/image_cb_detector/files/boost170.patch | 13 +++++++++++++
14 .../image_cb_detector/image_cb_detector-0.10.14-r1.ebuild | 4 ++--
15 2 files changed, 15 insertions(+), 2 deletions(-)
16
17 diff --git a/dev-ros/image_cb_detector/files/boost170.patch b/dev-ros/image_cb_detector/files/boost170.patch
18 new file mode 100644
19 index 00000000000..f8ae562dadc
20 --- /dev/null
21 +++ b/dev-ros/image_cb_detector/files/boost170.patch
22 @@ -0,0 +1,13 @@
23 +Index: image_cb_detector/CMakeLists.txt
24 +===================================================================
25 +--- image_cb_detector.orig/CMakeLists.txt
26 ++++ image_cb_detector/CMakeLists.txt
27 +@@ -1,7 +1,7 @@
28 + cmake_minimum_required(VERSION 2.8.3)
29 + project(image_cb_detector)
30 +
31 +-find_package(Boost REQUIRED thread signals)
32 ++find_package(Boost REQUIRED thread)
33 + find_package(catkin REQUIRED actionlib actionlib_msgs calibration_msgs cv_bridge genmsg geometry_msgs image_transport message_filters roscpp sensor_msgs std_msgs)
34 + find_package(OpenCV REQUIRED)
35 +
36
37 diff --git a/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild b/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
38 index 8b96da0e6b0..2502c78f860 100644
39 --- a/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
40 +++ b/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
41 @@ -1,4 +1,4 @@
42 -# Copyright 1999-2017 Gentoo Foundation
43 +# Copyright 1999-2019 Gentoo Authors
44 # Distributed under the terms of the GNU General Public License v2
45
46 EAPI=5
47 @@ -29,4 +29,4 @@ RDEPEND="
48 dev-libs/boost:=[threads]
49 "
50 DEPEND="${RDEPEND}"
51 -PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" )
52 +PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" "${FILESDIR}/boost170.patch" )