diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2024-05-23 15:14:21 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2024-05-23 15:14:26 +0200 |
| commit | 8d529d424ed21b03320ca72913afc7877f31700c (patch) | |
| tree | 615b610ca9431b963b35164696ba6d8296cf60c1 /sci-electronics | |
| parent | sci-geosciences/gpxsee: remove old version (diff) | |
| download | gentoo-8d529d424ed21b03320ca72913afc7877f31700c.tar.gz gentoo-8d529d424ed21b03320ca72913afc7877f31700c.tar.bz2 gentoo-8d529d424ed21b03320ca72913afc7877f31700c.zip | |
sci-electronics/gazebo: upstream patch to build with latest boost
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Diffstat (limited to 'sci-electronics')
| -rw-r--r-- | sci-electronics/gazebo/files/boost.patch | 49 | ||||
| -rw-r--r-- | sci-electronics/gazebo/gazebo-11.14.0.ebuild | 1 |
2 files changed, 50 insertions, 0 deletions
diff --git a/sci-electronics/gazebo/files/boost.patch b/sci-electronics/gazebo/files/boost.patch new file mode 100644 index 000000000000..56f26387c58c --- /dev/null +++ b/sci-electronics/gazebo/files/boost.patch @@ -0,0 +1,49 @@ +From 6b4d0f0b94cb2d98e6a48970c1c128e9b4f13e47 Mon Sep 17 00:00:00 2001 +From: Steve Peters <scpeters@openrobotics.org> +Date: Fri, 10 May 2024 15:39:02 +0200 +Subject: [PATCH 1/2] Fix build with boost 1.85.0 + +Signed-off-by: Steve Peters <scpeters@openrobotics.org> +--- + gazebo/common/Console.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gazebo/common/Console.cc b/gazebo/common/Console.cc +index 6b86bc2d02..bb4dbe3180 100644 +--- a/gazebo/common/Console.cc ++++ b/gazebo/common/Console.cc +@@ -221,7 +221,7 @@ void FileLogger::Init(const std::string &_prefix, const std::string &_filename) + if (boost::filesystem::is_directory(logPath)) + this->logDirectory = logPath.string(); + else +- this->logDirectory = logPath.branch_path().string(); ++ this->logDirectory = logPath.parent_path().string(); + } + + ///////////////////////////////////////////////// + +From 27c2277a2376f9d82755e975ae8b564d9d6ca6ed Mon Sep 17 00:00:00 2001 +From: Steve Peters <scpeters@openrobotics.org> +Date: Fri, 10 May 2024 17:43:32 +0200 +Subject: [PATCH 2/2] Fix build error in LogPlay.cc as well + +Signed-off-by: Steve Peters <scpeters@openrobotics.org> +--- + gazebo/util/LogPlay.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gazebo/util/LogPlay.cc b/gazebo/util/LogPlay.cc +index 70cfcc3346..be00820edb 100644 +--- a/gazebo/util/LogPlay.cc ++++ b/gazebo/util/LogPlay.cc +@@ -414,8 +414,8 @@ common::Time LogPlay::LogEndTime() const + ///////////////////////////////////////////////// + std::string LogPlay::Filename() const + { +- return boost::filesystem::basename(this->dataPtr->filename) + +- boost::filesystem::extension(this->dataPtr->filename); ++ boost::filesystem::path path(this->dataPtr->filename); ++ return path.stem().string() + path.extension().string(); + } + + ///////////////////////////////////////////////// diff --git a/sci-electronics/gazebo/gazebo-11.14.0.ebuild b/sci-electronics/gazebo/gazebo-11.14.0.ebuild index 1746085d2235..04caee69b302 100644 --- a/sci-electronics/gazebo/gazebo-11.14.0.ebuild +++ b/sci-electronics/gazebo/gazebo-11.14.0.ebuild @@ -66,6 +66,7 @@ PATCHES=( "${FILESDIR}/qwt2.patch" "${FILESDIR}/cmake.patch" "${FILESDIR}/gv10.patch" + "${FILESDIR}/boost.patch" ) src_configure() { |