commit: c85cc67b6e5cf15d0a4e716f9f81577a18f3e29d Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Wed Feb 18 14:11:00 2026 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Wed Feb 18 15:04:00 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c85cc67b
dev-libs/collada-dom: fix build with zlib-1.3.2[minizip] Bug: https://bugs.gentoo.org/970227 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-libs/collada-dom/collada-dom-2.5.0-r2.ebuild | 1 + dev-libs/collada-dom/collada-dom-2.5.0-r3.ebuild | 1 + .../files/collada-dom-2.5.0-zlib-1.3.2.patch | 17 +++++++++++++++++ 3 files changed, 19 insertions(+) diff --git a/dev-libs/collada-dom/collada-dom-2.5.0-r2.ebuild b/dev-libs/collada-dom/collada-dom-2.5.0-r2.ebuild index 1b0e6a2f953b..0a10aa0073c7 100644 --- a/dev-libs/collada-dom/collada-dom-2.5.0-r2.ebuild +++ b/dev-libs/collada-dom/collada-dom-2.5.0-r2.ebuild @@ -29,6 +29,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-boost-1.{85,89}.patch # bugs 932316, 968458 + "${FILESDIR}"/${PN}-2.5.0-zlib-1.3.2.patch ) src_configure() { diff --git a/dev-libs/collada-dom/collada-dom-2.5.0-r3.ebuild b/dev-libs/collada-dom/collada-dom-2.5.0-r3.ebuild index 4010ef9a0ad3..856aa02f8924 100644 --- a/dev-libs/collada-dom/collada-dom-2.5.0-r3.ebuild +++ b/dev-libs/collada-dom/collada-dom-2.5.0-r3.ebuild @@ -33,6 +33,7 @@ PATCHES=( "${FILESDIR}"/${P}-fix-int-return-type.patch "${FILESDIR}"/${P}-unique_ptr.patch "${FILESDIR}"/${P}-cmake4.patch + "${FILESDIR}"/${PN}-2.5.0-zlib-1.3.2.patch ) src_configure() { diff --git a/dev-libs/collada-dom/files/collada-dom-2.5.0-zlib-1.3.2.patch b/dev-libs/collada-dom/files/collada-dom-2.5.0-zlib-1.3.2.patch new file mode 100644 index 000000000000..49631c465cff --- /dev/null +++ b/dev-libs/collada-dom/files/collada-dom-2.5.0-zlib-1.3.2.patch @@ -0,0 +1,17 @@ +(part of a downstream quickfix batch, may still need to be looked at upstream) + +https://bugs.gentoo.org/970227 +--- a/dom/include/dae/daeZAEUncompressHandler.h ++++ b/dom/include/dae/daeZAEUncompressHandler.h +@@ -11,3 +11,3 @@ + +-#include <unzip.h> ++#include <minizip/unzip.h> + #include <libxml/xmlreader.h> +--- a/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp ++++ b/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp +@@ -34,3 +34,3 @@ + +-#include <zip.h> // for saving compressed files ++#include <minizip/zip.h> // for saving compressed files + #ifdef _WIN32
