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

[Alexis Ballier]

commit:     35fff873028857dedf712c32d0615a1c2e86e71f
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  7 18:10:57 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jul  7 18:10:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35fff873

dev-ros/pr2_description: fix building tests; they still fail though.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-ros/pr2_description/files/tests.patch             | 13 +++++++++++++
 dev-ros/pr2_description/pr2_description-1.12.0.ebuild |  3 ++-
 dev-ros/pr2_description/pr2_description-9999.ebuild   |  3 ++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/dev-ros/pr2_description/files/tests.patch 
b/dev-ros/pr2_description/files/tests.patch
new file mode 100644
index 00000000000..40c3a378d45
--- /dev/null
+++ b/dev-ros/pr2_description/files/tests.patch
@@ -0,0 +1,13 @@
+Index: pr2_common-1.12.0/pr2_description/test/test_urdf.cpp
+===================================================================
+--- pr2_common-1.12.0.orig/pr2_description/test/test_urdf.cpp
++++ pr2_common-1.12.0/pr2_description/test/test_urdf.cpp
+@@ -100,7 +100,7 @@ int walker( std::string & result, int& t
+         }
+         xml_file.close();
+ 
+-        boost::shared_ptr<urdf::ModelInterface> robot = 
urdf::parseURDF(xml_string);
++        std::shared_ptr<urdf::ModelInterface> robot = 
urdf::parseURDF(xml_string);
+         if (!robot) test_result = test_result || 1;
+ 
+       }

diff --git a/dev-ros/pr2_description/pr2_description-1.12.0.ebuild 
b/dev-ros/pr2_description/pr2_description-1.12.0.ebuild
index 75466430c05..1a73af70cf0 100644
--- a/dev-ros/pr2_description/pr2_description-1.12.0.ebuild
+++ b/dev-ros/pr2_description/pr2_description-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,3 +19,4 @@ DEPEND="${RDEPEND}
        dev-ros/convex_decomposition
        dev-ros/ivcon
        test? ( dev-libs/urdfdom dev-cpp/gtest )"
+PATCHES=( "${FILESDIR}/tests.patch" )

diff --git a/dev-ros/pr2_description/pr2_description-9999.ebuild 
b/dev-ros/pr2_description/pr2_description-9999.ebuild
index 75466430c05..1a73af70cf0 100644
--- a/dev-ros/pr2_description/pr2_description-9999.ebuild
+++ b/dev-ros/pr2_description/pr2_description-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,3 +19,4 @@ DEPEND="${RDEPEND}
        dev-ros/convex_decomposition
        dev-ros/ivcon
        test? ( dev-libs/urdfdom dev-cpp/gtest )"
+PATCHES=( "${FILESDIR}/tests.patch" )