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

[Alexis Ballier]

commit: cf64eac86ab41ef2523defcacd4207c0fccb94e9
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Jul 29 12:52:35 2020 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Jul 29 12:58:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf64eac8

dev-ros/tf: stop using yaml.load

Fixes tests

Closes: https://bugs.gentoo.org/623656
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ros/tf/files/yaml.patch  | 13 +
 dev-ros/tf/{tf-1.13.2.ebuild => tf-1.13.2-r1.ebuild} |  1 +
 dev-ros/tf/tf-.ebuild|  1 +
 3 files changed, 15 insertions(+)

diff --git a/dev-ros/tf/files/yaml.patch b/dev-ros/tf/files/yaml.patch
new file mode 100644
index 000..344ef80417a
--- /dev/null
+++ b/dev-ros/tf/files/yaml.patch
@@ -0,0 +1,13 @@
+Index: tf/src/tf/listener.py
+===
+--- tf.orig/src/tf/listener.py
 tf/src/tf/listener.py
+@@ -94,7 +94,7 @@ class Transformer(object):
+ 
+ def getFrameStrings(self):
+ """ Not a recommended API, only here for backwards compatibility """
+-data = yaml.load(self._buffer.all_frames_as_yaml()) or {}
++data = yaml.safe_load(self._buffer.all_frames_as_yaml()) or {}
+ return [p for p, _ in data.items()]
+ 
+ def getLatestCommonTime(self, source_frame, dest_frame):

diff --git a/dev-ros/tf/tf-1.13.2.ebuild b/dev-ros/tf/tf-1.13.2-r1.ebuild
similarity index 96%
rename from dev-ros/tf/tf-1.13.2.ebuild
rename to dev-ros/tf/tf-1.13.2-r1.ebuild
index 6f018ff01c1..360303d8a91 100644
--- a/dev-ros/tf/tf-1.13.2.ebuild
+++ b/dev-ros/tf/tf-1.13.2-r1.ebuild
@@ -37,3 +37,4 @@ DEPEND="${RDEPEND}
dev-cpp/gtest
$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
)"
+PATCHES=( "${FILESDIR}/yaml.patch" )

diff --git a/dev-ros/tf/tf-.ebuild b/dev-ros/tf/tf-.ebuild
index 6f018ff01c1..360303d8a91 100644
--- a/dev-ros/tf/tf-.ebuild
+++ b/dev-ros/tf/tf-.ebuild
@@ -37,3 +37,4 @@ DEPEND="${RDEPEND}
dev-cpp/gtest
$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
)"
+PATCHES=( "${FILESDIR}/yaml.patch" )

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

[Alexis Ballier]

commit: 39f0ec6b35c3170d809d22dc66cb3233fb7ed3d2
Author: Alexis Ballier  gentoo  org>
AuthorDate: Fri Oct 14 13:36:11 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Oct 14 13:36:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39f0ec6b

dev-ros/tf: backport upstream patch to build with gcc6, bug #593938, patch by 
Peter Levine

Package-Manager: portage-2.3.2

 dev-ros/tf/files/gcc6.patch | 22 ++
 dev-ros/tf/tf-1.11.8.ebuild |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/dev-ros/tf/files/gcc6.patch b/dev-ros/tf/files/gcc6.patch
new file mode 100644
index ..72b32bd
--- /dev/null
+++ b/dev-ros/tf/files/gcc6.patch
@@ -0,0 +1,22 @@
+commit b0d31cc1e9a43b45d216ee7f804e901a5c0f8936
+Author: Hodorgasm 
+Date:   Mon Sep 19 17:58:22 2016 -0400
+
+Fix "stdlib.h: No such file or directory" errors in GCC-6
+
+Including '-isystem /usr/include' breaks building with GCC-6.
+See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129
+
+diff --git a/tf/CMakeLists.txt b/tf/CMakeLists.txt
+index 8077561..cf72127 100644
+--- a/tf/CMakeLists.txt
 b/tf/CMakeLists.txt
+@@ -8,7 +8,7 @@ find_package(catkin COMPONENTS angles geometry_msgs 
message_filters message_gene
+ 
+ catkin_python_setup()
+ 
+-include_directories(SYSTEM ${Boost_INCLUDE_DIR}
++include_directories(${Boost_INCLUDE_DIR}
+${catkin_INCLUDE_DIRS}
+ )
+ include_directories(include)

diff --git a/dev-ros/tf/tf-1.11.8.ebuild b/dev-ros/tf/tf-1.11.8.ebuild
index f81e4cc..573a9d8 100644
--- a/dev-ros/tf/tf-1.11.8.ebuild
+++ b/dev-ros/tf/tf-1.11.8.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$
 
@@ -37,3 +37,4 @@ DEPEND="${RDEPEND}
dev-cpp/gtest
dev-python/nose[${PYTHON_USEDEP}]
)"
+PATCHES=( "${FILESDIR}/gcc6.patch" )