From d7700a286434c46d0d8dbfb50d44d12fa49629c2 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Tue, 14 Sep 2021 13:49:00 +0530
Subject: [PATCH] libzip: Update to 1.8.0, use ninja

---
 .../0001-cmake-disable-_snprintf-check.patch  | 11 ------
 mingw-w64-libzip/PKGBUILD                     | 38 +++++++++----------
 2 files changed, 19 insertions(+), 30 deletions(-)
 delete mode 100644 mingw-w64-libzip/0001-cmake-disable-_snprintf-check.patch

diff --git a/mingw-w64-libzip/0001-cmake-disable-_snprintf-check.patch b/mingw-w64-libzip/0001-cmake-disable-_snprintf-check.patch
deleted file mode 100644
index fccf2fdb1e..0000000000
--- a/mingw-w64-libzip/0001-cmake-disable-_snprintf-check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libzip-1.7.3.orig/CMakeLists.txt
-+++ libzip-1.7.3/CMakeLists.txt
-@@ -100,7 +100,7 @@
- check_function_exists(_fdopen HAVE__FDOPEN)
- check_function_exists(_fileno HAVE__FILENO)
- check_function_exists(_setmode HAVE__SETMODE)
--check_function_exists(_snprintf HAVE__SNPRINTF)
-+#check_function_exists(_snprintf HAVE__SNPRINTF)
- check_function_exists(_strdup HAVE__STRDUP)
- check_function_exists(_stricmp HAVE__STRICMP)
- check_function_exists(_strtoi64 HAVE__STRTOI64)
diff --git a/mingw-w64-libzip/PKGBUILD b/mingw-w64-libzip/PKGBUILD
index fb1aff0ad6..47e1f4e685 100644
--- a/mingw-w64-libzip/PKGBUILD
+++ b/mingw-w64-libzip/PKGBUILD
@@ -5,8 +5,8 @@
 _realname=libzip
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.7.3
-pkgrel=3
+pkgver=1.8.0
+pkgrel=1
 pkgdesc="A C library for reading, creating, and modifying zip archives (mingw-w64)"
 url="https://libzip.org"
 license=('BSD')
@@ -16,17 +16,17 @@ depends=("${MINGW_PACKAGE_PREFIX}-bzip2"
          "${MINGW_PACKAGE_PREFIX}-gnutls"
          "${MINGW_PACKAGE_PREFIX}-nettle"
          "${MINGW_PACKAGE_PREFIX}-xz"
-         "${MINGW_PACKAGE_PREFIX}-zlib")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc")
+         "${MINGW_PACKAGE_PREFIX}-zlib"
+         "${MINGW_PACKAGE_PREFIX}-zstd")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja")
 options=('staticlibs' '!libtool')
-source=("https://libzip.org/download/${_realname}-${pkgver}.tar.xz"
-        "0001-cmake-disable-_snprintf-check.patch")
-sha512sums=('488866348a0c859f6f995c50e956bd51b4105278f07b63fe019cb44ab36c09ef958cc0684fd5444c474d83874b999e8ed1aa9b2da51b74caa37bbe7934b9c870'
-            '96401fa51efb23f9ee608e8db1ae0cb47ac5851ab8a94c68023ddd7b4b0e4694d0ff4f76dd00a864c78dc3b21759eee4513bf021a93e39919ea0ff00130f1116')
+source=("https://libzip.org/download/${_realname}-${pkgver}.tar.xz")
+sha512sums=('fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
-  patch -Nbp1 -i "${srcdir}/0001-cmake-disable-_snprintf-check.patch"
+
 }
 
 build() {
@@ -37,7 +37,7 @@ build() {
   cd "${srcdir}/build-${CARCH}-shared"
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
-    -G"MSYS Makefiles" \
+    -G"Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     -DENABLE_COMMONCRYPTO=OFF \
     -DENABLE_GNUTLS=ON \
@@ -45,8 +45,8 @@ build() {
     -DENABLE_MBEDTLS=OFF \
     ../${_realname}-${pkgver}
 
-  make
-  
+  ${MINGW_PREFIX}/bin/cmake.exe --build ./
+
   # Static Build
   [[ -d ${srcdir}/build-${CARCH}-static ]] && rm -rf ${srcdir}/build-${CARCH}-static
   mkdir -p ${srcdir}/build-${CARCH}-static && cd ${srcdir}/build-${CARCH}-static
@@ -54,7 +54,7 @@ build() {
   cd "${srcdir}/build-${CARCH}-static"
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
-    -G"MSYS Makefiles" \
+    -G"Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     -DBUILD_SHARED_LIBS=OFF \
     -DENABLE_COMMONCRYPTO=OFF \
@@ -63,17 +63,17 @@ build() {
     -DENABLE_MBEDTLS=OFF \
     ../${_realname}-${pkgver}
 
-  make
+  ${MINGW_PREFIX}/bin/cmake.exe --build ./
 }
 
 package() {
-  # Shared Install
-  cd "${srcdir}/build-${CARCH}-shared"
-  make DESTDIR="${pkgdir}" install
-  
   # Static Install
   cd "${srcdir}/build-${CARCH}-static"
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
+
+  # Shared Install
+  cd "${srcdir}/build-${CARCH}-shared"
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
 
   install -Dm644 "${srcdir}"/${_realname}-${pkgver}/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }