* [gentoo-commits] repo/gentoo:master commit in: dev-libs/zziplib/files/, dev-libs/zziplib/
@ 2017-02-18 11:31 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2017-02-18 11:31 UTC (permalink / raw
To: gentoo-commits
commit: 6ab2a1d273e1095e8ad48fe7199c96bd965b4877
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 10:37:24 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 11:30:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ab2a1d2
dev-libs/zziplib: Clean old version up
dev-libs/zziplib/Manifest | 1 -
.../zziplib/files/zziplib-0.13.60-ldflags.patch | 14 ----
dev-libs/zziplib/zziplib-0.13.60-r1.ebuild | 81 ----------------------
3 files changed, 96 deletions(-)
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 0370d5fabe..1276b7becd 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,2 +1 @@
-DIST zziplib-0.13.60.tar.bz2 685418 SHA256 4bc3ca7c5f249280bd6c8d1e96be8a03413dad9063a49c19601bd29ff4910155 SHA512 008fce480997764f21d6113117bb96bf9df2f64f696edf3cfb30f3ee221364ce50eefe49974e001e20c84176ca0c8226fd684968b9e20dbc6aea24bff58251cf WHIRLPOOL 0e92601cd9793bfc3d35cb3332bb66edc69c458695b83e4d74430cc073906ca653f2aa49bfdf00ed42135f238989a014494f109b4442d31a12961da7110bc1f9
DIST zziplib-0.13.62.tar.bz2 685770 SHA256 a1b8033f1a1fd6385f4820b01ee32d8eca818409235d22caf5119e0078c7525b SHA512 fd3b9e9015ba7603bdebd8f6a2ac6d11003705bfab22f3a0025f75455042664aea69440845b59e6f389417dff5ac777f49541d8cbacb2a220e67d20bb6973e25 WHIRLPOOL 598571c5a2051fba0ede01aed6ada6fa9f9959ed3bc13ad668f9e79a9af9bcfd87090a34036e4b8cd6b5cec47f01848b786aaa8601e9ab2beea063d0190a3108
diff --git a/dev-libs/zziplib/files/zziplib-0.13.60-ldflags.patch b/dev-libs/zziplib/files/zziplib-0.13.60-ldflags.patch
deleted file mode 100644
index 3c95ff465d..0000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.60-ldflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3175466&group_id=6389&atid=306389
-https://bugs.gentoo.org/354051
-
---- a/configure
-+++ b/configure
-@@ -292,7 +292,7 @@
- # ---------------------------------------------------------------
- AC_MSG_CHECKING([link options])
- ZZIPLIB_LDFLAGS=""
--test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="--export-dynamic"
-+test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="-export-dynamic"
- RESOLVES=" # "
- case "$host_os" in mingw*)
- ZZIPLIB_LDFLAGS="-no-undefined -export-all-symbols -mconsole"
diff --git a/dev-libs/zziplib/zziplib-0.13.60-r1.ebuild b/dev-libs/zziplib/zziplib-0.13.60-r1.ebuild
deleted file mode 100644
index 3fe84c9a65..0000000000
--- a/dev-libs/zziplib/zziplib-0.13.60-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-# PYTHON_BDEPEND="2"
-
-inherit libtool eutils flag-o-matic python
-
-DESCRIPTION="Lightweight library used to easily extract data from files archived in a single zip file"
-HOMEPAGE="http://zziplib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zziplib/${P}.tar.bz2"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc sdl static-libs test"
-
-RDEPEND="sys-libs/zlib
- sdl? ( >=media-libs/libsdl-1.2.6 )"
-DEPEND="${RDEPEND}
- =dev-lang/python-2*
- virtual/pkgconfig
- test? ( app-arch/zip )"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.13.49-SDL-test.patch
- epatch "${FILESDIR}"/${PN}-0.13.60-ldflags.patch #354051
-
- # workaround AX_CREATE_PKGCONFIG_INFO bug #353195
- sed -i \
- -e '/ax_create_pkgconfig_ldflags/s:$LDFLAGS::' \
- -e '/ax_create_pkgconfig_cppflags/s:$CPPFLAGS::' \
- configure || die
-
- # zziplib tries to install backwards compat symlinks we dont want
- sed -i -e '/^zzip-postinstall:/s|$|\ndisable-this:|' Makefile.in || die
- sed -i -e '/^install-exec-hook:/s|$|\ndisable-this:|' zzip/Makefile.in || die
-
- elibtoolize
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing # bug reported upstream
- export ac_cv_path_XMLTO= # man pages are bundled in .tar's
- # Disable aclocal probing as the default path works #449156
- ACLOCAL=true \
- econf \
- --disable-dependency-tracking \
- $(use_enable sdl) \
- $(use_enable static-libs static)
-}
-
-src_test() {
- # need this because `make test` will always return true
- # tests fail with -j > 1 (bug #241186)
- emake -j1 check || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- # fowners fails when we don't have enough permissions (Prefix)
- if [[ ${EUID} == 0 ]] ; then
- fowners -R root /usr/share/man || die #321975
- fi
-
- if ! use static-libs ; then
- find "${D}" -type f -name '*.la' -exec rm {} + || die
- fi
-
- dodoc ChangeLog README TODO
-
- if use doc ; then
- dohtml -r docs/* || die 'dohtml failed'
- fi
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/zziplib/files/, dev-libs/zziplib/
@ 2019-02-07 11:41 Mikle Kolyada
0 siblings, 0 replies; 7+ messages in thread
From: Mikle Kolyada @ 2019-02-07 11:41 UTC (permalink / raw
To: gentoo-commits
commit: 52e154ed3d53f8c82911656e6689af0ee7735349
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 7 11:41:41 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Feb 7 11:41:41 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52e154ed
dev-libs/zziplib: Drop old
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-libs/zziplib/Manifest | 1 -
.../zziplib/files/zziplib-0.13.49-SDL-test.patch | 14 ----
dev-libs/zziplib/zziplib-0.13.62-r2.ebuild | 82 ----------------------
3 files changed, 97 deletions(-)
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 7ae3c8d24a6..5ec366a6c5a 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,2 +1 @@
-DIST zziplib-0.13.62.tar.bz2 685770 BLAKE2B 24ef46370cd490498cedeea4b83abffd40b4bf7092ca994defb0c7c90a2c6863c56d19933dca1b20700ed9a55369cd1e8d3f6e1c5ed966b966d15eed4e5b75aa SHA512 fd3b9e9015ba7603bdebd8f6a2ac6d11003705bfab22f3a0025f75455042664aea69440845b59e6f389417dff5ac777f49541d8cbacb2a220e67d20bb6973e25
DIST zziplib-0.13.69.tar.gz 1132204 BLAKE2B 92e9f5e95665c7a47d1e472f570402e3c174d404abf461bed644ea8a37ff7661ee98b8fa241728aae375e32c470f2f48a817f72410eeda81a6a3be6e6bdb2635 SHA512 ade026289737f43ca92a8746818d87dd7618d473dbce159546ce9071c9e4cbe164a6b1c9efff16efb7aa0327b2ec6b34f3256c6bda19cd6e325703fffc810ef0
diff --git a/dev-libs/zziplib/files/zziplib-0.13.49-SDL-test.patch b/dev-libs/zziplib/files/zziplib-0.13.49-SDL-test.patch
deleted file mode 100644
index 410a2c746c9..00000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.49-SDL-test.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-this test isnt even run automatically and the dependencies are all broken,
-so just disable it and be done
-
---- SDL/Makefile.in
-+++ SDL/Makefile.in
-@@ -38,7 +38,7 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
--check_PROGRAMS = zzcatsdl$(EXEEXT)
-+check_PROGRAMS =
- subdir = SDL
- DIST_COMMON = $(pkgconfig_HEADERS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
diff --git a/dev-libs/zziplib/zziplib-0.13.62-r2.ebuild b/dev-libs/zziplib/zziplib-0.13.62-r2.ebuild
deleted file mode 100644
index 6b1da7bf50b..00000000000
--- a/dev-libs/zziplib/zziplib-0.13.62-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit libtool eutils flag-o-matic python-any-r1
-
-DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
-HOMEPAGE="http://zziplib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zziplib/${P}.tar.bz2"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc sdl static-libs test"
-
-RDEPEND="
- sys-libs/zlib
- sdl? ( >=media-libs/libsdl-1.2.6 )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- virtual/pkgconfig
- test? ( app-arch/zip )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.13.49-SDL-test.patch
-
- python_fix_shebang .
-
- # workaround AX_CREATE_PKGCONFIG_INFO bug #353195
- sed -i \
- -e '/ax_create_pkgconfig_ldflags/s:$LDFLAGS::' \
- -e '/ax_create_pkgconfig_cppflags/s:$CPPFLAGS::' \
- configure || die
-
- # zziplib tries to install backwards compat symlinks we dont want
- sed -i -e '/^zzip-postinstall:/s|$|\ndisable-this:|' Makefile.in || die
- sed -i -e '/^install-exec-hook:/s|$|\ndisable-this:|' zzip/Makefile.in || die
-
- elibtoolize
-
- # Do an out-of-tree build as their configure will do it automatically
- # otherwise and that can lead to funky errors. #492816
- mkdir -p build
-}
-
-src_configure() {
- cd "${S}"/build
-
- append-flags -fno-strict-aliasing # bug reported upstream
- export ac_cv_path_XMLTO= # man pages are bundled in .tar's
-
- # Disable aclocal probing as the default path works #449156
- ECONF_SOURCE=${S} \
- ACLOCAL=true \
- econf \
- $(use_enable sdl) \
- $(use_enable static-libs static)
- MAKEOPTS+=' -C build'
-}
-
-src_test() {
- # need this because `make test` will always return true
- # tests fail with -j > 1 (bug #241186)
- emake -j1 check
-}
-
-src_install() {
- default
- # fowners fails when we don't have enough permissions (Prefix)
- if [[ ${EUID} == 0 ]] ; then
- fowners -R root /usr/share/man #321975
- fi
-
- prune_libtool_files
-
- if use doc ; then
- dohtml -r docs/*
- fi
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/zziplib/files/, dev-libs/zziplib/
@ 2020-09-14 1:35 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2020-09-14 1:35 UTC (permalink / raw
To: gentoo-commits
commit: 9aa5f76175af9fa488b998961f1afa0c97f456b2
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Aug 24 22:26:27 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 01:35:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aa5f761
dev-libs/zziplib: manpages and cleanup
remove upstream patches and use commit 223930775aa5b from upstream's develop branch
removing -DZZIP_COMPAT in order to use default
remove unneeded src_prepare()
fix for installing manpages
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/17257
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/zziplib/Manifest | 1 +
.../zziplib/files/zziplib-0.13.71-find-bash.patch | 2 +-
.../zziplib-0.13.71-installing-man3-pages.patch | 14 +++++
dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild | 61 ++++++++++++++++++++++
4 files changed, 77 insertions(+), 1 deletion(-)
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index ecc774b0985..3dca2d49d45 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1 +1,2 @@
DIST zziplib-0.13.71.tar.gz 1150654 BLAKE2B 00394de5da8b3c5b95ef0aea060e523354845261b846e3c876b13d2d05c6569496475a279d6b211c3215a6f17e6bfe53958baabcebb13cd72d30a9f0c40d9449 SHA512 e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5
+DIST zziplib-0.13.71_p20200419.tar.gz 1153032 BLAKE2B 34aa38fde43805636a83f34c064ab09880b7200c414d3666786b7d750a26d8f39dbb431dde7cb81e785cd20a0d444e2a7308b5c79eb71bf0e9f52a051fe01883 SHA512 7f94524ddd745d81656ea9b0314db791e636ed9a8305c4fde7f88572b0302bff4c7f8fa76ccf368b7b8b1c8062a4ad85dfab8f30cdf6ee37f835ff5758751222
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch b/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch
index e29599c1b2d..6c62442c5df 100644
--- a/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch
+++ b/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch
@@ -9,7 +9,7 @@ index 7ceba4a..c1b8172 100644
+find_package ( UnixCommands REQUIRED ) # bash
join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
- add_custom_command(OUTPUT SDL_rwops_zzip.pc
+ join_paths(pc_zzipsdldir "\${prefix}" "${zzipsdldir}")
diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt
index a9f6e3a..2cdd275 100644
--- a/zzip/CMakeLists.txt
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch b/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch
new file mode 100644
index 00000000000..08130f958dd
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch
@@ -0,0 +1,14 @@
+# https://github.com/gdraheim/zziplib/issues/93
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index b679f7b..e2887ee 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -190,7 +190,7 @@ add_custom_target(install-manpages
+ endif()
+ if(ZZIP_MANPAGES)
+ install(CODE "message(STATUS \"Installing: man3 pages to ${mandir}/man3\")")
+- install(DIRECTORY man3/ DESTINATION ${mandir}/man3 MESSAGE_NEVER)
++ install(DIRECTORY ${outdir}/man3/ DESTINATION ${mandir}/man3 MESSAGE_NEVER)
+ endif()
+ add_custom_target(install-docs DEPENDS install-manpages install-htmpages install-site)
+ add_custom_target(install-mans DEPENDS install-manpages)
diff --git a/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild b/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild
new file mode 100644
index 00000000000..7928de22d9e
--- /dev/null
+++ b/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit cmake flag-o-matic python-any-r1
+
+MY_COMMIT="223930775aa5b325f04cec01f0b18726a7918821"
+
+DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
+HOMEPAGE="http://zziplib.sourceforge.net/"
+SRC_URI="https://github.com/gdraheim/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0/13"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc sdl static-libs test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ doc? (
+ ${PYTHON_DEPS}
+ )
+ test? (
+ ${PYTHON_DEPS}
+ app-arch/zip
+ )
+"
+DEPEND="
+ sys-libs/zlib
+ sdl? ( >=media-libs/libsdl-1.2.6 )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.13.69-009-perror.patch
+ "${FILESDIR}"/${PN}-0.13.71-installing-man3-pages.patch
+)
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing # bug reported upstream
+
+ local mycmakeargs=(
+ -DZZIPSDL="$(usex sdl)"
+ -DBUILD_STATIC_LIBS="$(usex static-libs)"
+ -DBUILD_TESTS="$(usex test)"
+ -DZZIPTEST="$(usex test)"
+ -DZZIPDOCS="$(usex doc)"
+ -DZZIPWRAP=OFF
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/zziplib/files/, dev-libs/zziplib/
@ 2020-09-17 6:12 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2020-09-17 6:12 UTC (permalink / raw
To: gentoo-commits
commit: 673c65194dd7efd05a45db958d0fb9c4d861b155
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Sep 15 14:15:48 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 06:12:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=673c6519
dev-libs/zziplib: enable tests
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/17564
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../zziplib-0.13.71-installing-man3-pages.patch | 25 +++++++++++++++++++---
dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild | 13 +++++++++++
2 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch b/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch
index 08130f958dd..55fb4be7a51 100644
--- a/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch
+++ b/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch
@@ -1,9 +1,28 @@
-# https://github.com/gdraheim/zziplib/issues/93
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index b679f7b..e2887ee 100644
+index b679f7b..cafa6b4 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
-@@ -190,7 +190,7 @@ add_custom_target(install-manpages
+@@ -126,9 +126,10 @@ add_custom_command(OUTPUT manpages.tar
+ COMMAND ${BASH} -c "test -d man3/man3 && mv man3 man3_; test -d man3_/man3 && mv man3_/man3 .; rm -rf man3_"
+ COMMAND ${BASH} -c "chmod 664 man3/*.3"
+ COMMAND ${BASH} -c "tar cf manpages.tar man3"
+- COMMAND ${BASH} -c "ls -l `pwd`/manpages.tar `pwd`/htmpages.tar >&2 || true"
++ COMMAND ${BASH} -c "ls -l `pwd`/manpages.tar >&2 || true"
+ DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml
+ VERBATIM)
++if(ZZIP_HTMPAGES)
+ add_custom_command(OUTPUT htmpages.tar
+ COMMAND ${BASH} -c "test -d html && rm -rf html; mkdir html"
+ COMMAND ${PY} ${srcdir}/dbk2man.py -o html html zziplib.xml
+@@ -139,6 +140,7 @@ add_custom_command(OUTPUT htmpages.tar
+ COMMAND ${BASH} -c "ls -l `pwd`/htmpages.tar `pwd`/manpages.tar >&2 || true"
+ DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml
+ VERBATIM)
++endif()
+
+ add_custom_target(manpages DEPENDS manpages.tar)
+ add_custom_target(htmpages DEPENDS htmpages.tar)
+@@ -190,7 +192,7 @@ if(ZZIP_HTMPAGES)
endif()
if(ZZIP_MANPAGES)
install(CODE "message(STATUS \"Installing: man3 pages to ${mandir}/man3\")")
diff --git a/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild b/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild
index cc20d2152c5..a4e536480be 100644
--- a/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild
@@ -40,6 +40,14 @@ pkg_setup() {
python-any-r1_pkg_setup
}
+src_prepare() {
+ sed -e "/^topsrcdir/s:..\/..::" \
+ -e "/^bindir/s:\.\.:${WORKDIR}/${P}_build:" \
+ -e 's:\(..\/\)\+{exe}:{exe}:' \
+ -i test/zziptests.py || die
+ cmake_src_prepare
+}
+
src_configure() {
append-flags -fno-strict-aliasing # bug reported upstream
@@ -54,3 +62,8 @@ src_configure() {
cmake_src_configure
}
+
+src_test() {
+ cd "$S"/test/ || die
+ ${EPYTHON} "$S"/test/zziptests.py || die
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/zziplib/files/, dev-libs/zziplib/
@ 2020-11-10 11:52 Joonas Niilola
0 siblings, 0 replies; 7+ messages in thread
From: Joonas Niilola @ 2020-11-10 11:52 UTC (permalink / raw
To: gentoo-commits
commit: 42cecc52e701034bf5ca866de00d97d7f1954087
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Oct 10 16:56:57 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 11:52:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42cecc52
dev-libs/zziplib: fix manpages
Fixed manpages with single patches from upstream's develop branch
Removed 'test' USE flag since tests require internet access.
( https://github.com/gdraheim/zziplib/issues/24 )
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/17636
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-libs/zziplib/Manifest | 2 +-
...lib-0.13.71-58_manvolnum_should_be_in_.so.patch | 19 ++
...13.71-copy_directory_instead_of_unpacking.patch | 54 ++++
...iplib-0.13.71-reorganize-ZZIP_OPTIONFLAGS.patch | 317 +++++++++++++++++++++
...419.ebuild => zziplib-0.13.71_p20201021.ebuild} | 45 +--
5 files changed, 405 insertions(+), 32 deletions(-)
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 3dca2d49d45..f0ee88ddc3a 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,2 +1,2 @@
DIST zziplib-0.13.71.tar.gz 1150654 BLAKE2B 00394de5da8b3c5b95ef0aea060e523354845261b846e3c876b13d2d05c6569496475a279d6b211c3215a6f17e6bfe53958baabcebb13cd72d30a9f0c40d9449 SHA512 e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5
-DIST zziplib-0.13.71_p20200419.tar.gz 1153032 BLAKE2B 34aa38fde43805636a83f34c064ab09880b7200c414d3666786b7d750a26d8f39dbb431dde7cb81e785cd20a0d444e2a7308b5c79eb71bf0e9f52a051fe01883 SHA512 7f94524ddd745d81656ea9b0314db791e636ed9a8305c4fde7f88572b0302bff4c7f8fa76ccf368b7b8b1c8062a4ad85dfab8f30cdf6ee37f835ff5758751222
+DIST zziplib-0.13.71_p20201021.tar.gz 1151849 BLAKE2B b4caf8b6b03d8de742d4e727a2aa03dd8b5e96df50c6e9d5aaf2df9bc072cd8389959019e41c06bd808f3df8e710dd11d198438bf70e58e5ae278a882d854d5b SHA512 ebbc5bc9e403e203d36cacb0ec5aea9d1750f1a8b144a41748c9475e6cc0b1c3af197a4ef7df5f38f90be40bd4f9b68edbcb4624ceff1d48a47127065e570cb3
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-58_manvolnum_should_be_in_.so.patch b/dev-libs/zziplib/files/zziplib-0.13.71-58_manvolnum_should_be_in_.so.patch
new file mode 100644
index 00000000000..262d309d8d8
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.71-58_manvolnum_should_be_in_.so.patch
@@ -0,0 +1,19 @@
+commit 03ddd0ce0864e629256bc078eaadb0d21d0df6d9
+Author: Guido Draheim <guidod@gmx.de>
+Date: Sat Apr 18 02:11:37 2020 +0200
+
+ #58 manvolnum should be in .so (see other) manpages
+
+diff --git a/docs/dbk2man.py b/docs/dbk2man.py
+index 49cac4e..e0d93d2 100755
+--- a/docs/dbk2man.py
++++ b/docs/dbk2man.py
+@@ -387,7 +387,7 @@ def refentry2(man, refentry, subdirectory = ".", title = ""):
+ refentrytitle = manpage
+ filename = "%s/man%s/%s.%s" % (subdirectory, manvolnum, manpage, manvolnum)
+ if manpage != refentrytitle:
+- manpagetext = ".so %s.%s\n" % (refentrytitle, manvolnum)
++ manpagetext = ".so man%s/%s.%s\n" % (manvolnum, refentrytitle, manvolnum)
+ writefile(filename, manpagetext)
+ else:
+ manpagetext = text
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-copy_directory_instead_of_unpacking.patch b/dev-libs/zziplib/files/zziplib-0.13.71-copy_directory_instead_of_unpacking.patch
new file mode 100644
index 00000000000..51059ed77be
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.71-copy_directory_instead_of_unpacking.patch
@@ -0,0 +1,54 @@
+commit 31d8a958610592bce683366c0808fb610f67a366
+Author: Guido Draheim <guidod@gmx.de>
+Date: Sun Apr 19 18:25:16 2020 +0200
+
+ copy directory instead of unpacking manpages.tar to install-man #93
+
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index 623da24..b679f7b 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -174,33 +174,28 @@ add_custom_target(install-site
+ DEPENDS site.html zziplib.html zzipmmapped.html zzipfseeko.html
+ VERBATIM)
+ add_custom_target(install-htmpages
+- COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/*pages.tar"
+ COMMAND ${BASH} -c "mkdir -vp $DESTDIR${docdir} >&2 || ls -ld $DESTDIR${docdir} >&2"
+- COMMAND ${BASH} -c "cd $DESTDIR${docdir} && tar x -f ${outdir}/htmpages.tar"
++ COMMAND ${BASH} -c "cp -r ${outdir}/html $DESTDIR${docdir}/"
+ COMMAND ${BASH} -c "cd $DESTDIR${docdir} && mv html man"
+ DEPENDS htmpages.tar
+ VERBATIM)
+ add_custom_target(install-manpages
+- COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/*pages.tar"
+ COMMAND ${BASH} -c "mkdir -vp $DESTDIR${mandir} >&2 || ls -ld $DESTDIR${mandir} >&2"
+- COMMAND ${BASH} -c "cd $DESTDIR${mandir} && tar xf ${outdir}/manpages.tar"
++ COMMAND ${BASH} -c "cp -r ${outdir}/man3 $DESTDIR${mandir}/"
+ DEPENDS manpages.tar
+ VERBATIM)
+-
++if(ZZIP_HTMPAGES)
++ install(CODE "message(STATUS \"Installing: html pages to ${docdir}/man\")")
++ install(DIRECTORY html/ DESTINATION ${docdir}/man MESSAGE_NEVER)
++endif()
++if(ZZIP_MANPAGES)
++ install(CODE "message(STATUS \"Installing: man3 pages to ${mandir}/man3\")")
++ install(DIRECTORY man3/ DESTINATION ${mandir}/man3 MESSAGE_NEVER)
++endif()
+ add_custom_target(install-docs DEPENDS install-manpages install-htmpages install-site)
+ add_custom_target(install-mans DEPENDS install-manpages)
+-
+-if(ZZIP_MANPAGES)
+-add_custom_target(install-man ALL DEPENDS install-manpages)
+-else()
+ add_custom_target(install-man DEPENDS install-manpages)
+-endif()
+-
+-if(ZZIP_HTMPAGES)
+-add_custom_target(install-htm ALL DEPENDS install-htmpages)
+-else()
+ add_custom_target(install-htm DEPENDS install-htmpages)
+-endif()
+
+ # messages #######################################################
+
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-reorganize-ZZIP_OPTIONFLAGS.patch b/dev-libs/zziplib/files/zziplib-0.13.71-reorganize-ZZIP_OPTIONFLAGS.patch
new file mode 100644
index 00000000000..a2567720bfa
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.71-reorganize-ZZIP_OPTIONFLAGS.patch
@@ -0,0 +1,317 @@
+commit 5583ccc7a247ee27556ede344e93d3ac1dc72e9b
+Author: Guido Draheim <guidod@gmx.de>
+Date: Sat Apr 18 01:39:56 2020 +0200
+
+ reorganize ZZIP_OPTIONFLAGS and make install-man ON by default if UNIX
+
+# diff --git a/GNUmakefile b/GNUmakefile
+# index 3571fd1..53077b0 100644
+# --- a/GNUmakefile
+# +++ b/GNUmakefile
+# @@ -10,10 +10,16 @@ default:
+# @ test ! -f Makefile || test -f build/Makefile || echo 'DONE make all - please run make check (before make install)'
+#
+# .PHONY: build-am build-cm
+# -build-cm: ; mkdir build-cm; cd build-cm && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local
+# build-am: ; mkdir build-am; cd build-am && sh ../configure --prefix=$$HOME/local --enable-sdl
+# -cm cmake: ; rm -rf build-cm; $(MAKE) build-cm && cd build-cm && $(MAKE) all
+# +build-cm: ; mkdir build-cm; cd build-cm && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local
+# +build-nj: ; mkdir build-nj; cd build-nj && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local -GNinja
+# +build-nm: ; mkdir build-nj; cd build-nj && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local -GNmake
+# am autom: ; rm -rf build-am; $(MAKE) build-am && cd build-am && $(MAKE) all
+# +cm cmake: ; rm -rf build-cm; $(MAKE) build-cm && cd build-cm && $(MAKE) all
+# +nj ninja: ; rm -rf build-nj; $(MAKE) build-nj && cd build-nj && ninja
+# +
+# +build-cm2: ; mkdir build-cm2; cd build-cm2 && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local -DZZIP_MANPAGES=OFF
+# +cm2: ; rm -rf build-cm2; $(MAKE) build-cm2 && cd build-cm2 && $(MAKE) all
+#
+# new: ; rm -rf build; $(MAKE) default
+#
+diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt
+index 7ceba4a..c0d68d4 100644
+--- a/SDL/CMakeLists.txt
++++ b/SDL/CMakeLists.txt
+@@ -14,6 +14,15 @@ option(BUILD_STATIC_LIBS "Build the static library" OFF)
+ option(BUILD_TESTS "Build test programs" OFF)
+ option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
+
++if(UNIX)
++option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" ON)
++option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" ON)
++else()
++option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF)
++option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF)
++endif()
++
++
+ # Zlib library needed
+ find_package ( ZLIB REQUIRED )
+ # pkg_search_module ( ZZIP zzip )
+@@ -46,7 +55,7 @@ endif()
+ # pkgconfig ######################################################
+
+ if(SDL_FOUND)
+-if(UNIX)
++if(ZZIP_PKGCONFIG)
+ join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
+ join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
+ join_paths(pc_zzipsdldir "\${prefix}" "${zzipsdldir}")
+@@ -64,5 +73,11 @@ add_custom_target(pkgconfig-sdl ALL DEPENDS SDL_rwops_zzip.pc)
+
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/SDL_rwops_zzip.pc
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" )
+-endif()
+-endif()
++endif(ZZIP_PKGCONFIG)
++endif(SDL_FOUND)
++
++# messages ##################################################
++
++message(STATUS "installing SDL_rwops_zzip example headers: ${SDL_FOUND}")
++message(STATUS "installing SDL_rwops_zzip pkgconfig files: ${ZZIP_PKGCONFIG}")
++
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index d1284e6..623da24 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -9,6 +9,14 @@ option(BUILD_SHARED_LIBS "Build a shared library" ON)
+ option(BUILD_STATIC_LIBS "Build the static library" OFF)
+ option(BUILD_TESTS "Build test programs" OFF)
+ option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
++option(ZZIP_HTMLSITE "Generate site html pages from docs" OFF)
++option(ZZIP_HTMPAGES "Generate html manpages from sources" OFF)
++
++if(UNIX)
++option(ZZIP_MANPAGES "Generate man3 manpages from sources" ON)
++else()
++option(ZZIP_MANPAGES "Generate man3 manpages from sources" OFF)
++endif()
+
+ # Zlib library needed
+ find_package ( ZLIB REQUIRED )
+@@ -132,14 +140,24 @@ add_custom_command(OUTPUT htmpages.tar
+ DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml
+ VERBATIM)
+
+-add_custom_target(mans DEPENDS manpages)
+-add_custom_target(man DEPENDS manpages)
+-add_custom_target(htm DEPENDS htmpages)
+ add_custom_target(manpages DEPENDS manpages.tar)
+ add_custom_target(htmpages DEPENDS htmpages.tar)
+ add_custom_target(doc DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml site.html)
+ add_custom_target(docs DEPENDS doc manpages htmpages)
++add_custom_target(mans DEPENDS manpages)
++
++if(ZZIP_MANPAGES)
++add_custom_target(man ALL DEPENDS manpages)
++else()
++add_custom_target(man DEPENDS manpages)
++endif()
++if(ZZIP_HTMPAGES)
++add_custom_target(htm ALL DEPENDS htmpages)
++else()
++add_custom_target(htm DEPENDS htmpages)
++endif()
+
++# install ########################################################
+
+ string(REPLACE ";" " " all_bins_FILES "${bins_FILES}")
+ string(REPLACE ";" " " all_SDLs_FILES "${SDLs_FILES}")
+@@ -168,13 +186,24 @@ add_custom_target(install-manpages
+ COMMAND ${BASH} -c "cd $DESTDIR${mandir} && tar xf ${outdir}/manpages.tar"
+ DEPENDS manpages.tar
+ VERBATIM)
++
+ add_custom_target(install-docs DEPENDS install-manpages install-htmpages install-site)
+ add_custom_target(install-mans DEPENDS install-manpages)
+-add_custom_target(install-man DEPENDS install-manpages)
+
+-# install ########################################################
+-set(mandir ${CMAKE_INSTALL_FULL_MANDIR})
+-install(CODE "execute_process(COMMAND ${BASH} -c \"set -e
+- mkdir -vp $DESTDIR/${mandir} || ls -ld $DESTDIR/${mandir}
+- cd $DESTDIR/${mandir} && tar xf ${CMAKE_CURRENT_BINARY_DIR}/manpages.tar
+- \")")
++if(ZZIP_MANPAGES)
++add_custom_target(install-man ALL DEPENDS install-manpages)
++else()
++add_custom_target(install-man DEPENDS install-manpages)
++endif()
++
++if(ZZIP_HTMPAGES)
++add_custom_target(install-htm ALL DEPENDS install-htmpages)
++else()
++add_custom_target(install-htm DEPENDS install-htmpages)
++endif()
++
++# messages #######################################################
++
++message(STATUS "html site to be generated: ${ZZIP_HTMLSITE}" )
++message(STATUS "man pages to be generated: ${ZZIP_MANPAGES}" )
++message(STATUS "htm pages to be generated: ${ZZIP_HTMPAGES}" )
+diff --git a/testbuilds/centos7-build.dockerfile b/testbuilds/centos7-build.dockerfile
+index 4509b68..0b7b656 100644
+--- a/testbuilds/centos7-build.dockerfile
++++ b/testbuilds/centos7-build.dockerfile
+@@ -19,4 +19,4 @@ RUN mkdir src/build
+ RUN cd src/build && cmake3 ..
+ RUN cd src/build && make
+ RUN $no_check || (cd src/build && make check)
+-RUN $no_install || (cd src/build && make install)
++RUN $no_install || (cd src/build && make install VERBOSE=1)
+diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt
+index a9f6e3a..2f7eda5 100644
+--- a/zzip/CMakeLists.txt
++++ b/zzip/CMakeLists.txt
+@@ -18,8 +18,16 @@ option(BUILD_STATIC_LIBS "Build the static library" OFF)
+ option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
+ option(ZZIPMMAPPED "Build libzzipmmapped (not fully portable)" ON)
+ option(ZZIPFSEEKO "Build libzzipfseeko (based on posix.1 api)" ON)
+-option(ZZIPCOMPAT "Build compatibility with old libzzip releases" ON)
+-option(ZZIPLIBTOOL "Ensure binary compatibility with libtool" ON)
++
++if(UNIX)
++option(ZZIP_COMPAT "Build compatibility with old libzzip releases" ON)
++option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" ON)
++option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" ON)
++else()
++option(ZZIP_COMPAT "Build compatibility with old libzzip releases" OFF)
++option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF)
++option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF)
++endif()
+
+ # used in zzip/_config.h
+ set(ZZIP_PACKAGE "${PROJECT_NAME}lib")
+@@ -27,7 +35,7 @@ set(ZZIP_VERSION "${PROJECT_VERSION}")
+ set(ZZIP_PACKAGE_NAME "${PROJECT_NAME}lib")
+ set(ZZIP_PACKAGE_VERSION "${PROJECT_VERSION}")
+
+-if(ZZIPCOMPAT)
++if(ZZIP_COMPAT)
+ find_package ( UnixCommands REQUIRED ) # bash cp mv rm gzip tar
+ endif()
+
+@@ -193,7 +201,7 @@ set_target_properties(libzzipmmapped PROPERTIES OUTPUT_NAME "zzipmmapped" RELEAS
+ SET_TARGET_PROPERTIES(libzzipmmapped PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
+ endif()
+
+-if(ZZIPCOMPAT)
++if(ZZIP_COMPAT)
+ add_custom_command(OUTPUT compat/zzip.h
+ COMMAND ${BASH} -c "rm -rf compat; mkdir compat"
+ COMMAND ${BASH} -c "echo '#ifndef ZZIP_WARNING' > compat/zzip.h"
+@@ -212,9 +220,9 @@ add_custom_command(OUTPUT compat/zzip.h
+ BYPRODUCTS compat/zziplib.h compat/zzip-io.h
+ VERBATIM)
+ add_custom_target(compat ALL DEPENDS compat/zzip.h)
+-endif()
++endif(ZZIP_COMPAT)
+
+-if(UNIX)
++if(ZZIP_PKGCONFIG)
+ join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
+ join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
+ add_custom_command(OUTPUT zziplib.pc
+@@ -235,12 +243,12 @@ add_custom_command(OUTPUT zziplib.pc
+ BYPRODUCTS zzipmmapped.pc zzipfseeko.pc
+ VERBATIM)
+ add_custom_target(pkgconfig ALL DEPENDS zziplib.pc)
+-endif()
++endif(ZZIP_PKGCONFIG)
+
+ # install ########################################################
+ set(outdir ${CMAKE_CURRENT_BINARY_DIR})
+
+-if(UNIX)
++if(ZZIP_PKGCONFIG)
+ install(FILES ${outdir}/zziplib.pc ${outdir}/zzipmmapped.pc ${outdir}/zzipfseeko.pc
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" )
+ endif()
+@@ -264,7 +272,7 @@ install(TARGETS libzzipmmapped
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif()
+
+-if(ZZIPCOMPAT)
++if(ZZIP_COMPAT)
+ install(FILES ${outdir}/compat/zzip.h ${outdir}/compat/zziplib.h ${outdir}/compat/zzip-io.h
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ if(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG)
+@@ -289,7 +297,7 @@ if(ZZIPCOMPAT)
+ endif()
+ endif()
+
+-if(ZZIPLIBTOOL)
++if(ZZIP_LIBTOOL)
+ if(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG)
+ set(lib ${CMAKE_SHARED_LIBRARY_PREFIX})
+ set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX})
+@@ -340,4 +348,12 @@ if(ZZIPLIBTOOL)
+ ln -svf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.12
+ \")")
+ endif()
+-endif()
++endif(ZZIP_LIBTOOL)
++
++## messages ##############################################
++
++message(STATUS "lib zzipfseeko to be compiled: ${ZZIPFSEEKO}")
++message(STATUS "lib zzipmmapped to be compiled: ${ZZIPFSEEKO}")
++message(STATUS "lib zzip symlinks as by libtool: ${ZZIP_LIBTOOL}")
++message(STATUS "installing zzip compat headers: ${ZZIP_COMPAT}")
++message(STATUS "installing zzip pkgconfig files: ${ZZIP_PKGCONFIG}")
+diff --git a/zzipwrap/CMakeLists.txt b/zzipwrap/CMakeLists.txt
+index 220d93b..8ae0587 100644
+--- a/zzipwrap/CMakeLists.txt
++++ b/zzipwrap/CMakeLists.txt
+@@ -13,7 +13,14 @@ option(BUILD_SHARED_LIBS "Build a shared library" ON)
+ option(BUILD_STATIC_LIBS "Build the static library" OFF)
+ option(BUILD_TESTS "Build test programs" OFF)
+ option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
+-option(ZZIPLIBTOOL "Ensure binary compatibility with libtool" ON)
++
++if(UNIX)
++option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" ON)
++option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" ON)
++else()
++option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF)
++option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF)
++endif()
+
+ check_include_files ( unistd.h ZZIP_HAVE_UNISTD_H )
+ # set ( ZZIP_HAVE_ZLIB_H 1 )
+@@ -48,7 +55,7 @@ add_executable(zzipwrap ${zzipwrap_SRCS} )
+ target_link_libraries(zzipwrap libzzipwrap )
+ target_include_directories(zzipwrap PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+
+-if(UNIX)
++if(ZZIP_PKGCONFIG)
+ join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
+ join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
+ add_custom_command(OUTPUT zzipwrap.pc
+@@ -69,7 +76,7 @@ endif()
+ # install ########################################################
+ set(outdir ${CMAKE_CURRENT_BINARY_DIR})
+
+-if(UNIX)
++if(ZZIP_PKGCONFIG)
+ install(FILES ${outdir}/zzipwrap.pc
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" )
+ endif()
+@@ -79,7 +86,7 @@ install(TARGETS libzzipwrap
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+-if(ZZIPLIBTOOL)
++if(ZZIP_LIBTOOL)
+ if(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG)
+ set(lib ${CMAKE_SHARED_LIBRARY_PREFIX})
+ set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX})
+@@ -95,3 +102,8 @@ if(ZZIPLIBTOOL)
+ \")")
+ endif()
+ endif()
++
++# messages #######################################################
++
++message(STATUS "lib zzipwrap symlinks as by libtool: ${ZZIP_LIBTOOL}")
++message(STATUS "installing zzipwrap pkgconfig files: ${ZZIP_PKGCONFIG}")
diff --git a/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild b/dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild
similarity index 52%
rename from dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild
rename to dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild
index ffa83af3736..2c92b124db8 100644
--- a/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild
@@ -3,11 +3,11 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{6..9} )
inherit cmake flag-o-matic python-any-r1
-MY_COMMIT="223930775aa5b325f04cec01f0b18726a7918821"
+MY_COMMIT="3921fc43bca7283f126bfb2e47ec7e7e24b5a5ea" # master Oct 21, 2020
DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
HOMEPAGE="https://github.com/gdraheim/zziplib http://zziplib.sourceforge.net/"
SRC_URI="https://github.com/gdraheim/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
@@ -15,16 +15,13 @@ SRC_URI="https://github.com/gdraheim/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.t
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0/13"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="sdl static-libs test"
-# Tests fail for now, only recently added.
-# Restricted to avoid blocking stabilisations.
-# https://github.com/gdraheim/zziplib/issues/97
-RESTRICT="test"
-#RESTRICT="!test? ( test )"
+IUSE="sdl static-libs"
+
+# Tests require internet access
+# https://github.com/gdraheim/zziplib/issues/24
BDEPEND="
${PYTHON_DEPS}
- test? ( app-arch/zip )
"
DEPEND="
sys-libs/zlib
@@ -35,38 +32,24 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}/${PN}-${MY_COMMIT}"
PATCHES=(
- "${FILESDIR}"/${PN}-0.13.69-009-perror.patch
- "${FILESDIR}"/${PN}-0.13.71-installing-man3-pages.patch
+ "${FILESDIR}"/${PN}-0.13.71-reorganize-ZZIP_OPTIONFLAGS.patch # https://github.com/gdraheim/zziplib/commit/5583ccc
+ "${FILESDIR}"/${PN}-0.13.71-58_manvolnum_should_be_in_.so.patch # https://github.com/gdraheim/zziplib/commit/03ddd0c
+ "${FILESDIR}"/${PN}-0.13.71-copy_directory_instead_of_unpacking.patch # https://github.com/gdraheim/zziplib/commit/31d8a95
+ "${FILESDIR}"/${PN}-0.13.71-installing-man3-pages.patch # https://github.com/gdraheim/zziplib/issues/93#issuecomment-616219417
)
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- sed -e "/^topsrcdir/s:..\/..::" \
- -e "/^bindir/s:\.\.:${WORKDIR}/${P}_build:" \
- -e 's:\(..\/\)\+{exe}:{exe}:' \
- -i test/zziptests.py || die
- cmake_src_prepare
-}
-
src_configure() {
- append-flags -fno-strict-aliasing # bug reported upstream
+ # https://github.com/gdraheim/zziplib/commit/f3bfc0dd6663b7df272cc0cf17f48838ad724a2f#diff-b7b1e314614cf326c6e2b6eba1540682R100
+ append-flags -fno-strict-aliasing
local mycmakeargs=(
-DZZIPSDL="$(usex sdl)"
-DBUILD_STATIC_LIBS="$(usex static-libs)"
- -DBUILD_TESTS="$(usex test)"
- -DZZIPTEST="$(usex test)"
+ -DBUILD_TESTS=OFF
+ -DZZIPTEST=OFF
-DZZIPDOCS=ON
-DZZIPWRAP=OFF
)
cmake_src_configure
}
-
-src_test() {
- cd "$S"/test/ || die
- "${EPYTHON}" "$S"/test/zziptests.py || die "Tests failed with ${EPYTHON}"
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/zziplib/files/, dev-libs/zziplib/
@ 2022-10-28 7:17 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-10-28 7:17 UTC (permalink / raw
To: gentoo-commits
commit: 20503a2f0881b3b519ebfdc32b25ec8bf99ad3c2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 07:15:04 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 07:17:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20503a2f
dev-libs/zziplib: fix Python dep; workaround Clang 16 failure
Closes: https://bugs.gentoo.org/835755
Closes: https://bugs.gentoo.org/869980
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/zziplib-0.13.72-Wint-conversion.patch | 22 +++++++++
dev-libs/zziplib/zziplib-0.13.72-r2.ebuild | 52 ++++++++++++++++++++++
2 files changed, 74 insertions(+)
diff --git a/dev-libs/zziplib/files/zziplib-0.13.72-Wint-conversion.patch b/dev-libs/zziplib/files/zziplib-0.13.72-Wint-conversion.patch
new file mode 100644
index 000000000000..c27c33f7c3ab
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.72-Wint-conversion.patch
@@ -0,0 +1,22 @@
+https://copr-dist-git.fedorainfracloud.org/cgit/@fedora-llvm-team/clang-rpm-config/clang-rpm-config.git/tree/zziplib-0001-Fix-Wint-conversion-warning.patch
+https://bugs.gentoo.org/869980
+https://github.com/gdraheim/zziplib/issues/140
+
+From 1189f99a7f84d6a5e66a6057abfe0543de48ec82 Mon Sep 17 00:00:00 2001
+From: Tom Stellard <tstellar@redhat.com>
+Date: Wed, 26 Oct 2022 05:32:17 +0000
+Subject: [PATCH] Fix -Wint-conversion warning
+
+/builddir/build/BUILD/zziplib-0.13.72/zzip/mmapped.c:685:24: error: incompatible integer to pointer conversion assigning to 'Bytef *' (aka 'unsigned char *') from 'off_t' (aka 'long') [-Wint-conversion]
+ file->zlib.next_in = offset;
+--- a/zzip/mmapped.c
++++ b/zzip/mmapped.c
+@@ -682,7 +682,7 @@ zzip_disk_entry_fopen(ZZIP_DISK * disk, ZZIP_DISK_ENTRY * entry)
+ 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*)offset;
+ ____;
+
+ DBG2("compressed size %i", (int) file->zlib.avail_in);
diff --git a/dev-libs/zziplib/zziplib-0.13.72-r2.ebuild b/dev-libs/zziplib/zziplib-0.13.72-r2.ebuild
new file mode 100644
index 000000000000..a954272b3435
--- /dev/null
+++ b/dev-libs/zziplib/zziplib-0.13.72-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+# Needed for docs, bug #835755
+PYTHON_REQ_USE="xml(+)"
+inherit cmake flag-o-matic python-any-r1
+
+DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
+HOMEPAGE="https://github.com/gdraheim/zziplib http://zziplib.sourceforge.net/"
+SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0/13"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="sdl static-libs"
+
+# Tests require internet access
+# https://github.com/gdraheim/zziplib/issues/24
+
+BDEPEND="
+ ${PYTHON_DEPS}
+"
+DEPEND="
+ sys-libs/zlib
+ sdl? ( >=media-libs/libsdl-1.2.6 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.13.72-Wint-conversion.patch
+)
+
+src_configure() {
+ # https://github.com/gdraheim/zziplib/commit/f3bfc0dd6663b7df272cc0cf17f48838ad724a2f#diff-b7b1e314614cf326c6e2b6eba1540682R100
+ append-flags -fno-strict-aliasing
+ # https://github.com/gdraheim/zziplib/issues/140 (bug #869980)
+ append-flags $(test-flags-CC -Wno-error=incompatible-function-pointer-types -Wno-error=int-conversion)
+
+ local mycmakeargs=(
+ -DZZIPSDL="$(usex sdl)"
+ -DBUILD_STATIC_LIBS="$(usex static-libs)"
+ -DBUILD_TESTS=OFF
+ -DZZIPTEST=OFF
+ -DZZIPDOCS=ON
+ -DZZIPWRAP=OFF
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/zziplib/files/, dev-libs/zziplib/
@ 2023-12-15 3:30 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-12-15 3:30 UTC (permalink / raw
To: gentoo-commits
commit: 5ae24a01ab9b8776a96c015fa58764d84f3c4c1d
Author: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Mon Dec 11 13:08:51 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 03:27:56 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ae24a01
dev-libs/zziplib: fix incompatible pointer types
Closes: https://bugs.gentoo.org/919066
Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
Closes: https://github.com/gentoo/gentoo/pull/34234
Signed-off-by: Sam James <sam <AT> gentoo.org>
...ziplib-0.13.72-incompatible-pointer-types.patch | 48 ++++++++++++++++++++
dev-libs/zziplib/zziplib-0.13.72-r4.ebuild | 53 ++++++++++++++++++++++
2 files changed, 101 insertions(+)
diff --git a/dev-libs/zziplib/files/zziplib-0.13.72-incompatible-pointer-types.patch b/dev-libs/zziplib/files/zziplib-0.13.72-incompatible-pointer-types.patch
new file mode 100644
index 000000000000..6f6459bcc8a5
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.72-incompatible-pointer-types.patch
@@ -0,0 +1,48 @@
+Remove implicit pointer types conversions.
+
+See also: https://wiki.gentoo.org/wiki/Modern_C_porting
+Bug: https://bugs.gentoo.org/919066
+Upstream PR: https://github.com/gdraheim/zziplib/pull/150
+
+--- a/SDL/SDL_rwops_zzip.c
++++ b/SDL/SDL_rwops_zzip.c
+@@ -15,17 +15,17 @@
+ #define SDL_RWOPS_ZZIP_FILE(_context) (ZZIP_FILE*) \
+ ((_context)->hidden.unknown.data1)
+
+-static int _zzip_seek(SDL_RWops *context, int offset, int whence)
++static Sint64 _zzip_seek(SDL_RWops *context, Sint64 offset, int whence)
+ {
+ return zzip_seek(SDL_RWOPS_ZZIP_FILE(context), offset, whence);
+ }
+
+-static int _zzip_read(SDL_RWops *context, void *ptr, int size, int maxnum)
++static size_t _zzip_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum)
+ {
+ return zzip_read(SDL_RWOPS_ZZIP_FILE(context), ptr, size*maxnum) / size;
+ }
+
+-static int _zzip_write(SDL_RWops *context, const void *ptr, int size, int num)
++static size_t _zzip_write(SDL_RWops *context, const void *ptr, size_t size, size_t num)
+ {
+ return 0; /* ignored */
+ }
+--- a/zzip/mmapped.c
++++ b/zzip/mmapped.c
+@@ -664,14 +664,14 @@ zzip_disk_entry_fopen(ZZIP_DISK * disk, ZZIP_DISK_ENTRY * entry)
+ off_t offset = zzip_file_header_to_data(header);
+ if (csize == 0xFFFFu) {
+ struct zzip_extra_zip64* zip64 =
+- zzip_file_header_to_extras(header);
++ (struct zzip_extra_zip64*)zzip_file_header_to_extras(header);
+ if (ZZIP_EXTRA_ZIP64_CHECK(zip64)) {
+ csize = zzip_extra_zip64_csize(zip64);
+ }
+ }
+ if (offset == 0xFFFFu) {
+ struct zzip_extra_zip64* zip64 =
+- zzip_file_header_to_extras(header);
++ (struct zzip_extra_zip64*)zzip_file_header_to_extras(header);
+ if (ZZIP_EXTRA_ZIP64_CHECK(zip64)) {
+ offset = zzip_extra_zip64_offset(zip64);
+ }
diff --git a/dev-libs/zziplib/zziplib-0.13.72-r4.ebuild b/dev-libs/zziplib/zziplib-0.13.72-r4.ebuild
new file mode 100644
index 000000000000..b0fb082aea2a
--- /dev/null
+++ b/dev-libs/zziplib/zziplib-0.13.72-r4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
+# Needed for docs, bug #835755
+PYTHON_REQ_USE="xml(+)"
+inherit cmake flag-o-matic python-any-r1
+
+DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
+HOMEPAGE="https://github.com/gdraheim/zziplib https://zziplib.sourceforge.net"
+SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0/13"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="sdl static-libs"
+
+# Tests require internet access
+# https://github.com/gdraheim/zziplib/issues/24
+
+BDEPEND="
+ ${PYTHON_DEPS}
+"
+DEPEND="
+ sys-libs/zlib
+ sdl? ( >=media-libs/libsdl-1.2.6 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.13.72-Wint-conversion.patch
+ "${FILESDIR}"/${PN}-0.13.72-incompatible-pointer-types.patch
+)
+
+src_configure() {
+ # https://github.com/gdraheim/zziplib/commit/f3bfc0dd6663b7df272cc0cf17f48838ad724a2f#diff-b7b1e314614cf326c6e2b6eba1540682R100
+ append-flags -fno-strict-aliasing
+ # https://github.com/gdraheim/zziplib/issues/140 (bug #869980)
+ append-flags $(test-flags-CC -Wno-error=incompatible-function-pointer-types -Wno-error=int-conversion)
+
+ local mycmakeargs=(
+ -DZZIPSDL="$(usex sdl)"
+ -DBUILD_STATIC_LIBS="$(usex static-libs)"
+ -DBUILD_TESTS=OFF
+ -DZZIPTEST=OFF
+ -DZZIPDOCS=ON
+ -DZZIPWRAP=OFF
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-12-15 3:30 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-28 7:17 [gentoo-commits] repo/gentoo:master commit in: dev-libs/zziplib/files/, dev-libs/zziplib/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-12-15 3:30 Sam James
2020-11-10 11:52 Joonas Niilola
2020-09-17 6:12 Sam James
2020-09-14 1:35 Sam James
2019-02-07 11:41 Mikle Kolyada
2017-02-18 11:31 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox