commit: b4eef9c524b555617e5dbd5d506e0c8571b91070 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Thu Aug 6 11:13:58 2020 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Thu Aug 6 12:28:33 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4eef9c5
dev-ros/timestamp_tools: fix for newer boost Closes: https://bugs.gentoo.org/690374 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> dev-ros/timestamp_tools/files/boost.patch | 13 +++++++++++++ ...p_tools-1.6.8.ebuild => timestamp_tools-1.6.8-r1.ebuild} | 3 ++- dev-ros/timestamp_tools/timestamp_tools-9999.ebuild | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dev-ros/timestamp_tools/files/boost.patch b/dev-ros/timestamp_tools/files/boost.patch new file mode 100644 index 00000000000..de7878ca19b --- /dev/null +++ b/dev-ros/timestamp_tools/files/boost.patch @@ -0,0 +1,13 @@ +Index: timestamp_tools/include/timestamp_tools/trigger_matcher.h +=================================================================== +--- timestamp_tools.orig/include/timestamp_tools/trigger_matcher.h ++++ timestamp_tools/include/timestamp_tools/trigger_matcher.h +@@ -266,7 +266,7 @@ public: + if (stamp != RetryLater) + return stamp; + +- got_trigger_condition_.timed_wait(lock, boost::posix_time::microseconds(timeout * 1e6)); ++ got_trigger_condition_.timed_wait(lock, boost::posix_time::microseconds(static_cast<int>(timeout * 1e6))); + + return getTimestampNoblockPrelocked(t); + } diff --git a/dev-ros/timestamp_tools/timestamp_tools-1.6.8.ebuild b/dev-ros/timestamp_tools/timestamp_tools-1.6.8-r1.ebuild similarity index 86% rename from dev-ros/timestamp_tools/timestamp_tools-1.6.8.ebuild rename to dev-ros/timestamp_tools/timestamp_tools-1.6.8-r1.ebuild index bb92a293793..f43b7fcc474 100644 --- a/dev-ros/timestamp_tools/timestamp_tools-1.6.8.ebuild +++ b/dev-ros/timestamp_tools/timestamp_tools-1.6.8-r1.ebuild @@ -19,4 +19,5 @@ RDEPEND=" " DEPEND="${RDEPEND} test? ( dev-cpp/gtest )" -PATCHES=( "${FILESDIR}/tests.patch" ) +PATCHES=( "${FILESDIR}/tests.patch" "${FILESDIR}/boost.patch" ) + diff --git a/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild b/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild index 5c96c2266bf..86be358b991 100644 --- a/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild +++ b/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild @@ -19,3 +19,4 @@ RDEPEND=" " DEPEND="${RDEPEND} test? ( dev-cpp/gtest )" +PATCHES=( "${FILESDIR}/boost.patch" )
