diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
| commit | d99093fb4bb5652015c06274d64083daa2439e4f (patch) | |
| tree | cf61513204d97974179580065e85df5c8009087c /dev-libs/zziplib | |
| parent | 463397cf1e064185110fe57c568d73f99a06f5d1 (diff) | |
gentoo resync : 03.03.2021
Diffstat (limited to 'dev-libs/zziplib')
12 files changed, 0 insertions, 830 deletions
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest index 289efb9e129a..ce64d5c42bc1 100644 --- a/dev-libs/zziplib/Manifest +++ b/dev-libs/zziplib/Manifest @@ -1,16 +1,3 @@ -AUX zziplib-0.13.69-009-perror.patch 499 BLAKE2B ffbf0a74204a575068843c55a538dd858a76bd3e7592fbc0860f7201877c9aebfcbf14ca2cb42274b71843acceceb9b3240d34423639f7f4835641ad5a95a86c SHA512 10720e172c1482e7d2f1241dffaef2f4f41ae94724cd3617c9b39e2ada558a173eb4e262121f49661e9101d260f429aad6c94c9e7c1eb6dfe56aa807e87d6510 -AUX zziplib-0.13.71-58_manvolnum_should_be_in_.so.patch 828 BLAKE2B 3d9ba078b5c8a681ad0fd9edfa26f87fd9552b8dc41b8faec854e3d07a86415df95647b6e24a5c28b837131e8c7089922b6ab776bcf4b700ad543c6454790394 SHA512 2fc96de80f6bb54ea03245dae4d07f9b653cfa0eb4497834b380732ff0c0667d14358affb82c8c3c75c27be5554c57f571a9e0e3fc82392baf50f7de1a105bb2 -AUX zziplib-0.13.71-copy_directory_instead_of_unpacking.patch 2180 BLAKE2B 6b93641fa1aa0a1941e741a465236d92a006b89eadc9055937e5f703957be8365a62d543a5ac6002d2fb7455e16569ab237c3df330cf6d0c9183c18ab593352c SHA512 744f605157bf15ea6228c0463702e5c4fd985ae9b957e1d92fcbbde81d09f49fcb85272fae85d7a69aefd195c96e9cb4e747727428d495e829170c3301f19efc -AUX zziplib-0.13.71-find-bash.patch 1758 BLAKE2B d4d98b1886a67867de90fc303f2bc6aab07e1c27fd8fc1827ddd30b8d8427938c4bccff14359de683585aa8ebfbc4a675ad98acf6e6fa982bb1254e4aac8eb1e SHA512 e939072da1e27008f0d23145e74cd37574426a6d4b2d578bc0a8e880054b89580bf4a48c81b70f6232251216d2f73cf5c071dfd0cb7bfd2f6f1f5dd09738efc7 -AUX zziplib-0.13.71-installing-man3-pages.patch 1588 BLAKE2B f2b00692d7a1c06cee51748242211c220e9a16da8f21cf33c26a2c2b8f708faa171e63218c8bc7d789794bea6fafe198e0f713400589524f0cd9bb7e49640589 SHA512 213732d9a6b0cb9bd20ffd7563fd9b0fe2f673ad44888b4c393afc8b37e5e207cedce8d71bb776a91089f61ca084917797b9e3206f0ee32cf443d9ee4abb62a2 -AUX zziplib-0.13.71-join-paths-pc-zzipsdldir.patch 1250 BLAKE2B 77ba09afa144ac5aaf1393d1bd612590e664d0885eb34354f2fa8cfd28005d225d1960f25d4b56d32956c13e99315e3e067a83b8f7f2c84703dff1e718f8dff1 SHA512 b81b34885aa1017b0f0d834565818b2464e0c827b2c428c14442b4d741bfa91c90e5915af98cf4fcbeababf29bb89a13f76efa98b4de1a88ac3659f666069110 -AUX zziplib-0.13.71-reorganize-ZZIP_OPTIONFLAGS.patch 12467 BLAKE2B c27c09ae00e2fa85771654db7f428755edc2d5b880c2462e525422ced0f1434b6ac0d41a153c750dd5cf1781c7073f2f8a9635f023a2d3b1e737b68bea5f42d4 SHA512 5f391e1c65fbc8d8114953ea3618d4e7398fe50585b8aed40ccdbd86bae7bb2be298e12c4642c55eb0573a80bf0d405dd3a65dddbc324d70beab84fd7080977c -AUX zziplib-0.13.71-shell-DESTDIR.patch 3206 BLAKE2B 4f542e0f26ce332e75f341dfdd84b9907cf1e1c67f259d3626e34284991421e1931ee2f896d36dc444b37d7873269a21e780992e25b689f8ca57e5def9ae27fe SHA512 427a633de7b5928fe6150d8e5a711bc48c3d68978344ae840da512919c8151215bcc2b29f025cabd5204db9561d71d1925394f7695ddfbd9b4137c53d52b32da -AUX zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch 5840 BLAKE2B fac60aa6271dd189198ea7b9640567378def938a09d2362acf60a4aeb2a3787121f644685fb4f1310459eb665b509951c02ad7a40a78a216b9778e7599dd764f SHA512 ed6d3101587d6d0088bffb1bb1483cffe1629d2ff5301e88cdab8e654bac79f84534012e129d7c17ff23beb19ca46a96598894cd383040d41993732ff62ab05d -DIST zziplib-0.13.71.tar.gz 1150654 BLAKE2B 00394de5da8b3c5b95ef0aea060e523354845261b846e3c876b13d2d05c6569496475a279d6b211c3215a6f17e6bfe53958baabcebb13cd72d30a9f0c40d9449 SHA512 e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5 -DIST zziplib-0.13.71_p20201021.tar.gz 1151849 BLAKE2B b4caf8b6b03d8de742d4e727a2aa03dd8b5e96df50c6e9d5aaf2df9bc072cd8389959019e41c06bd808f3df8e710dd11d198438bf70e58e5ae278a882d854d5b SHA512 ebbc5bc9e403e203d36cacb0ec5aea9d1750f1a8b144a41748c9475e6cc0b1c3af197a4ef7df5f38f90be40bd4f9b68edbcb4624ceff1d48a47127065e570cb3 DIST zziplib-0.13.72.tar.gz 1162175 BLAKE2B ff5617645e25040e4666e5440651fbb2b04c0505c7bda08b158f44c63c5dd53ec97a9942908314c3b103a4685be49368e964d249fcf9b9d685e328f0ebabdedd SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8 -EBUILD zziplib-0.13.71-r2.ebuild 1687 BLAKE2B d25b7136cdd1649653e22168da5e7d5a634eb838e233995cbae2051f3517ea935d2188cc79c772883d8b5e91fc1aa1215e3a20f4a5e6ef09b0a6d55130cae40a SHA512 73827f6e7ede1e797731c2e3ce54927aac0856c40fb55e85a4acda4d8cb0a7088556bb422205d688efa5e19b817e5b04f5287e9944416303ed5d2d00cf864285 -EBUILD zziplib-0.13.71_p20201021.ebuild 1873 BLAKE2B 2a5ec064cf753856e95f693c3c9f9044226eae7f931f98f0fea5bd145228422c340e7ab7712e05dc98f06d9091bd5f4c7ff31fc0983a856c391887c16d7b97ec SHA512 064f7881a753eb842e0ae6b449e818652dfc2f6abc07a63230c0ea8f49c6419ca880207317d6574c4dc1790e034138448a279947c6a857cc75675eda2abcd147 EBUILD zziplib-0.13.72.ebuild 1258 BLAKE2B bdcf7833a983bc1eae81c2da26f6159c80e63d4bce90fc3d64258020eb1508b9236323d263a7f380e86d89033c3b8c0b16c70d565074154053c53f76689e7c9a SHA512 0bddcd8386ca17dc4bf8d49c68d4a9777c0f8cd8613aa10ddc5d862c0274a13e079e5a7dbeae9e2b33ba5f0f317dff6ac6bf6b2a1ba409f2a847fc625af1bb0d MISC metadata.xml 504 BLAKE2B 406cd214aabfba1e0061bab2db1f297ad2e20df92d9ab4f381153a1e5434fb6138565949e2356ed79579df98343c5300c516c9bb0c0883eb026e144181d52b18 SHA512 a7b627e728607f9902420489fe7f3bdca2a5f165f25b1bf5d1a361e92ab40a1b70b212e97bed6c70793210103c6f45407d02faa3990237272373d40942aa11a9 diff --git a/dev-libs/zziplib/files/zziplib-0.13.69-009-perror.patch b/dev-libs/zziplib/files/zziplib-0.13.69-009-perror.patch deleted file mode 100644 index 678ff3670df4..000000000000 --- a/dev-libs/zziplib/files/zziplib-0.13.69-009-perror.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: zziplib-0.13.69/bins/unzip-mem.c -=================================================================== ---- zziplib-0.13.69.orig/bins/unzip-mem.c -+++ zziplib-0.13.69/bins/unzip-mem.c -@@ -93,7 +93,7 @@ static void zzip_mem_entry_make(ZZIP_MEM - { - FILE* file = fopen (entry->zz_name, "wb"); - if (file) { zzip_mem_entry_pipe (disk, entry, file); fclose (file); } -- perror (entry->zz_name); -+ else perror (entry->zz_name); - if (status < EXIT_WARNINGS) status = EXIT_WARNINGS; - } - 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 deleted file mode 100644 index 262d309d8d89..000000000000 --- a/dev-libs/zziplib/files/zziplib-0.13.71-58_manvolnum_should_be_in_.so.patch +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index 51059ed77be7..000000000000 --- a/dev-libs/zziplib/files/zziplib-0.13.71-copy_directory_instead_of_unpacking.patch +++ /dev/null @@ -1,54 +0,0 @@ -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-find-bash.patch b/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch deleted file mode 100644 index 6c62442c5dfb..000000000000 --- a/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt -index 7ceba4a..c1b8172 100644 ---- a/SDL/CMakeLists.txt -+++ b/SDL/CMakeLists.txt -@@ -47,6 +47,7 @@ endif() - - if(SDL_FOUND) - if(UNIX) -+find_package ( UnixCommands REQUIRED ) # bash - join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}") - join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}") - join_paths(pc_zzipsdldir "\${prefix}" "${zzipsdldir}") -diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt -index a9f6e3a..2cdd275 100644 ---- a/zzip/CMakeLists.txt -+++ b/zzip/CMakeLists.txt -@@ -194,6 +194,7 @@ SET_TARGET_PROPERTIES(libzzipmmapped PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVE - endif() - - if(ZZIPCOMPAT) -+find_package ( UnixCommands REQUIRED ) # bash - 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" -@@ -215,6 +216,7 @@ add_custom_target(compat ALL DEPENDS compat/zzip.h) - endif() - - if(UNIX) -+find_package ( UnixCommands REQUIRED ) # bash - join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}") - join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}") - add_custom_command(OUTPUT zziplib.pc -diff --git a/zzipwrap/CMakeLists.txt b/zzipwrap/CMakeLists.txt -index 220d93b..d0bf1ae 100644 ---- a/zzipwrap/CMakeLists.txt -+++ b/zzipwrap/CMakeLists.txt -@@ -49,6 +49,7 @@ target_link_libraries(zzipwrap libzzipwrap ) - target_include_directories(zzipwrap PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}") - - if(UNIX) -+find_package ( UnixCommands REQUIRED ) # bash - join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}") - join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}") - add_custom_command(OUTPUT zzipwrap.pc 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 deleted file mode 100644 index 55fb4be7a51c..000000000000 --- a/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt -index b679f7b..cafa6b4 100644 ---- a/docs/CMakeLists.txt -+++ b/docs/CMakeLists.txt -@@ -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\")") -- 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/files/zziplib-0.13.71-join-paths-pc-zzipsdldir.patch b/dev-libs/zziplib/files/zziplib-0.13.71-join-paths-pc-zzipsdldir.patch deleted file mode 100644 index 7597f989dcc7..000000000000 --- a/dev-libs/zziplib/files/zziplib-0.13.71-join-paths-pc-zzipsdldir.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit 497c1598cea9dcb13d210de59b1dc65425ca5fdb -Author: Jan Tojnar <jtojnar@gmail.com> -Date: Thu Apr 16 20:09:11 2020 +0200 - - build: Produce more correct pc file with zzipsdldir - - Just like described in commit 892dea3b82208654cc9f57ffc4ef555d0d934cf5, - the CMAKE_INSTALL_INCLUDEDIR variable can be absolute path so simply - appending it to \${prefix} might not work. - -diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt -index 7ceba4a..6a4f860 100644 ---- a/SDL/CMakeLists.txt -+++ b/SDL/CMakeLists.txt -@@ -49,9 +49,10 @@ if(SDL_FOUND) - if(UNIX) - join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}") - join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}") -+join_paths(pc_zzipsdldir "\${prefix}" "${zzipsdldir}") - add_custom_command(OUTPUT SDL_rwops_zzip.pc - COMMAND ${BASH} -c "echo 'prefix=${CMAKE_INSTALL_PREFIX}' > SDL_rwops_zzip.pc" -- COMMAND ${BASH} -c "echo 'zzipsdldir=\${prefix}/${zzipsdldir}' >> SDL_rwops_zzip.pc" -+ COMMAND ${BASH} -c "echo 'zzipsdldir=${pc_zzipsdldir}' >> SDL_rwops_zzip.pc" - COMMAND ${BASH} -c "echo '' >> SDL_rwops_zzip.pc" - COMMAND ${BASH} -c "echo 'Name: SDL_rwops_zzip' >> SDL_rwops_zzip.pc" - COMMAND ${BASH} -c "echo 'Version: ${PROJECT_VERSION}' >> SDL_rwops_zzip.pc" 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 deleted file mode 100644 index a2567720bfad..000000000000 --- a/dev-libs/zziplib/files/zziplib-0.13.71-reorganize-ZZIP_OPTIONFLAGS.patch +++ /dev/null @@ -1,317 +0,0 @@ -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/files/zziplib-0.13.71-shell-DESTDIR.patch b/dev-libs/zziplib/files/zziplib-0.13.71-shell-DESTDIR.patch deleted file mode 100644 index 582a1504ee03..000000000000 --- a/dev-libs/zziplib/files/zziplib-0.13.71-shell-DESTDIR.patch +++ /dev/null @@ -1,51 +0,0 @@ -commit 75e22f3c365b62acbad8d8645d5404242800dfba -Author: Guido Draheim <guidod@gmx.de> -Date: Fri Apr 17 20:47:59 2020 +0200 - - #88 use shell $DESTDIR instead of make $(DESTDIR) - -diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt -index 442e877..d1284e6 100644 ---- a/docs/CMakeLists.txt -+++ b/docs/CMakeLists.txt -@@ -145,27 +145,27 @@ string(REPLACE ";" " " all_bins_FILES "${bins_FILES}") - string(REPLACE ";" " " all_SDLs_FILES "${SDLs_FILES}") - add_custom_target(install-site - COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/site.html" -- COMMAND ${BASH} -c "mkdir -vp $(DESTDIR)${docdir} >&2 || ls -ld $(DESTDIR)${docdir} >&2" -- COMMAND ${BASH} -c "cd ${outdir} && cp zziplib.html zzipmmapped.html zzipfseeko.html $(DESTDIR)${docdir}/" -- COMMAND ${BASH} -c "cd ${srcdir} && cp README.* COPYING.* $(DESTDIR)${docdir}/" -- COMMAND ${BASH} -c "cd ${topdir} && cp ChangeLog $(DESTDIR)${docdir}/" -- COMMAND ${BASH} -c "cd ${topdir} && cp ${all_bins_FILES} $(DESTDIR)${docdir}/" -- COMMAND ${BASH} -c "cd ${topdir} && cp ${all_SDLs_FILES} $(DESTDIR)${docdir}/" -- COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && cp ${outdir}/*.html ." -- COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && ln -s zzip-index.html index.html" -+ COMMAND ${BASH} -c "mkdir -vp $DESTDIR${docdir} >&2 || ls -ld $DESTDIR${docdir} >&2" -+ COMMAND ${BASH} -c "cd ${outdir} && cp zziplib.html zzipmmapped.html zzipfseeko.html $DESTDIR${docdir}/" -+ COMMAND ${BASH} -c "cd ${srcdir} && cp README.* COPYING.* $DESTDIR${docdir}/" -+ COMMAND ${BASH} -c "cd ${topdir} && cp ChangeLog $DESTDIR${docdir}/" -+ COMMAND ${BASH} -c "cd ${topdir} && cp ${all_bins_FILES} $DESTDIR${docdir}/" -+ COMMAND ${BASH} -c "cd ${topdir} && cp ${all_SDLs_FILES} $DESTDIR${docdir}/" -+ COMMAND ${BASH} -c "cd $DESTDIR${docdir} && cp ${outdir}/*.html ." -+ COMMAND ${BASH} -c "cd $DESTDIR${docdir} && ln -s zzip-index.html index.html" - 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 "cd $(DESTDIR)${docdir} && mv html man" -+ 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 "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 "mkdir -vp $DESTDIR${mandir} >&2 || ls -ld $DESTDIR${mandir} >&2" -+ 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) diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch b/dev-libs/zziplib/files/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch deleted file mode 100644 index d2436ae90120..000000000000 --- a/dev-libs/zziplib/files/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch +++ /dev/null @@ -1,137 +0,0 @@ -commit ddaa538e8cfa46413b0e92613b54123e4b759616 -Author: Guido Draheim <guidod@gmx.de> -Date: Fri Apr 17 20:46:30 2020 +0200 - - #88 adding testbuilds/opensuse15-ninja-sdl2.dockerfile - -diff --git a/testbuilds.py b/testbuilds.py -index 756e77e..35ac70c 100755 ---- a/testbuilds.py -+++ b/testbuilds.py -@@ -1080,6 +1080,42 @@ class ZZiplibBuildTest(unittest.TestCase): - cmd = "docker rmi {images}:{testname}" - sx____(cmd.format(**locals())) - self.rm_testdir() -+ def test_431_opensuse15_ninja_sdl2_dockerfile(self): -+ if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test") -+ testname=self.testname() -+ testdir = self.testdir() -+ dockerfile="testbuilds/opensuse15-ninja-sdl2.dockerfile" -+ addhosts = self.local_addhosts(dockerfile) -+ savename = docname(dockerfile) -+ saveto = SAVETO -+ images = IMAGES -+ build = "build --build-arg=no_check=true" -+ cmd = "docker {build} . -f {dockerfile} {addhosts} --tag {images}:{testname}" -+ sh____(cmd.format(**locals())) -+ cmd = "docker rm --force {testname}" -+ sx____(cmd.format(**locals())) -+ cmd = "docker run -d --name {testname} {images}:{testname} sleep 60" -+ sh____(cmd.format(**locals())) -+ #:# container = self.ip_container(testname) -+ cmd = "docker exec {testname} ls -l /usr/local/bin" -+ sh____(cmd.format(**locals())) -+ cmd = "docker exec {testname} find /usr/local/include -type f" -+ sh____(cmd.format(**locals())) -+ cmd = "docker exec {testname} bash -c 'ls -l /usr/local/lib64/libzz*'" -+ sh____(cmd.format(**locals())) -+ # -+ cmd = "docker exec {testname} bash -c 'test -d /usr/local/include/SDL_rwops_zzip'" -+ sh____(cmd.format(**locals())) -+ # -+ cmd = "docker rm --force {testname}" -+ sx____(cmd.format(**locals())) -+ cmd = "docker rmi {saveto}/{savename}:latest" -+ sx____(cmd.format(**locals())) -+ cmd = "docker tag {images}:{testname} {saveto}/{savename}:latest" -+ sh____(cmd.format(**locals())) -+ cmd = "docker rmi {images}:{testname}" -+ sx____(cmd.format(**locals())) -+ self.rm_testdir() - def test_701_centos7_am_docs_dockerfile(self): - if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test") - testname=self.testname() -@@ -1520,6 +1556,53 @@ class ZZiplibBuildTest(unittest.TestCase): - cmd = "docker rm --force {testname2}" - sx____(cmd.format(**locals())) - self.rm_testdir() -+ def test_9431_opensuse_ninja_sdl2_dockerfile(self): -+ if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test") -+ testname1=self.testname() + "_1" -+ testname2=self.testname() + "_2" -+ testdir = self.testdir() -+ dockerfile1="testbuilds/opensuse15-sdl2.dockerfile" -+ dockerfile2="testbuilds/opensuse15-ninja-sdl2.dockerfile" -+ addhosts = self.local_addhosts(dockerfile1) -+ savename1 = docname(dockerfile1) -+ savename2 = docname(dockerfile2) -+ saveto = SAVETO -+ images = IMAGES -+ cmd = "docker rm --force {testname1}" -+ sx____(cmd.format(**locals())) -+ cmd = "docker rm --force {testname2}" -+ sx____(cmd.format(**locals())) -+ cmd = "docker run -d --name {testname1} {addhosts} {saveto}/{savename1} sleep 600" -+ sh____(cmd.format(**locals())) -+ cmd = "docker run -d --name {testname2} {addhosts} {saveto}/{savename2} sleep 600" -+ # -+ sh____(cmd.format(**locals())) -+ cmd = "docker exec {testname2} bash -c 'cd /usr/local && tar czvf /local.tgz .'" -+ sh____(cmd.format(**locals())) -+ cmd = "docker cp {testname2}:/local.tgz tmp.local.tgz" -+ sh____(cmd.format(**locals())) -+ cmd = "docker cp tmp.local.tgz {testname1}:/local.tgz" -+ sh____(cmd.format(**locals())) -+ cmd = "rm tmp.local.tgz" -+ sh____(cmd.format(**locals())) -+ cmd = "docker exec {testname1} mkdir -p /new/local" -+ sh____(cmd.format(**locals())) -+ cmd = "docker exec {testname1} bash -c 'cd /new/local && tar xzvf /local.tgz'" -+ sh____(cmd.format(**locals())) -+ # -+ item="{}" -+ end="\\;" -+ cmd = "docker exec {testname1} diff -urw --no-dereference /usr/local /new/local" -+ sx____(cmd.format(**locals())) -+ out = output(cmd.format(**locals())) -+ self.assertFalse(greps(out, "---")) -+ self.assertFalse(greps(out, "Only")) -+ # -+ cmd = "docker rm --force {testname1}" -+ sx____(cmd.format(**locals())) -+ cmd = "docker rm --force {testname2}" -+ sx____(cmd.format(**locals())) -+ self.rm_testdir() - def test_9711_centos7_docs_dockerfile(self): - if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test") - testname1=self.testname() + "_1" -diff --git a/testbuilds/opensuse15-ninja-sdl2.dockerfile b/testbuilds/opensuse15-ninja-sdl2.dockerfile -new file mode 100644 -index 0000000..8a46dd4 ---- /dev/null -+++ b/testbuilds/opensuse15-ninja-sdl2.dockerfile -@@ -0,0 +1,24 @@ -+FROM opensuse/leap:15.1 -+ARG no_check=false -+ARG no_install=false -+# -DMAKE_INSTALL_PREFIX:PATH=/usr -+ -+RUN zypper refresh repo-oss -+RUN zypper install -r repo-oss -y gcc zlib-devel python3 cmake unzip zip gzip tar libSDL2-devel ninja -+ -+RUN mkdir src -+COPY CMakeLists.txt README COPYING.LIB ChangeLog src/ -+COPY CMakeScripts src/CMakeScripts -+COPY bins src/bins -+COPY docs src/docs -+COPY test src/test -+COPY SDL src/SDL -+COPY zzipwrap src/zzipwrap -+COPY zzip src/zzip -+ -+RUN mkdir src/build -+RUN cd src/build && cmake .. -GNinja -+RUN cd src/build && ninja -+RUN $no_check || (cd src/build && ninja check VERBOSE=1) -+RUN $no_install || (cd src/build && ninja install) -+ diff --git a/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild b/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild deleted file mode 100644 index 9782c484590f..000000000000 --- a/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 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 - -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 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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}" - -PATCHES=( - "${FILESDIR}"/${PN}-0.13.69-009-perror.patch - "${FILESDIR}"/${PN}-0.13.71-join-paths-pc-zzipsdldir.patch - "${FILESDIR}"/${PN}-0.13.71-find-bash.patch - "${FILESDIR}"/${PN}-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch - "${FILESDIR}"/${PN}-0.13.71-shell-DESTDIR.patch -) - -pkg_setup() { - (use test || use doc) && python-any-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - (use test || use doc) && python_fix_shebang . -} - -src_configure() { - append-flags -fno-strict-aliasing # bug reported upstream - - local mycmakeargs=( - -DZZIPCOMPAT=OFF - -DZZIPSDL="$(usex sdl ON OFF)" - -DBUILD_STATIC_LIBS="$(usex static-libs ON OFF)" - -DBUILD_TESTS="$(usex test ON OFF)" - -DZZIPTEST="$(usex test ON OFF)" - -DZZIPDOCS="$(usex doc ON OFF)" - -DZZIPWRAP=OFF - ) - - cmake_src_configure -} diff --git a/dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild b/dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild deleted file mode 100644 index f18a88e5b776..000000000000 --- a/dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit cmake flag-o-matic python-any-r1 - -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" - -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 ~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}" - -S="${WORKDIR}/${PN}-${MY_COMMIT}" - -PATCHES=( - "${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 -) - -src_configure() { - # 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=OFF - -DZZIPTEST=OFF - -DZZIPDOCS=ON - -DZZIPWRAP=OFF - ) - - cmake_src_configure -} |