[ros-rviz] 05/06: Add patch to fix gcc-6 FTBFS

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke-guest pushed a commit to branch master
in repository ros-rviz.

commit 1e5a694a3733cea71ac8469bf58ee97d8c0ae6d9
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sat Jul 23 11:23:57 2016 +0200

    Add patch to fix gcc-6 FTBFS
    
    Closes: #831135
---
 ...res-a-space-between-string-concatinations.patch | 28 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 29 insertions(+)

diff --git a/debian/patches/0003-C-11-requires-a-space-between-string-concatinations.patch b/debian/patches/0003-C-11-requires-a-space-between-string-concatinations.patch
new file mode 100644
index 0000000..e9ccc47
--- /dev/null
+++ b/debian/patches/0003-C-11-requires-a-space-between-string-concatinations.patch
@@ -0,0 +1,28 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Sat, 23 Jul 2016 11:18:21 +0200
+Subject: C++11 requires a space between string concatinations
+
+---
+ src/rviz/default_plugin/effort_display.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/rviz/default_plugin/effort_display.h b/src/rviz/default_plugin/effort_display.h
+index bc89bd6..574dccb 100644
+--- a/src/rviz/default_plugin/effort_display.h
++++ b/src/rviz/default_plugin/effort_display.h
+@@ -36,13 +36,13 @@ namespace tf
+ # undef TF_MESSAGEFILTER_DEBUG
+ #endif
+ #define TF_MESSAGEFILTER_DEBUG(fmt, ...) \
+-  ROS_DEBUG_NAMED("message_filter", "MessageFilter [target=%s]: "fmt, getTargetFramesString().c_str(), __VA_ARGS__)
++  ROS_DEBUG_NAMED("message_filter", "MessageFilter [target=%s]: " fmt, getTargetFramesString().c_str(), __VA_ARGS__)
+ 
+ #ifdef TF_MESSAGEFILTER_WARN
+ # undef TF_MESSAGEFILTER_WARN
+ #endif
+ #define TF_MESSAGEFILTER_WARN(fmt, ...) \
+-  ROS_WARN_NAMED("message_filter", "MessageFilter [target=%s]: "fmt, getTargetFramesString().c_str(), __VA_ARGS__)
++  ROS_WARN_NAMED("message_filter", "MessageFilter [target=%s]: " fmt, getTargetFramesString().c_str(), __VA_ARGS__)
+ 
+     class MessageFilterJointState : public MessageFilter<sensor_msgs::JointState>
+     {
diff --git a/debian/patches/series b/debian/patches/series
index 34b2ea2..f130d41 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Add-Debian-specific-SOVERSION.patch
 0003-Replace-Arial-by-generic-Font.patch
+0003-C-11-requires-a-space-between-string-concatinations.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-rviz.git