[gentoo-commits] repo/gentoo:master commit in: dev-ros/pr2_description/files/, dev-ros/pr2_description/
commit: 35fff873028857dedf712c32d0615a1c2e86e71f
Author: Alexis Ballier gentoo org>
AuthorDate: Fri Jul 7 18:10:57 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Fri Jul 7 18:10:57 2017 +
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-.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 000..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 robot =
urdf::parseURDF(xml_string);
++std::shared_ptr 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-.ebuild
b/dev-ros/pr2_description/pr2_description-.ebuild
index 75466430c05..1a73af70cf0 100644
--- a/dev-ros/pr2_description/pr2_description-.ebuild
+++ b/dev-ros/pr2_description/pr2_description-.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" )
[gentoo-commits] repo/gentoo:master commit in: dev-ros/pr2_description/files/, dev-ros/pr2_description/
commit: 32c4a6fbaa611d82ba9ccb6fff002291b6442335
Author: Alexis Ballier gentoo org>
AuthorDate: Tue Feb 23 15:36:51 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Tue Feb 23 15:36:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32c4a6fb
dev-ros/pr2_description: remove old
Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier gentoo.org>
dev-ros/pr2_description/Manifest | 4
.../pr2_description/files/pr2_description.patch| 17
.../pr2_description/pr2_description-1.11.10.ebuild | 23 --
.../pr2_description/pr2_description-1.11.11.ebuild | 21
.../pr2_description/pr2_description-1.11.13.ebuild | 21
.../pr2_description/pr2_description-1.11.9.ebuild | 23 --
6 files changed, 109 deletions(-)
diff --git a/dev-ros/pr2_description/Manifest b/dev-ros/pr2_description/Manifest
index 9e8fbda..1a6ee4a 100644
--- a/dev-ros/pr2_description/Manifest
+++ b/dev-ros/pr2_description/Manifest
@@ -1,5 +1 @@
-DIST pr2_common-1.11.10.tar.gz 8874 SHA256
e9c50d2b40171b6501752c340d27610657741b6e35680f1cc0a21e45d820a678 SHA512
64288085fe0ebd02941c6da4f3cdf02f65e84f2ef99a6748d9b614d7aaf2a692229f67a175e81a1954dc42e6cb3e430cdc23c54df81934ad6698f019a3cf3748
WHIRLPOOL
f9529982ee38fc38f1cc965c62a131e9d73ee7e484acc13b6961240759dc5f336b9a5431e06d083787ee8db0c76a1f411b4628d2eb6776f318109b27476b1078
-DIST pr2_common-1.11.11.tar.gz 33597551 SHA256
dd9303e02aa0633fc662bc0bb5521b7264fd7004265b0aeef4a6a6a01160f307 SHA512
fd1fdfc142ff3013c41f406bcd65001daa8a1fde30bbdcd825e88d6c624850cc8893a6cfbfd6c4d77cfa8ec3716fc851ddb326fe1ed0625a28f2bd57fc92c42b
WHIRLPOOL
0abeddc87b8b9fc9f6f0aeb8db6c735ce508e59c71ccf95e002d7aeac1d6080324abeb36361508242b18fda6550c7c8ede822fafe2869fb46f71636ca577a5d6
-DIST pr2_common-1.11.13.tar.gz 33598596 SHA256
20ece58fa557e61ec00411a8fb227cd23ba726d57e3736686b0e94595576b740 SHA512
4366b6893c262c54e5ad5fee967698e6a335f1ba2a48a0196e8b6f2907058d0fad929bd9c4d6b5f20aa4669980c02067c81cf402dcf42ab98d67b35205373987
WHIRLPOOL
872c5d1098f06975b047c2a696edbda01a6b1afc690a362dc8c34c7853e032d9ab8c31909358043a9cae74ae330afb28a62ec0a23f88d83d50998dfd95ca601f
DIST pr2_common-1.11.14.tar.gz 33598683 SHA256
16f620a0b1fcf99f061a7a5fc292b5433f7ed8b96588da4dc85dc652ceb21d54 SHA512
c34a82f72aa0c64c7c2abe36af5ec02c73e4bff161e105d3f8cfd65a460688b4fbd3e4529109546bf525c4703706054f522f74a9c9b352939c5582f064bbf2bf
WHIRLPOOL
2fd52d4abd20c28c6c387e32bff80b90c423e6722f2a1410fa5cd429cadaa69cbbe03deedce361a199480553aa856fa87c5252dd3a2d1b784c5135a01e3a8a55
-DIST pr2_common-1.11.9.tar.gz 7556 SHA256
c6134939602c8a81d006bf4a4bfc48bf8746f5eb0c5b12baa1da8c946d1b4ce1 SHA512
44eb4f802a7b6983b621ca5b2c1c0e2516f16992f35902c2fb4afbdc9ffc8e63c1ed647f4ef09fd4cbeef747aba133a55172cec64c3cf9d759d2c83f7ec8a213
WHIRLPOOL
ad5d6c543b1faca2ed48a66405eb8d6c17b9ef6352fa16b6fc55f9b093a6b1b7da3e0571ade5a6013c84d3695c16e910549ea2673c36a4179043ea4f085c1e05
diff --git a/dev-ros/pr2_description/files/pr2_description.patch
b/dev-ros/pr2_description/files/pr2_description.patch
deleted file mode 100644
index 5296a67..000
--- a/dev-ros/pr2_description/files/pr2_description.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/pr2_description/CMakeLists.txt b/pr2_description/CMakeLists.txt
-index 1b75223..6c83182 100644
a/pr2_description/CMakeLists.txt
-+++ b/pr2_description/CMakeLists.txt
-@@ -91,8 +91,10 @@ add_custom_target(media_files ALL DEPENDS ${pr2urdf}
${pr2robot_expanded} ${prfr
- ## DEPENDS: system dependencies of this project that dependent projects also
need
- catkin_package(CATKIN_DEPENDS xacro)
-
--catkin_add_gtest(test_urdf test/test_urdf.cpp WORKING_DIRECTORY
${PROJECT_SOURCE_DIR})
--target_link_libraries(test_urdf urdfdom_model)
-+if(CATKIN_ENABLE_TESTING)
-+ catkin_add_gtest(test_urdf test/test_urdf.cpp WORKING_DIRECTORY
${PROJECT_SOURCE_DIR})
-+ target_link_libraries(test_urdf urdfdom_model)
-+endif()
-
- foreach(dir meshes gazebo materials robots documents urdf)
-install(DIRECTORY ${dir}/
diff --git a/dev-ros/pr2_description/pr2_description-1.11.10.ebuild
b/dev-ros/pr2_description/pr2_description-1.11.10.ebuild
deleted file mode 100644
index 3c99ffb..000
--- a/dev-ros/pr2_description/pr2_description-1.11.10.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common;
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Description (mechanical, kinematic, visual, etc.) of the PR2
robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/xacro"
-DEPEND="${RDEPEND}
- dev-ros/convex_decomposition
- dev-ros/ivcon
- test? ( dev-libs/urdfdom dev-cpp/gtest )"
-
-PATCHES=( "${FILESDIR}/pr2_description.patch" )
diff --git
