commit f82bbb5284e1337725adb697880a668a08efeba4
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Sun Dec 15 23:07:10 2024 +0100
- rel 2, fix building with boost 1.87
boost-1.87.patch | 33 +++++++++++++++++++++++++++++++++
collada-dom.spec | 6 ++++--
2 files changed, 37 insertions(+), 2 deletions(-)
---
diff --git a/collada-dom.spec b/collada-dom.spec
index 171f9ca..17a8463 100644
--- a/collada-dom.spec
+++ b/collada-dom.spec
@@ -2,13 +2,14 @@ Summary: COLLADA Document Object Model (DOM) library
Summary(pl.UTF-8): Biblioteka obiektowego modelu dokumentu (DOM) COLLADA
Name: collada-dom
Version: 2.5.0
-Release: 1
+Release: 2
License: MIT
Group: Libraries
#Source0Download: https://github.com/rdiankov/collada-dom/tags
Source0:
https://github.com/rdiankov/collada-dom/archive/v%{version}/%{name}-%{version}.tar.gz
# Source0-md5: 5caf23bd2302d07c86c85fa9b9209d87
Patch0: %{name}-minizip-include.patch
+Patch1: boost-1.87.patch
URL: https://www.khronos.org/collada/
BuildRequires: boost-devel >= 1.33
BuildRequires: cmake >= 2.6.0
@@ -45,7 +46,8 @@ Pliki nagłówkowe biblioteki COLLADA DOM.
%prep
%setup -q
-%patch0 -p1
+%patch -P 0 -p1
+%patch -P 1 -p1
%build
install -d build
diff --git a/boost-1.87.patch b/boost-1.87.patch
new file mode 100644
index 0000000..aa3d227
--- /dev/null
+++ b/boost-1.87.patch
@@ -0,0 +1,33 @@
+--- collada-dom-2.5.0/dom/include/dae.h~ 2017-10-21 07:05:24.000000000
+0200
++++ collada-dom-2.5.0/dom/include/dae.h 2024-12-15 22:50:26.692246872
+0100
+@@ -25,7 +25,7 @@
+ #pragma warning(disable: 4180 4245)
+ #endif
+ #ifndef NO_BOOST
+-#include <boost/filesystem/convenience.hpp>
++#include <boost/filesystem/operations.hpp>
+ #endif
+ #ifdef _MSC_VER
+ #pragma warning(pop)
+--- collada-dom-2.5.0/dom/src/dae/daeUtils.cpp~ 2017-10-21
07:05:24.000000000 +0200
++++ collada-dom-2.5.0/dom/src/dae/daeUtils.cpp 2024-12-15 22:59:48.425839478
+0100
+@@ -18,7 +18,7 @@
+ #endif
+
+ #ifndef NO_BOOST
+-#include <boost/filesystem/convenience.hpp> // THIS WAS NOT COMMENTED.
++#include <boost/filesystem/operations.hpp> // THIS WAS NOT COMMENTED.
+ #endif
+
+ #include <cstdio> // for tmpnam
+--- collada-dom-2.5.0/dom/src/dae/daeZAEUncompressHandler.cpp~ 2017-10-21
07:05:24.000000000 +0200
++++ collada-dom-2.5.0/dom/src/dae/daeZAEUncompressHandler.cpp 2024-12-15
23:03:02.412243470 +0100
+@@ -271,7 +271,7 @@
+ 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();
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/collada-dom.git/commitdiff/f82bbb5284e1337725adb697880a668a08efeba4
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
