From 78fd1ccbfb657718c23aca636e4427bf8576442c Mon Sep 17 00:00:00 2001
From: Ørjan Malde <red@foxi.me>
Date: Dec 07 2020 19:30:18 +0000
Subject: groups/231.native_packages_etc.group: adds minizip v2.10.4


Signed-off-by: Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>

---

diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index 8918ba7..c07d6a9 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -6,7 +6,7 @@ NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" "
 alsa_lib apr apr_util bdwgc bmake bochs bzip2 cherokee clzip cmake cron dante dbus
 dosbox doomgeneric emacs enscript expat ffmpeg file gdbm geoip gettext_tiny ghostpdl
 giflib gnuchess graphicsmagick gzip hastyhex hexcurse hexer htop icoutils imagemagick infounzip infozip
-john lcms2 less libmetalink lolcode mintty mlogin musl_compat musl_fts ncdu
+john lcms2 less libmetalink lolcode minizip mintty mlogin musl_compat musl_fts ncdu
 ncurses ncursestw ncursesw npth openjpeg p7zip pcre pcre2 popt potrace procps_ng qemu
 qpdf qrencode rpm rw shared_mime_info slang sqlite3 tcl tdnf texinfo
 tiff tmux tzdb utf8proc util_linux vim vorbis_tools w32api w32lib xorriso xpdf xz yabasic
@@ -218,6 +218,10 @@ zstd")";
 : ${PKG_LIBMETALINK_URL:=https://launchpad.net/libmetalink/trunk/libmetalink-${PKG_LIBMETALINK_VERSION}/+download/libmetalink-${PKG_LIBMETALINK_VERSION}.tar.bz2};
 : ${PKG_LOLCODE_URLS_GIT:="lci=https://github.com/justinmeza/lci.git@master"};
 : ${PKG_LOLCODE_BUILD_DIR:=lci};
+: ${PKG_MINIZIP_SHA256SUM:=6ef3d2e0c15352fe87a4a658b2e8f665fb0c21ddfb57a2e0a515658389d2e850};
+: ${PKG_MINIZIP_VERSION:=2.10.4};
+: ${PKG_MINIZIP_URL:=https://github.com/nmoinvaz/minizip/archive/${PKG_MINIZIP_VERSION}.tar.gz};
+: ${PKG_MINIZIP_SUBDIR:=minizip-${PKG_MINIZIP_VERSION}};
 : ${PKG_MINTTY_DEPENDS:="w32api w32lib"};
 : ${PKG_MINTTY_URLS_GIT:="mintty=https://github.com/midipix-ports/mintty.git@midipix bmintty=https://github.com/midipix-ports/bmintty.git@main"};
 : ${PKG_MINTTY_CONFIGURE:=bmintty/configure};
diff --git a/patches/minizip-2.10.4.local.patch b/patches/minizip-2.10.4.local.patch
new file mode 100644
index 0000000..d1a2092
--- /dev/null
+++ b/patches/minizip-2.10.4.local.patch
@@ -0,0 +1,11 @@
+diff -ru minizip-2.10.4.orig/CMakeLists.txt minizip-2.10.4/CMakeLists.txt
+--- minizip-2.10.4.orig/CMakeLists.txt	2020-12-07 01:32:18.000000000 +0100
++++ minizip-2.10.4/CMakeLists.txt	2020-12-07 15:20:38.128398493 +0100
+@@ -639,7 +639,6 @@
+ endif()
+ 
+ target_link_libraries(${PROJECT_NAME} PUBLIC ${MINIZIP_LIB} ${MINIZIP_DEP})
+-target_link_directories(${PROJECT_NAME} PUBLIC ${MINIZIP_LBD})
+ target_compile_definitions(${PROJECT_NAME} PRIVATE ${STDLIB_DEF} ${MINIZIP_DEF})
+ target_include_directories(${PROJECT_NAME} PRIVATE ${MINIZIP_INC})
+ target_include_directories(${PROJECT_NAME} PUBLIC
diff --git a/vars/minizip.vars b/vars/minizip.vars
new file mode 100644
index 0000000..4e2667e
--- /dev/null
+++ b/vars/minizip.vars
@@ -0,0 +1,31 @@
+#
+# set +o errexit -o noglob -o nounset is assumed.
+#
+
+pkg_minizip_configure() {
+	if ! rtl_fileop rm config.cache							\
+	|| ! env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" PREFIX=""		\
+		cmake	-DCMAKE_AR="${PREFIX}/bin/${PKG_AR}"				\
+			-DCMAKE_BUILD_TYPE="Debug"					\
+			-DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}"			\
+			-DCMAKE_CXX_COMPILER="${PREFIX}/bin/${PKG_CXX}"			\
+			-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="ONLY"			\
+			-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="NEVER"			\
+			-DCMAKE_INSTALL_PREFIX=""					\
+			-DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}"			\
+			-DPKG_CONFIG_EXECUTABLE="${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config" \
+			-DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include"			\
+			-DZLIB_LIBRARY_DEBUG="${PKG_PREFIX}/lib/libz.lib.a"		\
+			-DBZIP2_LIBRARIES="${PKG_PREFIX}/lib/libbz2.lib.a"		\
+			-DMZ_OPENSSL=ON							\
+			-DMZ_ZSTD=OFF							\
+			-DMZ_LZMA=ON							\
+			-DMZ_LIBBSD=OFF							\
+			-DBUILD_SHARED_LIBS=ON						\
+			-DMZ_BUILD_TEST=ON						\
+			"../minizip-${PKG_VERSION}"; then
+		return 1;
+	fi;
+};
+
+# vim:filetype=sh textwidth=0