From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C09F9138359 for ; Tue, 10 Nov 2020 11:52:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 050CEE086C; Tue, 10 Nov 2020 11:52:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C8F00E086C for ; Tue, 10 Nov 2020 11:52:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B3D81340CEA for ; Tue, 10 Nov 2020 11:52:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E7A3044F for ; Tue, 10 Nov 2020 11:52:36 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1605009147.42cecc52e701034bf5ca866de00d97d7f1954087.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/zziplib/files/, dev-libs/zziplib/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/zziplib/Manifest dev-libs/zziplib/files/zziplib-0.13.71-58_manvolnum_should_be_in_.so.patch dev-libs/zziplib/files/zziplib-0.13.71-copy_directory_instead_of_unpacking.patch dev-libs/zziplib/files/zziplib-0.13.71-reorganize-ZZIP_OPTIONFLAGS.patch dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild X-VCS-Directories: dev-libs/zziplib/ dev-libs/zziplib/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 42cecc52e701034bf5ca866de00d97d7f1954087 X-VCS-Branch: master Date: Tue, 10 Nov 2020 11:52:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 171b0ee9-3056-4c11-adde-42f2cad4cd9f X-Archives-Hash: 9fcc4c585ada6c21f8afbed70796243c commit: 42cecc52e701034bf5ca866de00d97d7f1954087 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sat Oct 10 16:56:57 2020 +0000 Commit: Joonas Niilola gentoo 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 pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/17636 Signed-off-by: Joonas Niilola 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 +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 +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 +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}" -}