From 9cb838527fea2b2f1f9b04271af8f4ff312aa934 Mon Sep 17 00:00:00 2001 From: Dmitry Rozhkov Date: Wed, 25 Jan 2017 15:32:19 +0200 Subject: [PATCH] Upgrade geometric-shapes to 0.4.5 Signed-off-by: Dmitry Rozhkov --- ...-gcc6-build-error-backport-for-0.4.4.patch | 43 ------------------- ...pes_0.4.4.bb => geometric-shapes_0.4.5.bb} | 6 +-- 2 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 recipes-ros/geometric-shapes/geometric-shapes/0001-address-gcc6-build-error-backport-for-0.4.4.patch rename recipes-ros/geometric-shapes/{geometric-shapes_0.4.4.bb => geometric-shapes_0.4.5.bb} (70%) diff --git a/recipes-ros/geometric-shapes/geometric-shapes/0001-address-gcc6-build-error-backport-for-0.4.4.patch b/recipes-ros/geometric-shapes/geometric-shapes/0001-address-gcc6-build-error-backport-for-0.4.4.patch deleted file mode 100644 index 1dae355..0000000 --- a/recipes-ros/geometric-shapes/geometric-shapes/0001-address-gcc6-build-error-backport-for-0.4.4.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 77e184e32b19bfd7ee64d3344bcff0a28eccbb4e Mon Sep 17 00:00:00 2001 -From: Lukas Bulwahn -Date: Wed, 28 Sep 2016 10:25:02 +0200 -Subject: [PATCH] address gcc6 build error (backport for 0.4.4) - -With gcc6, compiling fails with `stdlib.h: No such file or directory`, -as including '-isystem /usr/include' breaks with gcc6, cf., -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129. - -This commit addresses this issue for this package in the same way -it was addressed in various other ROS packages. A list of related -commits and pull requests is at: - - https://github.com/ros/rosdistro/issues/12783 - -Signed-off-by: Lukas Bulwahn - -Upstream-Status: Accepted [https://github.com/ros-planning/geometric_shapes/commit/7a0af36bb67c0718373f6bbac31959e8356cda92] - -The content of commit 7a0af36bb67c0718373f6bbac31959e8356cda92 has been -manually backported for version 0.4.4, and resulted in this patch. - -Signed-off-by: Lukas Bulwahn ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9ae6b09..145d7a8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -52,7 +52,7 @@ if (HAVE_QHULL_2011) - endif() - - include_directories(include) --include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS} ${Boost_INCLUDE_DIR} ${ASSIMP_INCLUDE_DIRS} ${OCTOMAP_INCLUDE_DIRS}) -+include_directories(${EIGEN_INCLUDE_DIRS} ${Boost_INCLUDE_DIR} ${ASSIMP_INCLUDE_DIRS} ${OCTOMAP_INCLUDE_DIRS}) - include_directories(${catkin_INCLUDE_DIRS} ${console_bridge_INCLUDE_DIRS}) - link_directories(${catkin_LIBRARY_DIRS} ${console_bridge_LIBRARY_DIRS} ${ASSIMP_LIBRARY_DIRS}) - --- -2.5.5 - diff --git a/recipes-ros/geometric-shapes/geometric-shapes_0.4.4.bb b/recipes-ros/geometric-shapes/geometric-shapes_0.4.5.bb similarity index 70% rename from recipes-ros/geometric-shapes/geometric-shapes_0.4.4.bb rename to recipes-ros/geometric-shapes/geometric-shapes_0.4.5.bb index e102222..2c025e5 100644 --- a/recipes-ros/geometric-shapes/geometric-shapes_0.4.4.bb +++ b/recipes-ros/geometric-shapes/geometric-shapes_0.4.5.bb @@ -6,10 +6,8 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=5ee5b8b046ae4 DEPENDS = "boost shape-msgs shape-tools octomap assimp libeigen qhull console-bridge random-numbers eigen-stl-containers resource-retriever" SRC_URI = "https://github.com/ros-planning/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "f684af3e76eb37b4c0153527162d73dc" -SRC_URI[sha256sum] = "4d600890b72d0b20b2fbcc9ded06464a37c871317445ec32d3858bd719b0aa02" - -SRC_URI += "file://0001-address-gcc6-build-error-backport-for-0.4.4.patch" +SRC_URI[md5sum] = "2a11cd903e581f4e9cef57551e3f284b" +SRC_URI[sha256sum] = "dc3e826930642d6a2e47e8847550c680d03649fa90ca521fa752ff01bd3b697c" S = "${WORKDIR}/${ROS_SP}"