gentoo auto-resync : 29:05:2024 - 00:07:15

3 files changed, 50 insertions, 2 deletions

diff --git a/dev-libs/collada-dom/Manifest b/dev-libs/collada-dom/Manifest
index cd4f1a96b772..42da9f35427b 100644
--- a/dev-libs/collada-dom/Manifest
+++ b/dev-libs/collada-dom/Manifest
@@ -1,4 +1,5 @@
+AUX collada-dom-2.5.0-boost-1.85.patch 1578 BLAKE2B 2a8cf4d92718bd5a42f74e4c3dab3ee12a3c86a2f83f569b30429295f6097f410c488cc6da0df02d38def92dd36798060baba7816b4368580c63b6a73a6ca959 SHA512 838b69be6e1afc03912323ec045d3fd537ec1bb336e022a7853540b4c86cabcec83a439fc61c6fdee1bceee455d5298f915c4872b432af2c8ec88944a385f048
 AUX take_snapshot.sh 330 BLAKE2B 7203b021e0d78d1985015e5c57d7e1eb3ff5b537c4ff448b5ab2b6d28a1baae28cce45a6c0e051bf190217ccd29539c6c40db9690b0845f9c797e7e2929f8fb1 SHA512 c8bbf4c5eac8d3d67f4017d8b5097925806864d54914ba3472f0c589bcb72b4d8d4330845170f8aa6051296285abbf8e404dd19103a3e4552fe41bc615ca0487
 DIST collada-dom-2.5.0.tar.gz 4509266 BLAKE2B bf09937680897850dd5c288fd4245b403f11d88a0dfecb8f22d83b82759078f2dce201ed871fb644b165deefce05893354badf75911ab56bb2730e318c472407 SHA512 f189d09e2396faa266734981bb7b5e91ec34b6faa9ad340206e769dae316496bf4271c129980668dc2756874dbb8c1157162197d0d3a74075e35200821875156
-EBUILD collada-dom-2.5.0-r1.ebuild 762 BLAKE2B f2badf2271036cfdc6f21df39f4d282782e0c9032089a3141fc975527719da45d8a05c9020fd5d1bc511222c0815f41ac6fdb1596e1d5177c32407514c72dfe6 SHA512 d5e90b9f128195a314425a4e41409a708ec82557123c3ad816757d467424580ce13f2112da6a15feb9141ee1dc923ca2628b130915226f1c05062280ae697035
+EBUILD collada-dom-2.5.0-r1.ebuild 818 BLAKE2B 9f7c51e23a723a62f5f056e1b8247c1de1d1e3fcb56f937becd6b26283cf1887138d7eb8fabf10faf55fb679b6fb47a172307aace03a6c9eede4ba3dc42a475e SHA512 0face3208de465e28e552404662d75664a7a1fda659c62bcb8e12bc9c7580f3a998bcf9342322af49a5675740ffb30fbf8f5861766f9e4f3664a260f55747e86
 MISC metadata.xml 403 BLAKE2B 7401cd008bf9c7a690597217a09f31f2223f1af9c71c72d0f1324a71e6abf8b23edfd7eea16fe63e2f78fb8b7ce3f4f13ef6531582085b03dea19f51c472898c SHA512 c415e46dac6f00d5e853afe0c1cda14c4e6dac7c58b1e034f90a97c05e2258f474254cb508a055667b53f87ca9e7f9b2e10476cee9fc185fea804743155770eb
diff --git a/dev-libs/collada-dom/collada-dom-2.5.0-r1.ebuild b/dev-libs/collada-dom/collada-dom-2.5.0-r1.ebuild
index f227b381ce14..ed5d9520144b 100644
--- a/dev-libs/collada-dom/collada-dom-2.5.0-r1.ebuild
+++ b/dev-libs/collada-dom/collada-dom-2.5.0-r1.ebuild
@@ -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
diff --git a/dev-libs/collada-dom/files/collada-dom-2.5.0-boost-1.85.patch b/dev-libs/collada-dom/files/collada-dom-2.5.0-boost-1.85.patch
new file mode 100644
index 000000000000..0a6e6e8869e8
--- /dev/null
+++ b/dev-libs/collada-dom/files/collada-dom-2.5.0-boost-1.85.patch
@@ -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();