zziplib: update to 0.13.72

Autotools was replaced with CMake. Adjust accordingly.

Remove now obsolete patch.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2021-05-02 17:40:40 -07:00
committed by Biswapriyo Nath
parent ac27ce785d
commit 0d5e3b6096
3 changed files with 52 additions and 40 deletions

View File

@@ -0,0 +1,23 @@
--- a/zzip/write.h
+++ b/zzip/write.h
@@ -10,16 +10,16 @@
#define ZZIP_NO_CREAT 1
-ZZIP_DIR* zzip_dir_creat_ext_io(zzip_char_t* name, int o_mode,
+_zzip_export ZZIP_DIR* zzip_dir_creat_ext_io(zzip_char_t* name, int o_mode,
zzip_strings_t* ext, zzip_plugin_io_t io);
-ZZIP_DIR* zzip_dir_creat(zzip_char_t* name, int o_mode);
+_zzip_export ZZIP_DIR* zzip_dir_creat(zzip_char_t* name, int o_mode);
int zzip_file_mkdir(ZZIP_DIR* dir, zzip_char_t* name, int o_mode);
-ZZIP_FILE* zzip_file_creat(ZZIP_DIR* dir, zzip_char_t* name, int o_mode);
+_zzip_export ZZIP_FILE* zzip_file_creat(ZZIP_DIR* dir, zzip_char_t* name, int o_mode);
zzip_ssize_t zzip_file_write(ZZIP_FILE* file,
const void* ptr, zzip_size_t len);
ZZIP_DIR* zzip_createdir(zzip_char_t* name, int o_mode);
-zzip_ssize_t zzip_write(ZZIP_FILE* file, const void* ptr, zzip_size_t len);
+_zzip_export zzip_ssize_t zzip_write(ZZIP_FILE* file, const void* ptr, zzip_size_t len);
zzip_size_t zzip_fwrite(const void* ptr, zzip_size_t len,
zzip_size_t multiply, ZZIP_FILE* file);
#ifndef zzip_savefile

View File

@@ -3,7 +3,7 @@
_realname=zziplib
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=0.13.71
pkgver=0.13.72
pkgrel=1
pkgdesc="A lightweight library that offers the ability to easily extract data from files archived in a single zip file (mingw-w64)"
arch=('any')
@@ -13,20 +13,24 @@ license=("LGPL, MPL")
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
"${MINGW_PACKAGE_PREFIX}-pkg-config"
"${MINGW_PACKAGE_PREFIX}-SDL"
"${MINGW_PACKAGE_PREFIX}-python")
"${MINGW_PACKAGE_PREFIX}-python"
"${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-ninja")
depends=("${MINGW_PACKAGE_PREFIX}-zlib")
optdepends=("${MINGW_PACKAGE_PREFIX}-SDL: SDL_rwops for ZZipLib")
options=('staticlibs' 'strip')
source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/gdraheim/zziplib/archive/v${pkgver}.tar.gz"
"configure.patch")
sha256sums=('2ee1e0fbbb78ec7cc46bde5b62857bc51f8d665dd265577cf93584344b8b9de2'
'892162a8535575891663607b8fb5e3be518e8293e9b0f22cf437b1d83a58b008')
"010-extern.patch"
020-cmake.patch::https://github.com/gdraheim/zziplib/commit/eaab833a6017e1faeba6a017c050ac000d54b290.patch)
sha256sums=('93ef44bf1f1ea24fc66080426a469df82fa631d13ca3b2e4abaeab89538518dc'
'ea4a2a6c49e9a71d89ea88e33bf855604d6ea3055f0f9cecde2898a02044811f'
'5e05fd37ac12ef3be88a38a066d70a507a638f16f1703d8ab3b2e9af764c3b55')
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"
patch -Np1 -i ${srcdir}/configure.patch
autoreconf -fiv
patch -p1 -i ${srcdir}/010-extern.patch
patch -p1 -i ${srcdir}/020-cmake.patch
}
build() {
@@ -34,17 +38,27 @@ build() {
export PERL=/usr/bin/perl
mkdir -p "${srcdir}/build-${MINGW_CHOST}"
cd "${srcdir}/build-${MINGW_CHOST}"
../${_realname}-${pkgver}/configure \
--prefix=${MINGW_PREFIX} \
--build=${MINGW_CHOST} \
--host=${MINGW_CHOST} \
--with-zlib=${MINGW_PREFIX} \
--enable-sdl
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
${MINGW_PREFIX}/bin/cmake \
-G'Ninja' \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_STATIC_LIBS=OFF \
-DBUILD_TESTS=OFF \
-DMSVC_STATIC_RUNTIME=OFF \
-DZZIPMMAPPED=ON \
-DZZIPFSEEKO=ON \
-DZZIPWRAP=ON \
-DZZIPSDL=ON \
-DZZIPBINS=ON \
-DZZIPTEST=OFF \
-DZZIPDOCS=ON \
../${_realname}-${pkgver}
make
ninja
}
package() {
cd "${srcdir}/build-${MINGW_CHOST}"
make DESTDIR="${pkgdir}" install
DESTDIR="${pkgdir}" ninja install
}

View File

@@ -1,25 +0,0 @@
diff -Naur zziplib-0.13.69.orig/configure.ac zziplib-0.13.69/configure.ac
--- zziplib-0.13.69.orig/configure.ac 2018-05-01 19:44:36.387886000 -0400
+++ zziplib-0.13.69/configure.ac 2018-05-01 19:46:24.715029400 -0400
@@ -317,7 +317,7 @@
ZZIPLIB_LDFLAGS=""
case "$host_os" in mingw*)
# we may assume that the backend is gnu-ld but DLLs need full resolution
- ZZIPLIB_LDFLAGS="${wl}-no-undefined ${wl}-export-all-symbols -mconsole"
+ ZZIPLIB_LDFLAGS="-no-undefined ${wl}-no-undefined ${wl}-export-all-symbols -mconsole"
RESOLVES=' '
;; darwin*)
# darwin never uses gnu-ld but the linker can do it anyway
diff -Naur zziplib-0.13.69.orig/m4/libtool.m4 zziplib-0.13.69/m4/libtool.m4
--- zziplib-0.13.69.orig/m4/libtool.m4 2018-05-01 19:44:36.325386000 -0400
+++ zziplib-0.13.69/m4/libtool.m4 2018-05-01 19:45:41.528967100 -0400
@@ -3467,7 +3467,8 @@
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
- if ( file / ) >/dev/null 2>&1; then
+ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else