git: 452c407f87c8 - main - devel/collada-dom: unbreak build with boost-1.85

The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=452c407f87c8d9d0d5c1171bbbeec42129ec6778

commit 452c407f87c8d9d0d5c1171bbbeec42129ec6778
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2024-10-02 23:26:32 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2024-10-03 10:24:53 +0000

    devel/collada-dom: unbreak build with boost-1.85
    
    With hat:       office
    Sponsored by:   Future Crew, LLC
---
 devel/collada-dom/Makefile                                  |  5 ++++-
 devel/collada-dom/files/patch-dom_include_dae.h             | 11 +++++++++++
 devel/collada-dom/files/patch-dom_src_dae_daeUtils.cpp      | 13 +++++++++++--
 .../files/patch-dom_src_dae_daeZAEUncompressHandler.cpp     | 11 +++++++++++
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/devel/collada-dom/Makefile b/devel/collada-dom/Makefile
index 849a9a23675a..ec912eaf4e02 100644
--- a/devel/collada-dom/Makefile
+++ b/devel/collada-dom/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	collada-dom
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	devel
 
 MAINTAINER=	trueos@norwegianrockcat.com
@@ -21,4 +21,7 @@ GH_ACCOUNT=	rdiankov
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
+# LLVM15+ workaround
+CFLAGS=		-Wno-int-conversion
+
 .include <bsd.port.mk>
diff --git a/devel/collada-dom/files/patch-dom_include_dae.h b/devel/collada-dom/files/patch-dom_include_dae.h
new file mode 100644
index 000000000000..74e13ec081c7
--- /dev/null
+++ b/devel/collada-dom/files/patch-dom_include_dae.h
@@ -0,0 +1,11 @@
+--- dom/include/dae.h.orig	2017-10-21 05:05:24 UTC
++++ 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/devel/collada-dom/files/patch-dom_src_dae_daeUtils.cpp b/devel/collada-dom/files/patch-dom_src_dae_daeUtils.cpp
index 847ffc5d23d5..61894cc204f6 100644
--- a/devel/collada-dom/files/patch-dom_src_dae_daeUtils.cpp
+++ b/devel/collada-dom/files/patch-dom_src_dae_daeUtils.cpp
@@ -1,6 +1,15 @@
---- dom/src/dae/daeUtils.cpp.orig	2019-05-09 19:37:18 UTC
+--- dom/src/dae/daeUtils.cpp.orig	2017-10-21 05:05:24 UTC
 +++ dom/src/dae/daeUtils.cpp
-@@ -152,7 +152,7 @@ char cdom::getFileSeparator() {
+@@ -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
+@@ -152,7 +152,7 @@ const string& cdom::getSystemTmpDir() {
  const string& cdom::getSystemTmpDir() {
  #ifdef WIN32
      static string tmpDir = string(getenv("TMP")) + getFileSeparator();
diff --git a/devel/collada-dom/files/patch-dom_src_dae_daeZAEUncompressHandler.cpp b/devel/collada-dom/files/patch-dom_src_dae_daeZAEUncompressHandler.cpp
new file mode 100644
index 000000000000..1402c1bbeca7
--- /dev/null
+++ b/devel/collada-dom/files/patch-dom_src_dae_daeZAEUncompressHandler.cpp
@@ -0,0 +1,11 @@
+--- dom/src/dae/daeZAEUncompressHandler.cpp.orig	2017-10-21 05:05:24 UTC
++++ dom/src/dae/daeZAEUncompressHandler.cpp
+@@ -271,7 +271,7 @@ bool daeZAEUncompressHandler::checkAndExtractInternalA
+     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();