<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3e7ddf78c09688e95b0882e0f77f234ed9482012">https://github.com/macports/macports-ports/commit/3e7ddf78c09688e95b0882e0f77f234ed9482012</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3e7ddf78c09 minizip-ng: New port, version 3.0.2, replaces minizip2
</span>3e7ddf78c09 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3e7ddf78c09688e95b0882e0f77f234ed9482012
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jul 30 18:32:07 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> minizip-ng: New port, version 3.0.2, replaces minizip2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/63316
</span>---
archivers/minizip-ng/Portfile | 74 ++++++++++++++++++++
.../files/DYLD_LIBRARY_PATH.patch | 31 +++++++--
archivers/minizip2/Portfile | 42 ++----------
archivers/minizip2/files/minizip2.patch | 80 ----------------------
4 files changed, 105 insertions(+), 122 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/minizip-ng/Portfile b/archivers/minizip-ng/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..06b2f55adf5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/minizip-ng/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,74 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup zlib-ng minizip-ng 3.0.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 96fd9a352c73f61c9d4076c4fe19592d054a12b0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6ba4b6629c107c27ab526e517bdb105612232f0965a6747f60150e5a04c2fe5a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 638865
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories archivers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description fork of zlib's minizip zip file manipulation library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${name} is a ${description}.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libiconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zstd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append DYLD_LIBRARY_PATH.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -DBUILD_SHARED_LIBS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMZ_BUILD_TEST=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMZ_BUILD_UNIT_TEST=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMZ_BZIP2=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMZ_FETCH_LIBS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMZ_ICONV=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMZ_LIBCOMP=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMZ_LZMA=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMZ_OPENSSL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMZ_ZLIB=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMZ_ZSTD=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Change filename suffix to avoid conflict with minizip port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/zlib-ng/minizip-ng/discussions/452
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMZ_PROJECT_SUFFIX=-ng
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Disable minizip compatibility mode to avoid conflict with libzip port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMZ_COMPAT=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Disable signing support because its tests fail unless a test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# certificate is installed in the keychain.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/zlib-ng/minizip-ng/issues/580#issuecomment-874894055
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMZ_SIGNING=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} >= 15} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use Apple's libcompression.dylib.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMZ_LIBCOMP=OFF -DMZ_LIBCOMP=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # libcompression.dylib not available; use zlib.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMZ_ZLIB=OFF -DMZ_ZLIB=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/minizip2/files/DYLD_LIBRARY_PATH.patch b/archivers/minizip-ng/files/DYLD_LIBRARY_PATH.patch
</span>similarity index 82%
rename from archivers/minizip2/files/DYLD_LIBRARY_PATH.patch
rename to archivers/minizip-ng/files/DYLD_LIBRARY_PATH.patch
<span style='display:block; white-space:pre;color:#808080;'>index 21d796720b9..313389ad4f8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/minizip2/files/DYLD_LIBRARY_PATH.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/minizip-ng/files/DYLD_LIBRARY_PATH.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,17 @@
</span> Set DYLD_LIBRARY_PATH so the test runner can find and use the library
that was just built.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2019-11-15 15:24:17.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2019-11-16 05:34:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -770,30 +770,44 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2021-05-09 18:46:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2021-07-30 17:29:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -816,6 +816,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_test(NAME test_cmd COMMAND test_cmd WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_tests_properties(test_cmd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PROPERTIES ENVIRONMENT DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR}:$ENV{DYLD_LIBRARY_PATH})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ function(create_compress_tests EXTRA_NAME EXTRA_ARGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(MZ_DECOMPRESS_ONLY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -855,30 +857,44 @@
</span> COMMAND minizip_cmd ${COMPRESS_METHOD_ARG} -o ${EXTRA_ARGS}
result.zip test.c test.h empty.txt random.bin uniform.bin fuzz
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +56,7 @@ that was just built.
</span> endif()
endforeach()
endfunction()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -820,30 +834,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -905,30 +921,40 @@
</span> COMMAND minizip_cmd -x -o ${EXTRA_ARGS} -d out
fuzz/unzip_fuzzer_seed_corpus/tiny.zip
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,3 +97,17 @@ that was just built.
</span> endif()
endif()
if(NOT MZ_COMPRESS_ONLY AND NOT MZ_DECOMPRESS_ONLY)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -936,9 +962,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_test(NAME gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND minigzip_cmd random.bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_tests_properties(gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PROPERTIES ENVIRONMENT DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR}:$ENV{DYLD_LIBRARY_PATH})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_test(NAME ungz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND minigzip_cmd -x -d out random.bin.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_tests_properties(ungz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PROPERTIES ENVIRONMENT DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR}:$ENV{DYLD_LIBRARY_PATH})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/minizip2/Portfile b/archivers/minizip2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9a7b5ab13cd..3c346a7b68f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/minizip2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/minizip2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,47 +1,13 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup nmoinvaz minizip 2.9.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1b9f54b99d30e2e359dcfb69fe521c46be60818d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2e3db03843dddcf3268081fbaf4ce95caefea38ccdfc2b10178f0166d25c0bab \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 744361
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup obsolete 1.0
</span>
name minizip2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+replaced_by minizip-ng
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.0.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories archivers
platforms darwin
maintainers {ryandesign @ryandesign} openmaintainer
license zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Minizip2 zip file manipulation library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:bzip2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libiconv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append DYLD_LIBRARY_PATH.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append minizip2.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args -DBUILD_SHARED_LIBS=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBZIP2_LIBRARY_RELEASE=${prefix}/lib/libbz2.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DIconv_LIBRARY=${prefix}/lib/libiconv.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMZ_BUILD_TEST=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMZ_BUILD_UNIT_TEST=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DZLIB_LIBRARY_RELEASE=${prefix}/lib/libz.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Disable minizip1 compatibility mode because it would install headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# that conflict with the libzip port. This could possibly be fixed by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# moving them into a minizip2 subdirectory, if I can figure out how to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# modify CMakeLists.txt to do that.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMZ_COMPAT=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.run yes
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/minizip2/files/minizip2.patch b/archivers/minizip2/files/minizip2.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 35d17528ca6..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/minizip2/files/minizip2.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,80 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Rename to minizip2. It seems to be agreed that this is what package managers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-should do (so that we can offer minizip and minizip2 at the same time, since
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-they are not compatible) and yet upstream does not provide a way to do it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-I hope I've renamed everything I was supposed to rename.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/nmoinvaz/minizip/issues/333
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2019-11-15 15:24:17.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2019-11-16 05:35:47.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -55,9 +55,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(INSTALL_INC_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR} CACHE PATH "Installation directory for headers")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(INSTALL_MAN_DIR ${CMAKE_INSTALL_FULL_MANDIR} CACHE PATH "Installation directory for manual pages")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(INSTALL_CMAKE_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/minizip" CACHE PATH "Installation directory for cmake files.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(INSTALL_CMAKE_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/minizip2" CACHE PATH "Installation directory for cmake files.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(MINIZIP_PC ${CMAKE_CURRENT_BINARY_DIR}/minizip.pc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(MINIZIP_PC ${CMAKE_CURRENT_BINARY_DIR}/minizip2.pc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure_file(minizip.pc.cmakein ${MINIZIP_PC} @ONLY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(STDLIB_DEF)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -632,6 +632,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_target_properties(${PROJECT_NAME} PROPERTIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VERSION ${VERSION}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SOVERSION ${SOVERSION}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OUTPUT_NAME ${PROJECT_NAME}2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LINKER_LANGUAGE C
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEFINE_SYMBOL "MZ_EXPORTS")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -721,7 +722,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_executable(minizip_cmd "minizip.c")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mz_configure_target(minizip_cmd)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set_target_properties(minizip_cmd PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_target_properties(minizip_cmd PROPERTIES OUTPUT_NAME ${PROJECT_NAME}2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_compile_definitions(minizip_cmd PRIVATE ${MINIZIP_DEF})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(minizip_cmd ${PROJECT_NAME})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- minizip.c.orig 2019-05-22 19:50:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ minizip.c 2019-06-14 10:48:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,14 +64,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int32_t minizip_banner(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- printf("Minizip %s - https://github.com/nmoinvaz/minizip\n", MZ_VERSION);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ printf("Minizip2 %s - https://github.com/nmoinvaz/minizip\n", MZ_VERSION);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("---------------------------------------------------\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return MZ_OK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int32_t minizip_help(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- printf("Usage: minizip [-x][-d dir|-l|-e][-o][-f][-y][-c cp][-a][-j][-0 to -9][-b|-m][-k 512][-p pwd][-s] file.zip [files]\n\n" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ printf("Usage: minizip2 [-x][-d dir|-l|-e][-o][-f][-y][-c cp][-a][-j][-0 to -9][-b|-m][-k 512][-p pwd][-s] file.zip [files]\n\n" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " -x Extract files\n" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " -l List files\n" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " -d Destination directory\n" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- minizip.pc.cmakein.orig 2019-04-08 15:26:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ minizip.pc.cmakein 2019-04-28 16:43:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,13 +1,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix=@CMAKE_INSTALL_PREFIX@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--exec_prefix=@CMAKE_INSTALL_PREFIX@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--libdir=@INSTALL_LIB_DIR@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--sharedlibdir=@INSTALL_LIB_DIR@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--includedir=@INSTALL_INC_DIR@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+exec_prefix=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libdir=${exec_prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+includedir=${prefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Name: minizip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Description: Minizip zip file manipulation library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Name: minizip2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Description: Minizip2 zip file manipulation library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Version: @VERSION@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Requires: zlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Libs: -L${libdir} -L${sharedlibdir} -lminizip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Libs: -L${libdir} -lminizip2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Libs.private: -lbz2 -liconv -lz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Cflags: -I${includedir}
</span></pre><pre style='margin:0'>
</pre>