Attachment 221769 Details for Bug 252862 – Patch for zziplib

[patch] Patch for zziplib

0001-zziplib.patch (text/plain), 12.86 KB, created by Daniel Engberg on 2021-01-20 15:54:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2021-01-20 15:54:42 UTC

Size: 12.86 KB

patch

obsolete

>From 51b5197fed70492f1c3671ef8b687491de7c99c8 Mon Sep 17 00:00:00 2001
>From: Daniel Engberg <daniel.engberg.lists@pyret.net>
>Date: Wed, 20 Jan 2021 16:25:50 +0100
>Subject: [PATCH] zziplib
>
>zziplib
>
>Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
>---
> devel/zziplib/Makefile                        |  42 ++++---
> devel/zziplib/distinfo                        |   6 +-
> devel/zziplib/files/patch-Makefile.in         |  11 --
> devel/zziplib/files/patch-configure           |  26 -----
> devel/zziplib/files/patch-zzip_CMakeLists.txt |  22 ++++
> devel/zziplib/files/patch-zzip_Makefile.in    |  10 --
> .../files/patch-zzipwrap_CMakeLists.txt       |  11 ++
> devel/zziplib/pkg-plist                       | 103 ++++++++++++++++--
> 8 files changed, 155 insertions(+), 76 deletions(-)
> delete mode 100644 devel/zziplib/files/patch-Makefile.in
> delete mode 100644 devel/zziplib/files/patch-configure
> create mode 100644 devel/zziplib/files/patch-zzip_CMakeLists.txt
> delete mode 100644 devel/zziplib/files/patch-zzip_Makefile.in
> create mode 100644 devel/zziplib/files/patch-zzipwrap_CMakeLists.txt
>
>diff --git a/devel/zziplib/Makefile b/devel/zziplib/Makefile
>index 8df5dea67c2b..0607d63fa6a6 100644
>--- a/devel/zziplib/Makefile
>+++ b/devel/zziplib/Makefile
>@@ -3,8 +3,7 @@
> 
> PORTNAME=	zziplib
> DISTVERSIONPREFIX=	v
>-PORTVERSION=	0.13.71
>-PORTREVISION=	1
>+DISTVERSION=	0.13.72
> CATEGORIES=	devel
> 
> MAINTAINER=	sunpoet@FreeBSD.org
>@@ -15,28 +14,37 @@ LICENSE_COMB=	dual
> LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LIB
> LICENSE_FILE_MPL11=	${WRKSRC}/docs/COPYING.MPL
> 
>-BUILD_DEPENDS=	gsed:textproc/gsed \
>-		zip:archivers/zip
>-
>-USES=		libtool pathfix pkgconfig
>+BUILD_DEPENDS=	bash:shells/bash
> 
>+USES=		cmake pkgconfig
> USE_GITHUB=	yes
> GH_ACCOUNT=	gdraheim
>-
>-CONFIGURE_ARGS=	--srcdir=${WRKSRC}
>-CONFIGURE_ENV=	ac_cv_path_XMLTO=":"
>-GNU_CONFIGURE=	yes
>-INSTALL_TARGET=	install-strip
>-TEST_TARGET=	check
> USE_LDCONFIG=	yes
> 
>-PORTSCOUT=	limit:^0\.
>+TEST_TARGET=	check
> 
>-OPTIONS_DEFINE=	SDL
>+OPTIONS_DEFINE=	MANPAGES SDL TEST
> OPTIONS_SUB=	yes
> 
>-SDL_CONFIGURE_ENABLE=	sdl
>-SDL_USE=		SDL=sdl
>-SDL_USES=		sdl
>+MANPAGES_USES=		python:3.5+,build shebangfix
>+SHEBANG_FILES=		docs/cpp2markdown-1.py \
>+			docs/dbk2man.py \
>+			docs/dir2index.py \
>+			docs/make-doc.py \
>+			docs/makedocs.py \
>+			docs/zzipdoc/docbookdocument.py \
>+			docs/zzipdoc/functionlistreference.py \
>+			docs/zzipdoc/htm2dbk.py \
>+			docs/zzipdoc/match.py \
>+			docs/zzipdoc/options.py
>+MANPAGES_CMAKE_BOOL=	ZZIPDOCS
>+
>+SDL_USES=		localbase:ldflags sdl
>+SDL_USE=		sdl=sdl2
>+SDL_CMAKE_BOOL=		ZZIPSDL
>+
>+TEST_DEPENDS=		zip:archivers/zip
>+TEST_CMAKE_BOOL=	BUILD_TESTS ZZIPTEST
>+TEST_CMAKE_ON=		-DZZIP_TESTCVE:BOOL=OFF
> 
> .include <bsd.port.mk>
>diff --git a/devel/zziplib/distinfo b/devel/zziplib/distinfo
>index 7ec88d7d33ef..27c9c8e5799d 100644
>--- a/devel/zziplib/distinfo
>+++ b/devel/zziplib/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1587498931
>-SHA256 (gdraheim-zziplib-v0.13.71_GH0.tar.gz) = 2ee1e0fbbb78ec7cc46bde5b62857bc51f8d665dd265577cf93584344b8b9de2
>-SIZE (gdraheim-zziplib-v0.13.71_GH0.tar.gz) = 1150654
>+TIMESTAMP = 1611134148
>+SHA256 (gdraheim-zziplib-v0.13.72_GH0.tar.gz) = 93ef44bf1f1ea24fc66080426a469df82fa631d13ca3b2e4abaeab89538518dc
>+SIZE (gdraheim-zziplib-v0.13.72_GH0.tar.gz) = 1162175
>diff --git a/devel/zziplib/files/patch-Makefile.in b/devel/zziplib/files/patch-Makefile.in
>deleted file mode 100644
>index 91cd6df72734..000000000000
>--- a/devel/zziplib/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.in.orig	2020-04-15 23:36:46 UTC
>-+++ Makefile.in
>-@@ -392,7 +392,7 @@ ACLOCAL_AMFLAGS = -I m4
>- WANT_AUTOMAKE = 1.7
>- WANT_AUTOCONF = 2.57
>- DIST_SUBDIRS = zzip zzipwrap bins test docs  SDL
>--SUBDIRS = zzip zzipwrap bins test docs @SDL@
>-+SUBDIRS = zzip zzipwrap bins test @SDL@
>- DISTCLEANFILES = _configs.sed
>- OSC_ROOT = /my/own/osc
>- OSC_SRCDIR = $(OSC_ROOT)
>diff --git a/devel/zziplib/files/patch-configure b/devel/zziplib/files/patch-configure
>deleted file mode 100644
>index ae8fb06119e1..000000000000
>--- a/devel/zziplib/files/patch-configure
>+++ /dev/null
>@@ -1,26 +0,0 @@
>---- configure.orig	2018-03-15 22:54:37 UTC
>-+++ configure
>-@@ -13077,7 +13077,7 @@ $as_echo_n "checking out linker version 
>-   if test "_$MICRO_VERSION" = "_" ; then MICRO_VERSION="0" ; fi
>-   if test "_$MINOR_VERSION" = "_" ; then MINOR_VERSION="$MAJOR_VERSION" ; MAJOR_VERSION="0" ; fi
>-   MINOR_VERSION=`echo "$MINOR_VERSION" | sed -e 's/[^0-9].*//'`
>--  RELEASE_INFO="-release $MAJOR_VERSION"
>-+  RELEASE_INFO=""
>-   VERSION_INFO="-version-info $MINOR_VERSION:$MICRO_VERSION"
>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: /$MAJOR_VERSION/$MINOR_VERSION:$MICRO_VERSION (-$MAJOR_VERSION.so.$MINOR_VERSION.0.$MICRO_VERSION)" >&5
>- $as_echo "/$MAJOR_VERSION/$MINOR_VERSION:$MICRO_VERSION (-$MAJOR_VERSION.so.$MINOR_VERSION.0.$MICRO_VERSION)" >&6; }
>-@@ -15430,12 +15430,12 @@ case "$host_os" in mingw*)
>- ;; *)
>-     if test ".$can_build_shared" != ".no" ; then
>-       ZZIPLIB_LDFLAGS="-export-dynamic"
>--      if test ".$lt_cv_prog_gnu_ld" == ".yes" ; then
>-+      if test ".$lt_cv_prog_gnu_ld" = ".yes" ; then
>-          ZZIPLIB_LDFLAGS="${wl}--export-dynamic"
>-          # TODO: that is for backward compatibility only
>-       fi
>-     fi
>--    RESOLVES=" # "
>-+    RESOLVES=' '
>- ;; esac
>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZZIPLIB_LDFLAGS $RESOLVES" >&5
>- $as_echo "$ZZIPLIB_LDFLAGS $RESOLVES" >&6; }
>diff --git a/devel/zziplib/files/patch-zzip_CMakeLists.txt b/devel/zziplib/files/patch-zzip_CMakeLists.txt
>new file mode 100644
>index 000000000000..03ddd87264ea
>--- /dev/null
>+++ b/devel/zziplib/files/patch-zzip_CMakeLists.txt
>@@ -0,0 +1,22 @@
>+--- zzip/CMakeLists.txt.orig	2021-01-20 09:50:54 UTC
>++++ zzip/CMakeLists.txt
>+@@ -189,16 +189,16 @@ target_link_libraries(libzzipmmapped ZLIB::ZLIB )
>+ target_include_directories (libzzipmmapped PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
>+ endif()
>+ 
>+-set_target_properties(libzzip PROPERTIES OUTPUT_NAME "zzip" RELEASE_POSTFIX "-${RELNUM}")
>++set_target_properties(libzzip PROPERTIES OUTPUT_NAME "zzip")
>+ SET_TARGET_PROPERTIES(libzzip PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
>+ 
>+ if(ZZIPFSEEKO)
>+-set_target_properties(libzzipfseeko PROPERTIES OUTPUT_NAME "zzipfseeko" RELEASE_POSTFIX "-${RELNUM}")
>++set_target_properties(libzzipfseeko PROPERTIES OUTPUT_NAME "zzipfseeko")
>+ SET_TARGET_PROPERTIES(libzzipfseeko PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
>+ endif()
>+ 
>+ if(ZZIPMMAPPED)
>+-set_target_properties(libzzipmmapped PROPERTIES OUTPUT_NAME "zzipmmapped" RELEASE_POSTFIX "-${RELNUM}")
>++set_target_properties(libzzipmmapped PROPERTIES OUTPUT_NAME "zzipmmapped")
>+ SET_TARGET_PROPERTIES(libzzipmmapped PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
>+ endif()
>+ 
>diff --git a/devel/zziplib/files/patch-zzip_Makefile.in b/devel/zziplib/files/patch-zzip_Makefile.in
>deleted file mode 100644
>index 206be73caf60..000000000000
>--- a/devel/zziplib/files/patch-zzip_Makefile.in
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- zzip/Makefile.in.orig	2018-03-16 11:43:07 UTC
>-+++ zzip/Makefile.in
>-@@ -826,7 +826,6 @@ install-dvi-am:
>- 
>- install-exec-am: install-libLTLIBRARIES
>- 	@$(NORMAL_INSTALL)
>--	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
>- install-html: install-html-am
>- 
>- install-html-am:
>diff --git a/devel/zziplib/files/patch-zzipwrap_CMakeLists.txt b/devel/zziplib/files/patch-zzipwrap_CMakeLists.txt
>new file mode 100644
>index 000000000000..578ddb13e3df
>--- /dev/null
>+++ b/devel/zziplib/files/patch-zzipwrap_CMakeLists.txt
>@@ -0,0 +1,11 @@
>+--- zzipwrap/CMakeLists.txt.orig	2021-01-20 10:00:08 UTC
>++++ zzipwrap/CMakeLists.txt
>+@@ -48,7 +48,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}")
>+ 
>+-set_target_properties(libzzipwrap PROPERTIES OUTPUT_NAME "zzipwrap" RELEASE_POSTFIX "-${RELNUM}")
>++set_target_properties(libzzipwrap PROPERTIES OUTPUT_NAME "zzipwrap")
>+ SET_TARGET_PROPERTIES(libzzipwrap PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
>+ set_target_properties(libzzipwrap PROPERTIES DEFINE_SYMBOL "libzzip_EXPORTS")
>+ 
>diff --git a/devel/zziplib/pkg-plist b/devel/zziplib/pkg-plist
>index f739bf92d6a1..868725c1f506 100644
>--- a/devel/zziplib/pkg-plist
>+++ b/devel/zziplib/pkg-plist
>@@ -32,26 +32,111 @@ include/zzip/write.h
> include/zzip/zzip.h
> include/zzip/zzip32.h
> include/zziplib.h
>-lib/libzzip.a
> lib/libzzip.so
> lib/libzzip.so.13
>-lib/libzzip.so.13.0.71
>-lib/libzzipfseeko.a
>+lib/libzzip.so.13.0.72
> lib/libzzipfseeko.so
> lib/libzzipfseeko.so.13
>-lib/libzzipfseeko.so.13.0.71
>-lib/libzzipmmapped.a
>+lib/libzzipfseeko.so.13.0.72
> lib/libzzipmmapped.so
> lib/libzzipmmapped.so.13
>-lib/libzzipmmapped.so.13.0.71
>-lib/libzzipwrap.a
>+lib/libzzipmmapped.so.13.0.72
> lib/libzzipwrap.so
> lib/libzzipwrap.so.13
>-lib/libzzipwrap.so.13.0.71
>+lib/libzzipwrap.so.13.0.72
> %%SDL%%libdata/pkgconfig/SDL_rwops_zzip.pc
>-libdata/pkgconfig/zzip-zlib-config.pc
> libdata/pkgconfig/zzipfseeko.pc
> libdata/pkgconfig/zziplib.pc
> libdata/pkgconfig/zzipmmapped.pc
> libdata/pkgconfig/zzipwrap.pc
>+%%MANPAGES%%man/man3/__zzip_fetch_disk_trailer.3.gz
>+%%MANPAGES%%man/man3/__zzip_parse_root_directory.3.gz
>+%%MANPAGES%%man/man3/__zzip_try_open.3.gz
>+%%MANPAGES%%man/man3/zzip_close.3.gz
>+%%MANPAGES%%man/man3/zzip_closedir.3.gz
>+%%MANPAGES%%man/man3/zzip_compr_str.3.gz
>+%%MANPAGES%%man/man3/zzip_dir_alloc.3.gz
>+%%MANPAGES%%man/man3/zzip_dir_alloc_ext_io.3.gz
>+%%MANPAGES%%man/man3/zzip_dir_close.3.gz
>+%%MANPAGES%%man/man3/zzip_dir_fdopen.3.gz
>+%%MANPAGES%%man/man3/zzip_dir_fdopen_ext_io.3.gz
>+%%MANPAGES%%man/man3/zzip_dir_free.3.gz
>+%%MANPAGES%%man/man3/zzip_dir_open.3.gz
>+%%MANPAGES%%man/man3/zzip_dir_open_ext_io.3.gz
>+%%MANPAGES%%man/man3/zzip_dir_read.3.gz
>+%%MANPAGES%%man/man3/zzip_dir_real.3.gz
>+%%MANPAGES%%man/man3/zzip_dir_stat.3.gz
>+%%MANPAGES%%man/man3/zzip_dirfd.3.gz
>+%%MANPAGES%%man/man3/zzip_dirhandle.3.gz
>+%%MANPAGES%%man/man3/zzip_disk_buffer.3.gz
>+%%MANPAGES%%man/man3/zzip_disk_close.3.gz
>+%%MANPAGES%%man/man3/zzip_disk_entry_fopen.3.gz
>+%%MANPAGES%%man/man3/zzip_disk_entry_strdup_comment.3.gz
>+%%MANPAGES%%man/man3/zzip_disk_entry_strdup_name.3.gz
>+%%MANPAGES%%man/man3/zzip_disk_entry_to_data.3.gz
>+%%MANPAGES%%man/man3/zzip_disk_entry_to_file_header.3.gz
>+%%MANPAGES%%man/man3/zzip_disk_fclose.3.gz
>+%%MANPAGES%%man/man3/zzip_disk_feof.3.gz
>+%%MANPAGES%%man/man3/zzip_disk_findfile.3.gz
>+%%MANPAGES%%man/man3/zzip_disk_findfirst.3.gz
>+%%MANPAGES%%man/man3/zzip_disk_findmatch.3.gz
>+%%MANPAGES%%man/man3/zzip_disk_findnext.3.gz
>+%%MANPAGES%%man/man3/zzip_disk_fopen.3.gz
>+%%MANPAGES%%man/man3/zzip_disk_fread.3.gz
>+%%MANPAGES%%man/man3/zzip_disk_init.3.gz
>+%%MANPAGES%%man/man3/zzip_disk_mmap.3.gz
>+%%MANPAGES%%man/man3/zzip_disk_munmap.3.gz
>+%%MANPAGES%%man/man3/zzip_disk_new.3.gz
>+%%MANPAGES%%man/man3/zzip_disk_open.3.gz
>+%%MANPAGES%%man/man3/zzip_entry_data_offset.3.gz
>+%%MANPAGES%%man/man3/zzip_entry_fclose.3.gz
>+%%MANPAGES%%man/man3/zzip_entry_feof.3.gz
>+%%MANPAGES%%man/man3/zzip_entry_ffile.3.gz
>+%%MANPAGES%%man/man3/zzip_entry_findfile.3.gz
>+%%MANPAGES%%man/man3/zzip_entry_findfirst.3.gz
>+%%MANPAGES%%man/man3/zzip_entry_findmatch.3.gz
>+%%MANPAGES%%man/man3/zzip_entry_findnext.3.gz
>+%%MANPAGES%%man/man3/zzip_entry_fopen.3.gz
>+%%MANPAGES%%man/man3/zzip_entry_fread.3.gz
>+%%MANPAGES%%man/man3/zzip_entry_fread_file_header.3.gz
>+%%MANPAGES%%man/man3/zzip_entry_free.3.gz
>+%%MANPAGES%%man/man3/zzip_entry_strdup_name.3.gz
>+%%MANPAGES%%man/man3/zzip_errno.3.gz
>+%%MANPAGES%%man/man3/zzip_error.3.gz
>+%%MANPAGES%%man/man3/zzip_fclose.3.gz
>+%%MANPAGES%%man/man3/zzip_file_close.3.gz
>+%%MANPAGES%%man/man3/zzip_file_open.3.gz
>+%%MANPAGES%%man/man3/zzip_file_read.3.gz
>+%%MANPAGES%%man/man3/zzip_file_real.3.gz
>+%%MANPAGES%%man/man3/zzip_file_stat.3.gz
>+%%MANPAGES%%man/man3/zzip_filesize.3.gz
>+%%MANPAGES%%man/man3/zzip_fopen.3.gz
>+%%MANPAGES%%man/man3/zzip_fread.3.gz
>+%%MANPAGES%%man/man3/zzip_freopen.3.gz
>+%%MANPAGES%%man/man3/zzip_fstat.3.gz
>+%%MANPAGES%%man/man3/zzip_get_default_io.3.gz
>+%%MANPAGES%%man/man3/zzip_inflate_init.3.gz
>+%%MANPAGES%%man/man3/zzip_init_io.3.gz
>+%%MANPAGES%%man/man3/zzip_open.3.gz
>+%%MANPAGES%%man/man3/zzip_open_ext_io.3.gz
>+%%MANPAGES%%man/man3/zzip_open_shared_io.3.gz
>+%%MANPAGES%%man/man3/zzip_opendir.3.gz
>+%%MANPAGES%%man/man3/zzip_opendir_ext_io.3.gz
>+%%MANPAGES%%man/man3/zzip_read.3.gz
>+%%MANPAGES%%man/man3/zzip_readdir.3.gz
>+%%MANPAGES%%man/man3/zzip_realdir.3.gz
>+%%MANPAGES%%man/man3/zzip_realfd.3.gz
>+%%MANPAGES%%man/man3/zzip_rewind.3.gz
>+%%MANPAGES%%man/man3/zzip_rewinddir.3.gz
>+%%MANPAGES%%man/man3/zzip_seek.3.gz
>+%%MANPAGES%%man/man3/zzip_seek32.3.gz
>+%%MANPAGES%%man/man3/zzip_seekdir.3.gz
>+%%MANPAGES%%man/man3/zzip_seekdir32.3.gz
>+%%MANPAGES%%man/man3/zzip_seterror.3.gz
>+%%MANPAGES%%man/man3/zzip_strerror.3.gz
>+%%MANPAGES%%man/man3/zzip_strerror_of.3.gz
>+%%MANPAGES%%man/man3/zzip_tell.3.gz
>+%%MANPAGES%%man/man3/zzip_tell32.3.gz
>+%%MANPAGES%%man/man3/zzip_telldir.3.gz
>+%%MANPAGES%%man/man3/zzip_telldir32.3.gz
> share/aclocal/zziplib.m4
>-- 
>2.29.2
>

Actions: View | Diff

Attachments on bug 252862: 221769 | 223372 | 223458