Update to 1.9.2

2 files changed, 31 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c1a1bbfdcf0c..9fc5a5f5aefa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = mingw-w64-libzip
 	pkgdesc = A C library for reading, creating, and modifying zip archives (mingw-w64)
-	pkgver = 1.8.0
+	pkgver = 1.9.2
 	pkgrel = 1
 	url = http://www.nih.at/libzip/index.html
 	arch = any
 	license = BSD
 	makedepends = mingw-w64-cmake
+	makedepends = ninja
 	depends = mingw-w64-xz
 	depends = mingw-w64-zlib
 	depends = mingw-w64-bzip2
@@ -14,7 +15,7 @@ pkgbase = mingw-w64-libzip
 	options = staticlibs
 	options = !buildflags
 	options = !strip
-	source = http://www.nih.at/libzip/libzip-1.8.0.tar.xz
-	sha256sums = f0763bda24ba947e80430be787c4b068d8b6aa6027a26a19923f0acfa3dac97e
+	source = http://www.nih.at/libzip/libzip-1.9.2.tar.xz
+	sha256sums = c93e9852b7b2dc931197831438fee5295976ee0ba24f8524a8907be5c2ba5937
 
 pkgname = mingw-w64-libzip
diff --git a/PKGBUILD b/PKGBUILD
index cfe666652156..62bc9b36cb64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,46 +2,46 @@
 # Contributor: xantares
 
 pkgname=mingw-w64-libzip
-pkgver=1.8.0
+pkgver=1.9.2
 pkgrel=1
 pkgdesc="A C library for reading, creating, and modifying zip archives (mingw-w64)"
 url="http://www.nih.at/libzip/index.html"
 license=('BSD')
 arch=(any)
 depends=('mingw-w64-xz' 'mingw-w64-zlib' 'mingw-w64-bzip2' 'mingw-w64-openssl' 'mingw-w64-gnutls')
-makedepends=('mingw-w64-cmake')
+makedepends=('mingw-w64-cmake' 'ninja')
 options=('staticlibs' '!buildflags' '!strip')
 source=("http://www.nih.at/libzip/libzip-${pkgver}.tar.xz")
-sha256sums=('f0763bda24ba947e80430be787c4b068d8b6aa6027a26a19923f0acfa3dac97e')
+sha256sums=('c93e9852b7b2dc931197831438fee5295976ee0ba24f8524a8907be5c2ba5937')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
-
-prepare() {
-  cd "$srcdir/libzip-${pkgver}"
-}
+_pkgname="libzip"
 
 build() {
-  cd "$srcdir/libzip-${pkgver}"
-  for _arch in ${_architectures}; do
-    mkdir -p build-${_arch} && pushd build-${_arch}
-    ${_arch}-cmake -DBUILD_DOC=OFF -DBUILD_EXAMPLES=OFF -DBUILD_REGRESS=OFF -DBUILD_TOOLS=OFF ..
-    make
-    popd
-    mkdir -p build-${_arch}-static && pushd build-${_arch}-static
-    ${_arch}-cmake -DBUILD_DOC=OFF -DBUILD_EXAMPLES=OFF -DBUILD_REGRESS=OFF -DBUILD_TOOLS=OFF -DBUILD_SHARED_LIBS=OFF ..
-    make
-    popd
-  done
+    for _arch in ${_architectures}; do
+        ${_arch}-cmake -S ${_pkgname}-${pkgver} -B build/${_arch}-static -G Ninja \
+            -DBUILD_DOC=OFF \
+            -DBUILD_EXAMPLES=OFF \
+            -DBUILD_REGRESS=OFF \
+            -DBUILD_TOOLS=OFF \
+            -DBUILD_SHARED_LIBS=OFF
+
+        ${_arch}-cmake -S ${_pkgname}-${pkgver} -B build/${_arch} -G Ninja \
+            -DBUILD_DOC=OFF \
+            -DBUILD_EXAMPLES=OFF \
+            -DBUILD_REGRESS=OFF \
+            -DBUILD_TOOLS=OFF
+
+        cmake --build build/${_arch}-static
+        cmake --build build/${_arch}
+    done
 }
 
 package() {
-  for _arch in ${_architectures}; do
-    cd "$srcdir/libzip-${pkgver}/build-$_arch-static"
-    make DESTDIR="${pkgdir}" install
-    cd "$srcdir/libzip-${pkgver}/build-$_arch"
-    make DESTDIR="${pkgdir}" install
-    ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
-    ${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/*.a
-  done
+    for _arch in ${_architectures}; do
+        DESTDIR="${pkgdir}" cmake --install build/${_arch}-static
+        DESTDIR="${pkgdir}" cmake --install build/${_arch}
+        ${_arch}-strip --strip-unneeded "${pkgdir}"/usr/${_arch}/bin/*.dll
+        ${_arch}-strip -g "${pkgdir}"/usr/${_arch}/lib/*.a
+    done
 }
-