From: Alexis Ballier <aballier@gentoo.org>
Date: Tue, 26 Jul 2016 08:58:26 +0000 (+0200)
Subject: dev-ros/joint_limits_interface: fix build with urdfdom1.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=55cf1fe446a16aef78194e5db37ce6a688dc858a;p=gentoo.git

dev-ros/joint_limits_interface: fix build with urdfdom1.

Package-Manager: portage-2.3.0
---

diff --git a/dev-ros/joint_limits_interface/files/urdfdom1.patch b/dev-ros/joint_limits_interface/files/urdfdom1.patch
new file mode 100644
index 000000000000..b63fe13ec22d
--- /dev/null
+++ b/dev-ros/joint_limits_interface/files/urdfdom1.patch
@@ -0,0 +1,22 @@
+Index: joint_limits_interface/include/joint_limits_interface/joint_limits_urdf.h
+===================================================================
+--- joint_limits_interface.orig/include/joint_limits_interface/joint_limits_urdf.h
++++ joint_limits_interface/include/joint_limits_interface/joint_limits_urdf.h
+@@ -48,7 +48,7 @@ namespace joint_limits_interface
+  * values. Values in \e limits not present in \e urdf_joint remain unchanged.
+  * \return True if \e urdf_joint has a valid limits specification, false otherwise.
+  */
+-inline bool getJointLimits(boost::shared_ptr<const urdf::Joint> urdf_joint, JointLimits& limits)
++inline bool getJointLimits(std::shared_ptr<const urdf::Joint> urdf_joint, JointLimits& limits)
+ {
+   if (!urdf_joint || !urdf_joint->limits)
+   {
+@@ -84,7 +84,7 @@ inline bool getJointLimits(boost::shared
+  * \param[out] soft_limits Where URDF soft joint limit data gets written into.
+  * \return True if \e urdf_joint has a valid soft limits specification, false otherwise.
+  */
+-inline bool getSoftJointLimits(boost::shared_ptr<const urdf::Joint> urdf_joint, SoftJointLimits& soft_limits)
++inline bool getSoftJointLimits(std::shared_ptr<const urdf::Joint> urdf_joint, SoftJointLimits& soft_limits)
+ {
+   if (!urdf_joint || !urdf_joint->safety)
+   {
diff --git a/dev-ros/joint_limits_interface/joint_limits_interface-0.11.0.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-0.11.0-r1.ebuild
similarity index 88%
rename from dev-ros/joint_limits_interface/joint_limits_interface-0.11.0.ebuild
rename to dev-ros/joint_limits_interface/joint_limits_interface-0.11.0-r1.ebuild
index 0f9aa3cf3703..2a65e6da8629 100644
--- a/dev-ros/joint_limits_interface/joint_limits_interface-0.11.0.ebuild
+++ b/dev-ros/joint_limits_interface/joint_limits_interface-0.11.0-r1.ebuild
@@ -18,7 +18,8 @@ IUSE=""
 RDEPEND="
 	dev-ros/roscpp
 	dev-ros/hardware_interface
-	dev-libs/urdfdom
+	>=dev-libs/urdfdom-1
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rostest dev-cpp/gtest )"
+PATCHES=( "${FILESDIR}/urdfdom1.patch" )