diff --git a/mingw-w64-libzip/001-mingw-snprintf.patch b/mingw-w64-libzip/001-mingw-snprintf.patch new file mode 100644 index 0000000000..b19bbf9cd1 --- /dev/null +++ b/mingw-w64-libzip/001-mingw-snprintf.patch @@ -0,0 +1,13 @@ +--- libzip-1.3.0/lib/compat.h.orig 2017-09-05 10:27:28.415967700 +0300 ++++ libzip-1.3.0/lib/compat.h 2017-09-05 10:27:39.671611500 +0300 +@@ -93,8 +93,10 @@ + #define open(a, b, c) _open((a), (b)) + #endif + #if defined(HAVE__SNPRINTF) ++#ifndef __USE_MINGW_ANSI_STDIO + #define snprintf _snprintf + #endif ++#endif + #if defined(HAVE__STRDUP) + #if !defined(HAVE_STRDUP) || defined(_WIN32) + #undef strdup diff --git a/mingw-w64-libzip/PKGBUILD b/mingw-w64-libzip/PKGBUILD index e56939644f..4f1b68d5b7 100644 --- a/mingw-w64-libzip/PKGBUILD +++ b/mingw-w64-libzip/PKGBUILD @@ -4,8 +4,8 @@ _realname=libzip pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.2.0 -pkgrel=2 +pkgver=1.3.0 +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') @@ -13,11 +13,14 @@ arch=('any') depends=("${MINGW_PACKAGE_PREFIX}-zlib") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") options=('staticlibs' '!libtool') -source=("http://www.nih.at/${_realname}/${_realname}-${pkgver}.tar.xz") -sha256sums=('ffc0764395fba3d45dc5a6e32282788854618b9e9838337f8218b596007f1376') +source=("http://www.nih.at/${_realname}/${_realname}-${pkgver}.tar.xz" + 001-mingw-snprintf.patch) +sha256sums=('aa936efe34911be7acac2ab07fb5c8efa53ed9bb4d44ad1fe8bff19630e0d373' + 'e35505cfd68e4c112f61b95fbc3460f2c3d03a6b14a23a72228b68356d70f86d') prepare() { cd "${srcdir}/${_realname}-${pkgver}" + patch -p1 -i ${srcdir}/001-mingw-snprintf.patch autoreconf -fi } @@ -38,7 +41,6 @@ build() { package() { cd "${srcdir}/build-${CARCH}" - make DESTDIR="${pkgdir}" install cp "${pkgdir}${MINGW_PREFIX}/lib/libzip/include/zipconf.h" "${pkgdir}${MINGW_PREFIX}/include/zipconf.h"