Add a fix for recent GCC version

3 files changed, 23 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6e7b57d58894..dd8866981641 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Sun May 22 20:41:13 UTC 2016
 pkgbase = ros-indigo-rosconsole
 	pkgdesc = ROS - ROS console output library.
 	pkgver = 1.11.19
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.ros.org/wiki/rosconsole
 	arch = any
 	license = BSD
@@ -24,7 +22,9 @@ pkgbase = ros-indigo-rosconsole
 	depends = apr-util
 	depends = log4cxx
 	source = ros-indigo-rosconsole-1.11.19-0.tar.gz::https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/rosconsole/1.11.19-0.tar.gz
+	source = vector.patch
 	sha256sums = 6309256609db99f64f9e5db554e9dd42fa1eeab01a65de412f9dc31a1d8092a8
+	sha256sums = d73b7b4dade0942de7a6a76dfbbaf6fe4f3c3fc6826c1df3164d1cfca8c3299b
 
 pkgname = ros-indigo-rosconsole
 
diff --git a/PKGBUILD b/PKGBUILD
index 7d87bd7d5cea..45b60c33ccfc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname='ros-indigo-rosconsole'
 pkgver='1.11.19'
 _pkgver_patch=0
 arch=('any')
-pkgrel=1
+pkgrel=2
 license=('BSD')
 
 ros_makedepends=(ros-indigo-rosunit
@@ -37,8 +37,14 @@ depends=(${ros_depends[@]}
 
 # Tarball version (faster download)
 _dir="ros_comm-release-release-indigo-rosconsole-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/rosconsole/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('6309256609db99f64f9e5db554e9dd42fa1eeab01a65de412f9dc31a1d8092a8')
+source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/rosconsole/${pkgver}-${_pkgver_patch}.tar.gz" vector.patch)
+sha256sums=('6309256609db99f64f9e5db554e9dd42fa1eeab01a65de412f9dc31a1d8092a8'
+            'd73b7b4dade0942de7a6a76dfbbaf6fe4f3c3fc6826c1df3164d1cfca8c3299b')
+
+prepare() {
+  cd ${srcdir}/${_dir}
+  patch -p1 -i ${srcdir}/vector.patch
+}
 
 build() {
   # Use ROS environment variables
diff --git a/vector.patch b/vector.patch
new file mode 100644
index 000000000000..b3630fc6dea6
--- /dev/null
+++ b/vector.patch
@@ -0,0 +1,11 @@
+diff -aur ros_comm-release-release-indigo-rosconsole-1.11.19-0.pristine/include/ros/console.h ros_comm-release-release-indigo-rosconsole-1.11.19-0.new/include/ros/console.h
+--- ros_comm-release-release-indigo-rosconsole-1.11.19-0.pristine/include/ros/console.h	2016-04-19 19:12:10.000000000 +0200
++++ ros_comm-release-release-indigo-rosconsole-1.11.19-0.new/include/ros/console.h	2016-11-23 23:15:58.476704215 +0100
+@@ -40,6 +40,7 @@
+ #include <cstdarg>
+ #include <ros/macros.h>
+ #include <map>
++#include <vector>
+ 
+ #ifdef ROSCONSOLE_BACKEND_LOG4CXX
+ #include "log4cxx/level.h"