1 |
commit: b77363f77096a04f0d92fd7ea1e7f61a02161297 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 28 11:09:04 2018 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 28 11:37:41 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b77363f7 |
7 |
|
8 |
dev-ros/depthimage_to_laserscan: fix build with latest pluginlib |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
|
12 |
.../depthimage_to_laserscan-1.0.7-r2.ebuild | 4 ++-- |
13 |
.../depthimage_to_laserscan-9999.ebuild | 3 ++- |
14 |
dev-ros/depthimage_to_laserscan/files/pluginlib.patch | 11 +++++++++++ |
15 |
3 files changed, 15 insertions(+), 3 deletions(-) |
16 |
|
17 |
diff --git a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7-r2.ebuild b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7-r2.ebuild |
18 |
index b0b3cce5f4e..2e621e904b7 100644 |
19 |
--- a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7-r2.ebuild |
20 |
+++ b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7-r2.ebuild |
21 |
@@ -1,4 +1,4 @@ |
22 |
-# Copyright 1999-2017 Gentoo Foundation |
23 |
+# Copyright 1999-2018 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
|
26 |
EAPI=5 |
27 |
@@ -25,4 +25,4 @@ RDEPEND=" |
28 |
dev-libs/console_bridge:= |
29 |
" |
30 |
DEPEND="${RDEPEND}" |
31 |
-PATCHES=( "${FILESDIR}/isnan.patch" ) |
32 |
+PATCHES=( "${FILESDIR}/isnan.patch" "${FILESDIR}/pluginlib.patch" ) |
33 |
|
34 |
diff --git a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild |
35 |
index 9a1d9908c4d..2e621e904b7 100644 |
36 |
--- a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild |
37 |
+++ b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild |
38 |
@@ -1,4 +1,4 @@ |
39 |
-# Copyright 1999-2017 Gentoo Foundation |
40 |
+# Copyright 1999-2018 Gentoo Foundation |
41 |
# Distributed under the terms of the GNU General Public License v2 |
42 |
|
43 |
EAPI=5 |
44 |
@@ -25,3 +25,4 @@ RDEPEND=" |
45 |
dev-libs/console_bridge:= |
46 |
" |
47 |
DEPEND="${RDEPEND}" |
48 |
+PATCHES=( "${FILESDIR}/isnan.patch" "${FILESDIR}/pluginlib.patch" ) |
49 |
|
50 |
diff --git a/dev-ros/depthimage_to_laserscan/files/pluginlib.patch b/dev-ros/depthimage_to_laserscan/files/pluginlib.patch |
51 |
new file mode 100644 |
52 |
index 00000000000..a367cd40c5f |
53 |
--- /dev/null |
54 |
+++ b/dev-ros/depthimage_to_laserscan/files/pluginlib.patch |
55 |
@@ -0,0 +1,11 @@ |
56 |
+Index: depthimage_to_laserscan-1.0.7/src/DepthImageToLaserScanNodelet.cpp |
57 |
+=================================================================== |
58 |
+--- depthimage_to_laserscan-1.0.7.orig/src/DepthImageToLaserScanNodelet.cpp |
59 |
++++ depthimage_to_laserscan-1.0.7/src/DepthImageToLaserScanNodelet.cpp |
60 |
+@@ -57,5 +57,5 @@ private: |
61 |
+ } |
62 |
+ |
63 |
+ #include <pluginlib/class_list_macros.h> |
64 |
+-PLUGINLIB_DECLARE_CLASS(depthimage_to_laserscan, DepthImageToLaserScanNodelet, depthimage_to_laserscan::DepthImageToLaserScanNodelet, nodelet::Nodelet); |
65 |
++PLUGINLIB_EXPORT_CLASS(depthimage_to_laserscan::DepthImageToLaserScanNodelet, nodelet::Nodelet) |
66 |
+ |