Fix wrong syntax in source. Update version to 1.12.14

3 files changed, 30 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 89bb20f380e4..d203e7871cd4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Wed Mar 21 23:44:14 UTC 2018
 pkgbase = ros-kinetic-message-filters
 	pkgdesc = ROS - A set of message filters which take in messages and may output those messages at a later time, based on the conditions that filter needs met.
-	pkgver = 1.12.13
+	pkgver = 1.12.14
 	pkgrel = 1
 	url = http://ros.org/wiki/message_filters
 	arch = any
@@ -19,8 +17,10 @@ pkgbase = ros-kinetic-message-filters
 	depends = ros-kinetic-roscpp
 	depends = ros-kinetic-rosconsole
 	depends = ros-kinetic-xmlrpcpp
-	source = ros-kinetic-message-filters-1.12.13-0.tar.gz::https://github.com/ros-gbp/ros_comm-release/archive/release/kinetic/message_filters/1.12.13-0.tar.gz
-	sha256sums = f16bb3bcc78881268316c2906fd5e42934dc69fcceb031a8d2cf7f14c8fb5b10
+	source = ros-kinetic-message-filters-1.12.14-0.tar.gz::https://github.com/ros-gbp/ros_comm-release/archive/release/kinetic/message_filters/1.12.14-0.tar.gz
+	source = fix-c++-syntax.patch
+	sha256sums = faa45c9fa60f227b7a015a7edc4824d5f823563bb7753a37fffb300472dded96
+	sha256sums = 2a21768b8874bb1ee7073bee5983cb869f08f79f8e11f1be7d14fb3dab095a6e
 
 pkgname = ros-kinetic-message-filters
 
diff --git a/PKGBUILD b/PKGBUILD
index e45c76dd864a..efd9f3cbc34b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgdesc="ROS - A set of message filters which take in messages and may output th
 url='http://ros.org/wiki/message_filters'
 
 pkgname='ros-kinetic-message-filters'
-pkgver='1.12.13'
+pkgver='1.12.14'
 _pkgver_patch=0
 arch=('any')
 pkgrel=1
@@ -33,8 +33,17 @@ depends=(${ros_depends[@]})
 
 # Tarball version (faster download)
 _dir="ros_comm-release-release-kinetic-message_filters-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/ros_comm-release/archive/release/kinetic/message_filters/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('f16bb3bcc78881268316c2906fd5e42934dc69fcceb031a8d2cf7f14c8fb5b10')
+source=(
+  "${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/ros_comm-release/archive/release/kinetic/message_filters/${pkgver}-${_pkgver_patch}.tar.gz"
+  'fix-c++-syntax.patch'
+)
+sha256sums=('faa45c9fa60f227b7a015a7edc4824d5f823563bb7753a37fffb300472dded96'
+            '2a21768b8874bb1ee7073bee5983cb869f08f79f8e11f1be7d14fb3dab095a6e')
+
+prepare() {
+  cd ${srcdir}/${_dir}
+  patch -Np1 -i ${srcdir}/fix-c++-syntax.patch
+}
 
 build() {
   # Use ROS environment variables
diff --git a/fix-c++-syntax.patch b/fix-c++-syntax.patch
new file mode 100644
index 000000000000..2c55ad4dfff5
--- /dev/null
+++ b/fix-c++-syntax.patch
@@ -0,0 +1,13 @@
+diff --git a/include/message_filters/synchronizer.h b/include/message_filters/synchronizer.h
+index 7891890..1c14a6f 100644
+--- a/include/message_filters/synchronizer.h
++++ b/include/message_filters/synchronizer.h
+@@ -355,7 +355,7 @@ private:
+   template<int i>
+   void cb(const typename mpl::at_c<Events, i>::type& evt)
+   {
+-    this->add<i>(evt);
++    this->template add<i>(evt);
+   }
+ 
+   uint32_t queue_size_;