From e61eb5e4de4bd83f6178cd10de6964ff5669c5bb Mon Sep 17 00:00:00 2001 From: matthieu Date: Sat, 16 May 2026 08:02:48 +0000 Subject: [PATCH] Update zziplib to 0.13.80, fixes build with llvm 22. Tweaks and ok rsadowski@ --- archivers/zziplib/Makefile | 9 ++-- archivers/zziplib/distinfo | 4 +- .../zziplib/patches/patch-zzip_CMakeLists_txt | 47 ++++++++++++++++++- .../zziplib/patches/patch-zzip_mmapped_c | 24 ---------- .../patches/patch-zzipwrap_CMakeLists_txt | 2 +- archivers/zziplib/pkg/PLIST | 36 +++++--------- 6 files changed, 64 insertions(+), 58 deletions(-) delete mode 100644 archivers/zziplib/patches/patch-zzip_mmapped_c diff --git a/archivers/zziplib/Makefile b/archivers/zziplib/Makefile index f3160e2a0e4..0f48b00ee90 100644 --- a/archivers/zziplib/Makefile +++ b/archivers/zziplib/Makefile @@ -4,10 +4,9 @@ CATEGORIES= archivers GH_ACCOUNT = gdraheim GH_PROJECT = zziplib -GH_TAGNAME = v0.13.72 -REVISION = 1 +GH_TAGNAME = v0.13.80 -SHARED_LIBS += zzip 16.0 # 0.0 +SHARED_LIBS += zzip 16.1 # 0.0 SHARED_LIBS += zzipfseeko 14.0 # 0.0 SHARED_LIBS += zzipmmapped 14.0 # 0.0 SHARED_LIBS += zzipwrap 14.0 # 0.0 @@ -30,7 +29,9 @@ MODULES = devel/cmake \ MODPY_RUNDEP = No MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib -MODCMAKE_POLICY_VERSION_OVERRIDE = Yes + +CONFIGURE_ARGS += -DZZIP_LIBTOOL=OFF \ + -DZZIP_COMPAT=OFF TEST_TARGET = tests diff --git a/archivers/zziplib/distinfo b/archivers/zziplib/distinfo index a3f03d5b2f3..6315076eea2 100644 --- a/archivers/zziplib/distinfo +++ b/archivers/zziplib/distinfo @@ -1,2 +1,2 @@ -SHA256 (zziplib-0.13.72.tar.gz) = k+9Evx8eok/GYIBCakad+C+mMdE8o7Lkq66riVOFGNw= -SIZE (zziplib-0.13.72.tar.gz) = 1162175 +SHA256 (zziplib-0.13.80.tar.gz) = IfQNERwPejmM/uOwowsgxdkhJLCOpCkAVfv+e91Toiw= +SIZE (zziplib-0.13.80.tar.gz) = 1192948 diff --git a/archivers/zziplib/patches/patch-zzip_CMakeLists_txt b/archivers/zziplib/patches/patch-zzip_CMakeLists_txt index 556c34604fa..eaffb2ec63d 100644 --- a/archivers/zziplib/patches/patch-zzip_CMakeLists_txt +++ b/archivers/zziplib/patches/patch-zzip_CMakeLists_txt @@ -1,8 +1,8 @@ Index: zzip/CMakeLists.txt --- zzip/CMakeLists.txt.orig +++ zzip/CMakeLists.txt -@@ -189,16 +189,16 @@ target_link_libraries(libzzipmmapped ZLIB::ZLIB ) - target_include_directories (libzzipmmapped PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}) +@@ -242,16 +242,16 @@ add_custom_command(OUTPUT libzzipmmapped.so.gcov + add_custom_target(libzzipmmapped.gcov DEPENDS libzzipmmapped.so.gcov) endif() -set_target_properties(libzzip PROPERTIES OUTPUT_NAME "zzip" RELEASE_POSTFIX "-${RELNUM}") @@ -21,3 +21,46 @@ Index: zzip/CMakeLists.txt SET_TARGET_PROPERTIES(libzzipmmapped PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM}) endif() +@@ -415,42 +415,15 @@ if(ZZIP_LIBLATEST) + get_target_property(libname libzzip OUTPUT_NAME) + get_target_property(librelease libzzip RELEASE_POSTFIX) + set(libzzip_target "${lib}${libname}${dll}") +- add_custom_command(OUTPUT ${libzzip_target} +- COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${libzzip_target} +- ) +- add_custom_target(libzzip_latest ALL +- DEPENDS ${libzzip_target} +- ) +- install(FILES +- ${outdir}/${lib}${libname}${dll} +- DESTINATION ${CMAKE_INSTALL_LIBDIR}) + if(ZZIPFSEEKO) + get_target_property(libname libzzipfseeko OUTPUT_NAME) + get_target_property(librelease libzzipfseeko RELEASE_POSTFIX) + set(libzzipfseeko_target "${lib}${libname}${dll}") +- add_custom_command(OUTPUT ${libzzipfseeko_target} +- COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${libzzipfseeko_target} +- ) +- add_custom_target(libzzipfseeko_latest ALL +- DEPENDS ${libzzipfseeko_target} +- ) +- install(FILES +- ${outdir}/${lib}${libname}${dll} +- DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif(ZZIPFSEEKO) + if(ZZIPMMAPPED) + get_target_property(libname libzzipmmapped OUTPUT_NAME) + get_target_property(librelease libzzipmmapped RELEASE_POSTFIX) + set(libzzipmmapped_target "${lib}${libname}${dll}") +- add_custom_command(OUTPUT ${libzzipmmapped_target} +- COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${libzzipmmapped_target} +- ) +- add_custom_target(libzzipmmaped_latest ALL +- DEPENDS ${libzzipmmapped_target} +- ) +- install(FILES +- ${outdir}/${lib}${libname}${dll} +- DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif(ZZIPMMAPPED) + endif(ZZIP_LIBLATEST) + diff --git a/archivers/zziplib/patches/patch-zzip_mmapped_c b/archivers/zziplib/patches/patch-zzip_mmapped_c deleted file mode 100644 index 9d68ffee25d..00000000000 --- a/archivers/zziplib/patches/patch-zzip_mmapped_c +++ /dev/null @@ -1,24 +0,0 @@ -error: incompatible pointer to integer conversion -https://github.com/gdraheim/zziplib/pull/141/commits/38e4d5f561318fa825e6544c2ef55ac5899c81b0 - -Index: zzip/mmapped.c ---- zzip/mmapped.c.orig -+++ zzip/mmapped.c -@@ -661,7 +661,7 @@ zzip_disk_entry_fopen(ZZIP_DISK * disk, ZZIP_DISK_ENTR - - ___ /* a ZIP64 extended block may follow. */ - size_t csize = zzip_file_header_csize(header); -- off_t offset = zzip_file_header_to_data(header); -+ size_t offset = zzip_file_header_sizeto_end(header); - if (csize == 0xFFFFu) { - struct zzip_extra_zip64* zip64 = - zzip_file_header_to_extras(header); -@@ -682,7 +682,7 @@ zzip_disk_entry_fopen(ZZIP_DISK * disk, ZZIP_DISK_ENTR - file->zlib.zalloc = Z_NULL; - file->zlib.zfree = Z_NULL; - file->zlib.avail_in = csize; -- file->zlib.next_in = offset; -+ file->zlib.next_in = (Bytef *)header + offset; - ____; - - DBG2("compressed size %i", (int) file->zlib.avail_in); diff --git a/archivers/zziplib/patches/patch-zzipwrap_CMakeLists_txt b/archivers/zziplib/patches/patch-zzipwrap_CMakeLists_txt index b7941a5eba7..f01c3c007f3 100644 --- a/archivers/zziplib/patches/patch-zzipwrap_CMakeLists_txt +++ b/archivers/zziplib/patches/patch-zzipwrap_CMakeLists_txt @@ -1,7 +1,7 @@ Index: zzipwrap/CMakeLists.txt --- zzipwrap/CMakeLists.txt.orig +++ zzipwrap/CMakeLists.txt -@@ -48,7 +48,7 @@ add_library(libzzipwrap ${libzzipwrap_SRCS} ) +@@ -53,7 +53,7 @@ add_library(libzzipwrap ${libzzipwrap_SRCS} ) target_link_libraries(libzzipwrap libzzip ZLIB::ZLIB ) target_include_directories(libzzipwrap PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}") diff --git a/archivers/zziplib/pkg/PLIST b/archivers/zziplib/pkg/PLIST index 5b5ebdcbb2d..f6bd0c8283b 100644 --- a/archivers/zziplib/pkg/PLIST +++ b/archivers/zziplib/pkg/PLIST @@ -12,12 +12,11 @@ include/SDL_rwops_zzip/ include/SDL_rwops_zzip/SDL_rwops_zzip.c include/SDL_rwops_zzip/SDL_rwops_zzip.h include/zzip/ -include/zzip-io.h -include/zzip.h include/zzip/_config.h include/zzip/_msvc.h -include/zzip/autoconf.h +include/zzip/cdecl.h include/zzip/conf.h +include/zzip/cstdint.h include/zzip/fetch.h include/zzip/file.h include/zzip/format.h @@ -33,12 +32,16 @@ include/zzip/wrap.h include/zzip/write.h include/zzip/zzip.h include/zzip/zzip32.h -include/zziplib.h +lib/cmake/ +lib/cmake/zziplib/ +lib/cmake/zziplib/zziplib-config.cmake +lib/cmake/zziplib/zziplibTargets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/zziplib/zziplibTargets.cmake @lib lib/libzzip.so.${LIBzzip_VERSION} @lib lib/libzzipfseeko.so.${LIBzzipfseeko_VERSION} @lib lib/libzzipmmapped.so.${LIBzzipmmapped_VERSION} +@so lib/libzzipwrap.so @lib lib/libzzipwrap.so.${LIBzzipwrap_VERSION} -lib/pkgconfig/SDL_rwops_zzip.pc lib/pkgconfig/zzipfseeko.pc lib/pkgconfig/zziplib.pc lib/pkgconfig/zzipmmapped.pc @@ -62,26 +65,6 @@ lib/pkgconfig/zzipwrap.pc @man man/man3/zzip_dir_stat.3 @man man/man3/zzip_dirfd.3 @man man/man3/zzip_dirhandle.3 -@man man/man3/zzip_disk_buffer.3 -@man man/man3/zzip_disk_close.3 -@man man/man3/zzip_disk_entry_fopen.3 -@man man/man3/zzip_disk_entry_strdup_comment.3 -@man man/man3/zzip_disk_entry_strdup_name.3 -@man man/man3/zzip_disk_entry_to_data.3 -@man man/man3/zzip_disk_entry_to_file_header.3 -@man man/man3/zzip_disk_fclose.3 -@man man/man3/zzip_disk_feof.3 -@man man/man3/zzip_disk_findfile.3 -@man man/man3/zzip_disk_findfirst.3 -@man man/man3/zzip_disk_findmatch.3 -@man man/man3/zzip_disk_findnext.3 -@man man/man3/zzip_disk_fopen.3 -@man man/man3/zzip_disk_fread.3 -@man man/man3/zzip_disk_init.3 -@man man/man3/zzip_disk_mmap.3 -@man man/man3/zzip_disk_munmap.3 -@man man/man3/zzip_disk_new.3 -@man man/man3/zzip_disk_open.3 @man man/man3/zzip_entry_data_offset.3 @man man/man3/zzip_entry_fclose.3 @man man/man3/zzip_entry_feof.3 @@ -104,6 +87,7 @@ lib/pkgconfig/zzipwrap.pc @man man/man3/zzip_file_real.3 @man man/man3/zzip_file_stat.3 @man man/man3/zzip_filesize.3 +@man man/man3/zzip_filesize32.3 @man man/man3/zzip_fopen.3 @man man/man3/zzip_fread.3 @man man/man3/zzip_freopen.3 @@ -111,6 +95,7 @@ lib/pkgconfig/zzipwrap.pc @man man/man3/zzip_get_default_io.3 @man man/man3/zzip_inflate_init.3 @man man/man3/zzip_init_io.3 +@man man/man3/zzip_io_size_off_t.3 @man man/man3/zzip_open.3 @man man/man3/zzip_open_ext_io.3 @man man/man3/zzip_open_shared_io.3 @@ -135,3 +120,4 @@ lib/pkgconfig/zzipwrap.pc @man man/man3/zzip_telldir32.3 share/aclocal/ share/aclocal/zziplib.m4 +share/pkgconfig/SDL_rwops_zzip.pc