Update version

5 files changed, 53 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2c827792da04..a780a542aaa2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sun May 22 20:42:45 UTC 2016
 pkgbase = ros-indigo-roscpp
 	pkgdesc = ROS - roscpp is a C++ implementation of ROS.
-	pkgver = 1.11.19
+	pkgver = 1.12.14
 	pkgrel = 1
 	url = http://ros.org/wiki/roscpp
 	arch = any
@@ -30,10 +28,12 @@ pkgbase = ros-indigo-roscpp
 	depends = ros-indigo-roscpp-traits
 	depends = ros-indigo-rosgraph-msgs
 	depends = ros-indigo-xmlrpcpp
-	source = ros-indigo-roscpp-1.11.19-0.tar.gz::https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/roscpp/1.11.19-0.tar.gz
-	source = readv.patch
-	sha256sums = b234e626e2013307ac8a456cbfa41a55e5d8e0e2c812431755828b29fee81255
+	source = ros-indigo-roscpp-1.12.14-0.tar.gz::https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/roscpp/1.12.14-0.tar.gz
+	source = 0000-readv.patch
+	source = 0001-boost_time.patch
+	sha256sums = d169290a2b5b2c539fd3eaac57aff820fcf2f9546128d98b51ccb69e4fac2570
 	sha256sums = 06c2e8446233a55d8be74ea24f977af923038053cd02ed05118e89644358d845
+	sha256sums = 60fecf40c2465264f887d78ae8817859740db9417b48a00c5ebae5d997b09af6
 
 pkgname = ros-indigo-roscpp
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..e6614362a6f5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*.tar.gz
+src/
+pkg/
+*.tar.xz
+*.tar.xz.sig
diff --git a/readv.patch b/0000-readv.patch
index 27dd29990ec0..27dd29990ec0 100644
--- a/readv.patch
+++ b/0000-readv.patch
diff --git a/0001-boost_time.patch b/0001-boost_time.patch
new file mode 100644
index 000000000000..bc656ee59cd4
--- /dev/null
+++ b/0001-boost_time.patch
@@ -0,0 +1,34 @@
+From e98177c7fb95fdfb40dcb0c7ad3adce2ba5d8b74 Mon Sep 17 00:00:00 2001
+From: Franck Lucien Duriez <franck@keecker.com>
+Date: Mon, 17 Dec 2018 12:53:50 +0100
+Subject: [PATCH] boost_time
+
+---
+ src/libros/callback_queue.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/libros/callback_queue.cpp b/src/libros/callback_queue.cpp
+index cd2f4f8..bd422f7 100644
+--- a/src/libros/callback_queue.cpp
++++ b/src/libros/callback_queue.cpp
+@@ -229,7 +229,7 @@ CallbackQueue::CallOneResult CallbackQueue::callOne(ros::WallDuration timeout)
+     {
+       if (!timeout.isZero())
+       {
+-        condition_.timed_wait(lock, boost::posix_time::microseconds(timeout.toSec() * 1000000.0f));
++        condition_.timed_wait(lock, boost::posix_time::microseconds(long(timeout.toSec() * 1000000.f)));
+       }
+ 
+       if (callbacks_.empty())
+@@ -305,7 +305,7 @@ void CallbackQueue::callAvailable(ros::WallDuration timeout)
+     {
+       if (!timeout.isZero())
+       {
+-        condition_.timed_wait(lock, boost::posix_time::microseconds(timeout.toSec() * 1000000.0f));
++        condition_.timed_wait(lock, boost::posix_time::microseconds(long(timeout.toSec() * 1000000.0f)));
+       }
+ 
+       if (callbacks_.empty() || !enabled_)
+-- 
+2.20.0
+
diff --git a/PKGBUILD b/PKGBUILD
index f67017553c2b..9425b783a6a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgdesc="ROS - roscpp is a C++ implementation of ROS."
 url='http://ros.org/wiki/roscpp'
 
 pkgname='ros-indigo-roscpp'
-pkgver='1.11.19'
+pkgver='1.12.14'
 _pkgver_patch=0
 arch=('any')
 pkgrel=1
@@ -43,14 +43,16 @@ depends=(${ros_depends[@]})
 # sha256sums=('SKIP')
 
 # Tarball version (faster download)
-_dir="ros_comm-release-release-indigo-roscpp-${pkgver}-${_pkgver_patch}"
+_dir="ros_comm-release-release-indigo-roscpp"
 source=(
   "${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/roscpp/${pkgver}-${_pkgver_patch}.tar.gz"
-  "readv.patch"
+  "0000-readv.patch"
+  "0001-boost_time.patch"
 )
 sha256sums=(
-  'b234e626e2013307ac8a456cbfa41a55e5d8e0e2c812431755828b29fee81255'
+  'd169290a2b5b2c539fd3eaac57aff820fcf2f9546128d98b51ccb69e4fac2570'
   '06c2e8446233a55d8be74ea24f977af923038053cd02ed05118e89644358d845'
+  '60fecf40c2465264f887d78ae8817859740db9417b48a00c5ebae5d997b09af6'
 )
 
 build() {
@@ -60,7 +62,8 @@ build() {
 
   # Apply patch
   cd "${srcdir}/${_dir}"
-  patch -p1 -i "${srcdir}"/readv.patch
+  patch -p1 -i "${srcdir}"/0000-readv.patch
+  patch -p1 -i "${srcdir}"/0001-boost_time.patch
 
   # Create build directory
   [ -d ${srcdir}/build ] || mkdir ${srcdir}/build