Apply patch for GCC 6.1

See: https://github.com/ros-visualization/rviz/pull/1010

3 files changed, 43 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 03dfbed369c0..6f7a1b370677 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Apr 14 05:25:54 UTC 2016
+# Sun May 22 21:12:32 UTC 2016
 pkgbase = ros-indigo-rviz
 	pkgdesc = ROS - 3D visualization tool for ROS.
 	pkgver = 1.11.14
-	pkgrel = 1
+	pkgrel = 2
 	url = http://ros.org/wiki/rviz
 	arch = any
 	license = BSD, Creative Commons
@@ -71,7 +71,9 @@ pkgbase = ros-indigo-rviz
 	depends = mesa
 	depends = yaml-cpp
 	source = ros-indigo-rviz-1.11.14-0.tar.gz::https://github.com/ros-gbp/rviz-release/archive/release/indigo/rviz/1.11.14-0.tar.gz
+	source = gcc.patch
 	sha256sums = 17f125bd19e7ef1ccfd6674006346bcd626fbbc8c02b16703db03352ff6cc1bd
+	sha256sums = b761541381e14c1d85633b866aebe6dc3f56bdc85db777a99bdfaaaadebee2d9
 
 pkgname = ros-indigo-rviz
 
diff --git a/PKGBUILD b/PKGBUILD
index feb9ad612bd7..0892962471d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname='ros-indigo-rviz'
 pkgver='1.11.14'
 _pkgver_patch=0
 arch=('any')
-pkgrel=1
+pkgrel=2
 license=('BSD, Creative Commons')
 
 ros_makedepends=(ros-indigo-geometry-msgs
@@ -84,14 +84,20 @@ depends=(${ros_depends[@]}
 
 # Tarball version (faster download)
 _dir="rviz-release-release-indigo-rviz-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/rviz-release/archive/release/indigo/rviz/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('17f125bd19e7ef1ccfd6674006346bcd626fbbc8c02b16703db03352ff6cc1bd')
+source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/rviz-release/archive/release/indigo/rviz/${pkgver}-${_pkgver_patch}.tar.gz"
+  "gcc.patch")
+sha256sums=('17f125bd19e7ef1ccfd6674006346bcd626fbbc8c02b16703db03352ff6cc1bd'
+  'b761541381e14c1d85633b866aebe6dc3f56bdc85db777a99bdfaaaadebee2d9')
 
 build() {
   # Use ROS environment variables
   source /usr/share/ros-build-tools/clear-ros-env.sh
   [ -f /opt/ros/indigo/setup.bash ] && source /opt/ros/indigo/setup.bash
 
+  # Apply patch
+  cd "${srcdir}/${_dir}"
+  patch -p1 -i "${srcdir}"/gcc.patch
+
   # Create build directory
   [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
   cd ${srcdir}/build
diff --git a/gcc.patch b/gcc.patch
new file mode 100644
index 000000000000..fcf49b9a19a5
--- /dev/null
+++ b/gcc.patch
@@ -0,0 +1,30 @@
+From b216efc06fcf41ceff6c7ad0b63552964f892245 Mon Sep 17 00:00:00 2001
+From: Kartik Mohta <kartikmohta@gmail.com>
+Date: Tue, 17 May 2016 03:58:19 -0400
+Subject: [PATCH] Fix compile error due to the user-defined string literals
+ feature
+
+---
+ src/rviz/default_plugin/effort_display.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/rviz/default_plugin/effort_display.h b/src/rviz/default_plugin/effort_display.h
+index bc89bd6..c408421 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>
+     {