Fix compatibility with newer boost library. Bump pkgrel

3 files changed, 79 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2f2051bab3a0..e704546cf9b6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Wed Mar 21 23:45:16 UTC 2018
 pkgbase = ros-kinetic-actionlib
 	pkgdesc = ROS - The actionlib stack provides a standardized interface for interfacing with preemptable tasks.
 	pkgver = 1.11.13
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.ros.org/wiki/actionlib
 	arch = any
 	license = BSD
@@ -28,7 +26,9 @@ pkgbase = ros-kinetic-actionlib
 	depends = wxpython
 	depends = boost
 	source = ros-kinetic-actionlib-1.11.13-0.tar.gz::https://github.com/ros-gbp/actionlib-release/archive/release/kinetic/actionlib/1.11.13-0.tar.gz
+	source = fix-boost-time.patch
 	sha256sums = 20904f8215d1cc39a6e30fee69a1c964a02dbf4a2f931e56d12fc8850d13d235
+	sha256sums = ea66d35dae96c4edf18a1bc4ce380c1c08fc825e3e726cb74b959f371fe839f2
 
 pkgname = ros-kinetic-actionlib
 
diff --git a/PKGBUILD b/PKGBUILD
index e2c1e2a546c5..ad3b95955764 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname='ros-kinetic-actionlib'
 pkgver='1.11.13'
 _pkgver_patch=0
 arch=('any')
-pkgrel=1
+pkgrel=2
 license=('BSD')
 
 ros_makedepends=(ros-kinetic-rospy
@@ -41,8 +41,17 @@ depends=(${ros_depends[@]}
 
 # Tarball version (faster download)
 _dir="actionlib-release-release-kinetic-actionlib-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/actionlib-release/archive/release/kinetic/actionlib/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('20904f8215d1cc39a6e30fee69a1c964a02dbf4a2f931e56d12fc8850d13d235')
+source=(
+  "${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/actionlib-release/archive/release/kinetic/actionlib/${pkgver}-${_pkgver_patch}.tar.gz"
+  'fix-boost-time.patch'
+)
+sha256sums=('20904f8215d1cc39a6e30fee69a1c964a02dbf4a2f931e56d12fc8850d13d235'
+            'ea66d35dae96c4edf18a1bc4ce380c1c08fc825e3e726cb74b959f371fe839f2')
+
+prepare() {
+  cd ${srcdir}/${_dir}
+  patch -Np1 -i ${srcdir}/fix-boost-time.patch
+}
 
 build() {
   # Use ROS environment variables
diff --git a/fix-boost-time.patch b/fix-boost-time.patch
new file mode 100644
index 000000000000..148c24f0d3ca
--- /dev/null
+++ b/fix-boost-time.patch
@@ -0,0 +1,64 @@
+diff --git a/include/actionlib/client/simple_action_client.h b/include/actionlib/client/simple_action_client.h
+index dfe2f70..7dab227 100644
+--- a/include/actionlib/client/simple_action_client.h
++++ b/include/actionlib/client/simple_action_client.h
+@@ -601,7 +601,7 @@ bool SimpleActionClient<ActionSpec>::waitForResult(const ros::Duration & timeout
+       time_left = loop_period;
+     }
+
+-    done_condition_.timed_wait(lock, boost::posix_time::milliseconds(time_left.toSec() * 1000.0f));
++    done_condition_.timed_wait(lock, boost::posix_time::milliseconds((long) (time_left.toSec() * 1000.0f)));
+   }
+
+   return cur_simple_state_ == SimpleGoalState::DONE;
+diff --git a/include/actionlib/destruction_guard.h b/include/actionlib/destruction_guard.h
+index 196a0a7..1aaa776 100644
+--- a/include/actionlib/destruction_guard.h
++++ b/include/actionlib/destruction_guard.h
+@@ -59,7 +59,7 @@ public:
+     boost::mutex::scoped_lock lock(mutex_);
+     destructing_ = true;
+     while (use_count_ > 0) {
+-      count_condition_.timed_wait(lock, boost::posix_time::milliseconds(1000.0f));
++      count_condition_.timed_wait(lock, boost::posix_time::milliseconds(1000));
+     }
+   }
+
+diff --git a/include/actionlib/server/simple_action_server_imp.h b/include/actionlib/server/simple_action_server_imp.h
+index 3975ec6..bee6137 100644
+--- a/include/actionlib/server/simple_action_server_imp.h
++++ b/include/actionlib/server/simple_action_server_imp.h
+@@ -394,7 +394,7 @@ void SimpleActionServer<ActionSpec>::executeLoop()
+       }
+     } else {
+       execute_condition_.timed_wait(lock,
+-        boost::posix_time::milliseconds(loop_duration.toSec() * 1000.0f));
++        boost::posix_time::milliseconds((long) (loop_duration.toSec() * 1000.0f)));
+     }
+   }
+ }
+diff --git a/src/connection_monitor.cpp b/src/connection_monitor.cpp
+index 19fe21a..c707e48 100644
+--- a/src/connection_monitor.cpp
++++ b/src/connection_monitor.cpp
+@@ -275,7 +275,7 @@ bool actionlib::ConnectionMonitor::waitForActionServerToStart(const ros::Duratio
+     }
+
+     check_connection_condition_.timed_wait(lock,
+-      boost::posix_time::milliseconds(time_left.toSec() * 1000.0f));
++      boost::posix_time::milliseconds((long) (time_left.toSec() * 1000.0f)));
+   }
+
+   return isServerConnected();
+diff --git a/test/destruction_guard_test.cpp b/test/destruction_guard_test.cpp
+index 4ae9e77..c3c7d75 100644
+--- a/test/destruction_guard_test.cpp
++++ b/test/destruction_guard_test.cpp
+@@ -86,7 +86,7 @@ TEST_F(TestRunner, threaded_test) {
+   {
+     boost::mutex::scoped_lock lock(mutex_);
+     while (!done_protecting_) {
+-      cond_.timed_wait(lock, boost::posix_time::milliseconds(100.0f));
++      cond_.timed_wait(lock, boost::posix_time::milliseconds(100));
+     }
+   }