ros-comm: updating to 1.11.21

Due to this update, this commit also drops the rosconsole patch,
which is now included in the released version.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
This commit is contained in:
Lukas Bulwahn 2017-03-19 15:08:18 +01:00
parent cf0cdaabfb
commit 011b83e4d9
22 changed files with 2 additions and 38 deletions

View File

@ -1,6 +1,6 @@
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "cad698f12fab7e0786e2e1355fa22cf7"
SRC_URI[sha256sum] = "bb687aa0f10aa8a87e42d1592b534bc602f5923f90bffdf51031f59c4bfe362a"
SRC_URI[md5sum] = "7f731bf38da6099d1d7b0083b568836b"
SRC_URI[sha256sum] = "fbfbecbdbd3c0fb752c5757aac843cc9bfffe71ac7b1b094e2d1142567f02fa1"
ROS_PKG_SUBDIR ?= ""
S = "${WORKDIR}/${ROS_SP}/${ROS_PKG_SUBDIR}/${ROS_BPN}"

View File

@ -1,34 +0,0 @@
From 74674c49a64abbdcdd5aeea016997af2959c6f05 Mon Sep 17 00:00:00 2001
From: Hodorgasm <nsane457@gmail.com>
Date: Mon, 3 Oct 2016 20:32:20 -0400
Subject: [PATCH] Add '#Include <vector>' to fix building on GCC-6
Don't rely on transitive header inclusion to declare std::vector as building with GCC-6 fails due to no '#Include <vector>' statement.
Upstream-Status: Backport [https://github.com/ros/ros_comm/commit/74674c49a64abbdcdd5aeea016997af2959c6f05]
This patch has been generated with:
`git format-patch -1 74674c49a64abbdcdd5aeea016997af2959c6f05`
in the kinetic branch of the ros_comm repository.
This patch applies without modifications to the indigo release 1.11.20.
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
---
tools/rosconsole/include/ros/console.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/rosconsole/include/ros/console.h b/tools/rosconsole/include/ros/console.h
index 4d2a86b..28901d7 100644
--- a/tools/rosconsole/include/ros/console.h
+++ b/tools/rosconsole/include/ros/console.h
@@ -40,6 +40,7 @@
#include <cstdarg>
#include <ros/macros.h>
#include <map>
+#include <vector>
#ifdef ROSCONSOLE_BACKEND_LOG4CXX
#include "log4cxx/level.h"
--
2.5.5

View File

@ -8,5 +8,3 @@ DEPENDS = "apr boost cpp-common log4cxx rostime rosunit"
require ros-comm.inc
ROS_PKG_SUBDIR = "tools"
SRC_URI += "file://0001-Add-Include-vector-to-fix-building-on-GCC-6.patch;striplevel=3"