| 1 | From 8d2b96e36e4b1a32544fb78e5d92c2e4c3c482c1 Mon Sep 17 00:00:00 2001
|
| 2 | From: Rodion Goritskov <[email protected]>
|
| 3 | Date: Sun, 11 Jan 2026 18:52:39 +0100
|
| 4 | Subject: [PATCH] Fix building with the fresh Boost.
|
| 5 |
|
| 6 | Merged patches from:
|
| 7 | https://github.com/rdiankov/collada-dom/pull/43.patch
|
| 8 | https://gitlab.archlinux.org/archlinux/packaging/packages/collada-dom/-/blob/main/boost-1.89.patch
|
| 9 | ---
|
| 10 | CMakeLists.txt | 2 +-
|
| 11 | dom/include/dae.h | 2 +-
|
| 12 | dom/src/dae/daeUtils.cpp | 2 +-
|
| 13 | dom/src/dae/daeZAEUncompressHandler.cpp | 2 +-
|
| 14 | 4 files changed, 4 insertions(+), 4 deletions(-)
|
| 15 |
|
| 16 | diff --git a/CMakeLists.txt b/CMakeLists.txt
|
| 17 | index 2596a23..0c8caca 100644
|
| 18 | |
| 19 | |
| 20 | @@ -159,7 +159,7 @@ endif()
|
| 21 | if( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" )
|
| 22 | set(Boost_LIBRARY_DIRS $ENV{BOOST_LIBRARYDIR})
|
| 23 | endif()
|
| 24 | -find_package(Boost COMPONENTS filesystem system REQUIRED)
|
| 25 | +find_package(Boost COMPONENTS filesystem REQUIRED)
|
| 26 |
|
| 27 | message(STATUS "found boost version: ${Boost_VERSION}")
|
| 28 |
|
| 29 | diff --git a/dom/include/dae.h b/dom/include/dae.h
|
| 30 | index e53388b..03e72f9 100644
|
| 31 | |
| 32 | |
| 33 | @@ -25,7 +25,7 @@
|
| 34 | #pragma warning(disable: 4180 4245)
|
| 35 | #endif
|
| 36 | #ifndef NO_BOOST
|
| 37 | -#include <boost/filesystem/convenience.hpp>
|
| 38 | +#include <boost/filesystem.hpp>
|
| 39 | #endif
|
| 40 | #ifdef _MSC_VER
|
| 41 | #pragma warning(pop)
|
| 42 | diff --git a/dom/src/dae/daeUtils.cpp b/dom/src/dae/daeUtils.cpp
|
| 43 | index 7e3dc9a..f4ddea3 100644
|
| 44 | |
| 45 | |
| 46 | @@ -18,7 +18,7 @@
|
| 47 | #endif
|
| 48 |
|
| 49 | #ifndef NO_BOOST
|
| 50 | -#include <boost/filesystem/convenience.hpp> // THIS WAS NOT COMMENTED.
|
| 51 | +#include <boost/filesystem.hpp> // THIS WAS NOT COMMENTED.
|
| 52 | #endif
|
| 53 |
|
| 54 | #include <cstdio> // for tmpnam
|
| 55 | diff --git a/dom/src/dae/daeZAEUncompressHandler.cpp b/dom/src/dae/daeZAEUncompressHandler.cpp
|
| 56 | index da2a344..2550000 100644
|
| 57 | |
| 58 | |
| 59 | @@ -271,7 +271,7 @@ bool daeZAEUncompressHandler::checkAndExtractInternalArchive( const std::string&
|
| 60 | bool error = false;
|
| 61 |
|
| 62 | boost::filesystem::path archivePath(filePath);
|
| 63 | - std::string dir = archivePath.branch_path().string();
|
| 64 | + std::string dir = archivePath.parent_path().string();
|
| 65 |
|
| 66 | const std::string& randomSegment = cdom::getRandomFileName();
|
| 67 | std::string tmpDir = dir + cdom::getFileSeparator() + randomSegment + cdom::getFileSeparator();
|
| 68 | --
|
| 69 | 2.52.0
|
| 70 |
|