dev-ros/robot_state_publisher: fix build with urdfdom1. Bug #590376

Package-Manager: portage-2.3.0

3 files changed, 48 insertions, 1 deletions

diff --git a/dev-ros/robot_state_publisher/files/urdfdom1.patch b/dev-ros/robot_state_publisher/files/urdfdom1.patch
new file mode 100644
index 000000000000..e5c482b89193
--- /dev/null
+++ b/dev-ros/robot_state_publisher/files/urdfdom1.patch
@@ -0,0 +1,39 @@
+Index: robot_state_publisher-1.13.2/include/robot_state_publisher/joint_state_listener.h
+===================================================================
+--- robot_state_publisher-1.13.2.orig/include/robot_state_publisher/joint_state_listener.h
++++ robot_state_publisher-1.13.2/include/robot_state_publisher/joint_state_listener.h
+@@ -48,7 +48,7 @@ using namespace ros;
+ using namespace KDL;
+ 
+ typedef boost::shared_ptr<sensor_msgs::JointState const> JointStateConstPtr;
+-typedef std::map<std::string, boost::shared_ptr<urdf::JointMimic> > MimicMap;
++typedef std::map<std::string, std::shared_ptr<urdf::JointMimic> > MimicMap;
+ 
+ namespace robot_state_publisher{
+ 
+Index: robot_state_publisher-1.13.2/src/joint_state_listener.cpp
+===================================================================
+--- robot_state_publisher-1.13.2.orig/src/joint_state_listener.cpp
++++ robot_state_publisher-1.13.2/src/joint_state_listener.cpp
+@@ -161,7 +161,7 @@ int main(int argc, char** argv)
+ 
+   MimicMap mimic;
+ 
+-  for(std::map< std::string, boost::shared_ptr< urdf::Joint > >::iterator i = model.joints_.begin(); i != model.joints_.end(); i++){
++  for(std::map< std::string, std::shared_ptr< urdf::Joint > >::iterator i = model.joints_.begin(); i != model.joints_.end(); i++){
+     if(i->second->mimic){
+       mimic.insert(make_pair(i->first, i->second->mimic));
+     }
+Index: robot_state_publisher-1.13.2/test/test_subclass.cpp
+===================================================================
+--- robot_state_publisher-1.13.2.orig/test/test_subclass.cpp
++++ robot_state_publisher-1.13.2/test/test_subclass.cpp
+@@ -82,7 +82,7 @@ TEST(TestRobotStatePubSubclass, robot_st
+ 
+   MimicMap mimic;
+ 
+-  for(std::map< std::string, boost::shared_ptr< urdf::Joint > >::iterator i = model.joints_.begin(); i != model.joints_.end(); i++){
++  for(std::map< std::string, std::shared_ptr< urdf::Joint > >::iterator i = model.joints_.begin(); i != model.joints_.end(); i++){
+     if(i->second->mimic){
+       mimic.insert(make_pair(i->first, i->second->mimic));
+     }
diff --git a/dev-ros/robot_state_publisher/robot_state_publisher-1.13.2.ebuild b/dev-ros/robot_state_publisher/robot_state_publisher-1.13.2-r1.ebuild
index f6dd74f278d8..65b8df8cc3fc 100644
--- a/dev-ros/robot_state_publisher/robot_state_publisher-1.13.2.ebuild
+++ b/dev-ros/robot_state_publisher/robot_state_publisher-1.13.2-r1.ebuild
@@ -26,7 +26,14 @@ RDEPEND="
 	dev-ros/kdl_conversions
 	dev-ros/sensor_msgs
 	dev-ros/tf
+	>=dev-ros/urdf-1.12.3-r1
 "
 DEPEND="${RDEPEND}
 	dev-ros/rostest[${PYTHON_USEDEP}]
 "
+PATCHES=( "${FILESDIR}/urdfdom1.patch" )
+
+src_configure() {
+	append-cxxflags -std=gnu++11
+	ros-catkin_src_configure
+}
diff --git a/dev-ros/robot_state_publisher/robot_state_publisher-9999.ebuild b/dev-ros/robot_state_publisher/robot_state_publisher-9999.ebuild
index 640fe2a78534..61eed4d85914 100644
--- a/dev-ros/robot_state_publisher/robot_state_publisher-9999.ebuild
+++ b/dev-ros/robot_state_publisher/robot_state_publisher-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,6 +26,7 @@ RDEPEND="
 	dev-ros/kdl_conversions
 	dev-ros/sensor_msgs
 	dev-ros/tf
+	dev-ros/urdf
 "
 DEPEND="${RDEPEND}
 	dev-ros/rostest[${PYTHON_USEDEP}]