| 1 |
commit: b4eef9c524b555617e5dbd5d506e0c8571b91070 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 6 11:13:58 2020 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 6 12:28:33 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4eef9c5 |
| 7 |
|
| 8 |
dev-ros/timestamp_tools: fix for newer boost |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/690374 |
| 11 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
| 12 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-ros/timestamp_tools/files/boost.patch | 13 +++++++++++++ |
| 15 |
...p_tools-1.6.8.ebuild => timestamp_tools-1.6.8-r1.ebuild} | 3 ++- |
| 16 |
dev-ros/timestamp_tools/timestamp_tools-9999.ebuild | 1 + |
| 17 |
3 files changed, 16 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/dev-ros/timestamp_tools/files/boost.patch b/dev-ros/timestamp_tools/files/boost.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..de7878ca19b |
| 22 |
--- /dev/null |
| 23 |
+++ b/dev-ros/timestamp_tools/files/boost.patch |
| 24 |
@@ -0,0 +1,13 @@ |
| 25 |
+Index: timestamp_tools/include/timestamp_tools/trigger_matcher.h |
| 26 |
+=================================================================== |
| 27 |
+--- timestamp_tools.orig/include/timestamp_tools/trigger_matcher.h |
| 28 |
++++ timestamp_tools/include/timestamp_tools/trigger_matcher.h |
| 29 |
+@@ -266,7 +266,7 @@ public: |
| 30 |
+ if (stamp != RetryLater) |
| 31 |
+ return stamp; |
| 32 |
+ |
| 33 |
+- got_trigger_condition_.timed_wait(lock, boost::posix_time::microseconds(timeout * 1e6)); |
| 34 |
++ got_trigger_condition_.timed_wait(lock, boost::posix_time::microseconds(static_cast<int>(timeout * 1e6))); |
| 35 |
+ |
| 36 |
+ return getTimestampNoblockPrelocked(t); |
| 37 |
+ } |
| 38 |
|
| 39 |
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 |
| 40 |
similarity index 86% |
| 41 |
rename from dev-ros/timestamp_tools/timestamp_tools-1.6.8.ebuild |
| 42 |
rename to dev-ros/timestamp_tools/timestamp_tools-1.6.8-r1.ebuild |
| 43 |
index bb92a293793..f43b7fcc474 100644 |
| 44 |
--- a/dev-ros/timestamp_tools/timestamp_tools-1.6.8.ebuild |
| 45 |
+++ b/dev-ros/timestamp_tools/timestamp_tools-1.6.8-r1.ebuild |
| 46 |
@@ -19,4 +19,5 @@ RDEPEND=" |
| 47 |
" |
| 48 |
DEPEND="${RDEPEND} |
| 49 |
test? ( dev-cpp/gtest )" |
| 50 |
-PATCHES=( "${FILESDIR}/tests.patch" ) |
| 51 |
+PATCHES=( "${FILESDIR}/tests.patch" "${FILESDIR}/boost.patch" ) |
| 52 |
+ |
| 53 |
|
| 54 |
diff --git a/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild b/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild |
| 55 |
index 5c96c2266bf..86be358b991 100644 |
| 56 |
--- a/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild |
| 57 |
+++ b/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild |
| 58 |
@@ -19,3 +19,4 @@ RDEPEND=" |
| 59 |
" |
| 60 |
DEPEND="${RDEPEND} |
| 61 |
test? ( dev-cpp/gtest )" |
| 62 |
+PATCHES=( "${FILESDIR}/boost.patch" ) |
Archives