From e7ef070b2cc44c89b43dfd0e5778518c2050cc12 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sun, 15 Apr 2018 04:56:01 +0000 Subject: [PATCH] net-mgmt/icinga2: unbreak with boost 1.67 In file included from lib/base/base_unity.cpp:61: lib/base/timer.cpp:269:31: error: no matching conversion for functional-style cast from 'double' to 'boost::posix_time::milliseconds' (aka 'subsecond_duration') l_TimerCV.timed_wait(lock, boost::posix_time::milliseconds(wait * 1000)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PR: 227427 Reported by: antoine (via exp-run) --- net-mgmt/icinga2/files/patch-boost-1.67 | 35 +++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 net-mgmt/icinga2/files/patch-boost-1.67 diff --git a/net-mgmt/icinga2/files/patch-boost-1.67 b/net-mgmt/icinga2/files/patch-boost-1.67 new file mode 100644 index 000000000000..821f857642f6 --- /dev/null +++ b/net-mgmt/icinga2/files/patch-boost-1.67 @@ -0,0 +1,35 @@ +https://github.com/Icinga/icinga2/pull/6230 + +--- lib/base/timer.cpp.orig 2018-03-22 10:26:19 UTC ++++ lib/base/timer.cpp +@@ -266,7 +266,7 @@ void Timer::TimerThreadProc(void) + + if (wait > 0.01) { + /* Wait for the next timer. */ +- l_TimerCV.timed_wait(lock, boost::posix_time::milliseconds(wait * 1000)); ++ l_TimerCV.timed_wait(lock, boost::posix_time::milliseconds(long(wait * 1000))); + + continue; + } +--- lib/checker/checkercomponent.cpp.orig 2018-03-22 10:26:19 UTC ++++ lib/checker/checkercomponent.cpp +@@ -130,7 +130,7 @@ void CheckerComponent::CheckThreadProc(void) + + if (wait > 0) { + /* Wait for the next check. */ +- m_CV.timed_wait(lock, boost::posix_time::milliseconds(wait * 1000)); ++ m_CV.timed_wait(lock, boost::posix_time::milliseconds(long(wait * 1000))); + + continue; + } +--- lib/remote/eventqueue.cpp.orig 2018-03-22 10:26:19 UTC ++++ lib/remote/eventqueue.cpp +@@ -114,7 +114,7 @@ Dictionary::Ptr EventQueue::WaitForEvent(void *client, + return result; + } + +- if (!m_CV.timed_wait(lock, boost::posix_time::milliseconds(timeout * 1000))) ++ if (!m_CV.timed_wait(lock, boost::posix_time::milliseconds(long(timeout * 1000)))) + return Dictionary::Ptr(); + } + }