[neon/backports-focal/assimp/Neon/release] debian/patches: Fix compilation with system-provided minizip

IOhannes m zmölnig (Debian/GNU) null at kde.org
Wed Jan 26 13:21:02 GMT 2022


Git commit e443b699ecdbb2bc289153297651a743a3670d69 by IOhannes m zmölnig (Debian/GNU).
Committed on 19/01/2022 at 09:10.
Pushed by jriddell into branch 'Neon/release'.

Fix compilation with system-provided minizip

M  +1    -0    debian/patches/series
A  +20   -0    debian/patches/use-system-minizip.patch

https://invent.kde.org/neon/backports-focal/assimp/commit/e443b699ecdbb2bc289153297651a743a3670d69

diff --git a/debian/patches/series b/debian/patches/series
index 6a91ea6..7012fd6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@ drop-stripped-sources.patch
 use-system-utf8cpp.patch
 use-system-stb_image.patch
 use-system-libdraco.patch
+use-system-minizip.patch
 pyassimp.patch
 pyassimp_faces.patch
 doxygen.patch
diff --git a/debian/patches/use-system-minizip.patch b/debian/patches/use-system-minizip.patch
new file mode 100644
index 0000000..f9bef85
--- /dev/null
+++ b/debian/patches/use-system-minizip.patch
@@ -0,0 +1,20 @@
+Description: fix compilation with system provided minizip package
+ upstream vendored an a forked version of minizip that has not seen any love for 6 years...
+Origin: https://github.com/assimp/assimp/issues/4334
+Forwarded: https://github.com/assimp/assimp/issues/4334
+Reviewed-by: IOhannes m zmölnig
+Last-Update: 2022-01-19
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- assimp.orig/code/Common/ZipArchiveIOSystem.cpp
++++ assimp/code/Common/ZipArchiveIOSystem.cpp
+@@ -196,7 +196,9 @@
+     zlib_filefunc_def mapping;
+ 
+     mapping.zopen_file = (open_file_func)open;
++#ifdef ZOPENDISK64
+     mapping.zopendisk_file = (opendisk_file_func)opendisk;
++#endif
+     mapping.zread_file = (read_file_func)read;
+     mapping.zwrite_file = (write_file_func)write;
+     mapping.ztell_file = (tell_file_func)tell;



More information about the Neon-commits mailing list