dev-libs/collada-dom: fix build with boost-1.85.0

Closes: https://bugs.gentoo.org/932316
Signed-off-by: Stefan Strogin <steils@gentoo.org>
This commit is contained in:
Stefan Strogin
2024-05-28 08:29:03 +00:00
parent 1228c5e43c
commit cd9beeb000
2 changed files with 48 additions and 1 deletions
@@ -1,4 +1,4 @@
# Copyright 1999-2022 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -27,6 +27,8 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
PATCHES=( "${FILESDIR}/${PN}-2.5.0-boost-1.85.patch" )
src_configure() {
# bug 618960
append-cxxflags -std=c++14
@@ -0,0 +1,45 @@
commit 65222c3c4f800b624e1d547ab7f1eb28e3d6ee59
Author: Stefan Strogin <stefan@steils.org>
Date: Mon May 27 16:13:09 2024 +0000
Fix build for boost 1.85.0, #42
diff --git a/dom/include/dae.h b/dom/include/dae.h
index e53388b..03e72f9 100644
--- a/dom/include/dae.h
+++ b/dom/include/dae.h
@@ -25,7 +25,7 @@
#pragma warning(disable: 4180 4245)
#endif
#ifndef NO_BOOST
-#include <boost/filesystem/convenience.hpp>
+#include <boost/filesystem.hpp>
#endif
#ifdef _MSC_VER
#pragma warning(pop)
diff --git a/dom/src/dae/daeUtils.cpp b/dom/src/dae/daeUtils.cpp
index de30ca0..45b667f 100644
--- a/dom/src/dae/daeUtils.cpp
+++ b/dom/src/dae/daeUtils.cpp
@@ -18,7 +18,7 @@
#endif
#ifndef NO_BOOST
-#include <boost/filesystem/convenience.hpp> // THIS WAS NOT COMMENTED.
+#include <boost/filesystem.hpp> // THIS WAS NOT COMMENTED.
#endif
#include <cstdio> // for tmpnam
diff --git a/dom/src/dae/daeZAEUncompressHandler.cpp b/dom/src/dae/daeZAEUncompressHandler.cpp
index da2a344..2550000 100644
--- a/dom/src/dae/daeZAEUncompressHandler.cpp
+++ b/dom/src/dae/daeZAEUncompressHandler.cpp
@@ -271,7 +271,7 @@ bool daeZAEUncompressHandler::checkAndExtractInternalArchive( const std::string&
bool error = false;
boost::filesystem::path archivePath(filePath);
- std::string dir = archivePath.branch_path().string();
+ std::string dir = archivePath.parent_path().string();
const std::string& randomSegment = cdom::getRandomFileName();
std::string tmpDir = dir + cdom::getFileSeparator() + randomSegment + cdom::getFileSeparator();