From 6f2d4586075f5db1e58e3f2c0460f06d8c38ff1e Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 2 Apr 2021 19:03:10 +0200 Subject: [PATCH] zziplib: bump version --- ...3.71.patchset => zziplib-0.13.72.patchset} | 70 +++++++++---------- ...-0.13.71.recipe => zziplib-0.13.72.recipe} | 4 +- 2 files changed, 35 insertions(+), 39 deletions(-) rename dev-libs/zziplib/patches/{zziplib-0.13.71.patchset => zziplib-0.13.72.patchset} (79%) rename dev-libs/zziplib/{zziplib-0.13.71.recipe => zziplib-0.13.72.recipe} (97%) diff --git a/dev-libs/zziplib/patches/zziplib-0.13.71.patchset b/dev-libs/zziplib/patches/zziplib-0.13.72.patchset similarity index 79% rename from dev-libs/zziplib/patches/zziplib-0.13.71.patchset rename to dev-libs/zziplib/patches/zziplib-0.13.72.patchset index 1643c9e51..8681686e2 100644 --- a/dev-libs/zziplib/patches/zziplib-0.13.71.patchset +++ b/dev-libs/zziplib/patches/zziplib-0.13.72.patchset @@ -1,14 +1,14 @@ -From 56e046bbe56afc0b226dcf40c5dece61dc634f5b Mon Sep 17 00:00:00 2001 +From 337d44af5af916ada243f0ab2008aeab8a822ade Mon Sep 17 00:00:00 2001 From: begasus Date: Thu, 21 Jun 2018 17:31:25 +0200 Subject: gcc2 fix diff --git a/zzip/mmapped.c b/zzip/mmapped.c -index 8af18f4..829e4bb 100644 +index 2071882..dc643f5 100644 --- a/zzip/mmapped.c +++ b/zzip/mmapped.c -@@ -444,12 +444,14 @@ zzip_disk_findfirst(ZZIP_DISK * disk) +@@ -459,12 +459,14 @@ zzip_disk_findfirst(ZZIP_DISK * disk) errno = EFBIG; return 0; } @@ -24,10 +24,10 @@ index 8af18f4..829e4bb 100644 { continue; -- -2.28.0 +2.30.0 -From c9d2457c6550a1b43d83d043e064999958fc9789 Mon Sep 17 00:00:00 2001 +From 84aa69222fb02c3ef58a803bad0e32a8aa915b86 Mon Sep 17 00:00:00 2001 From: Leorize Date: Thu, 21 Jun 2018 17:34:03 +0200 Subject: test: set LIBRARY_PATH instead of LD_LIBRARY_PATH @@ -47,10 +47,10 @@ index 49b3fc0..f0639ef 100644 @ echo 'diff readme.out $(README) || grep "libzzip-" readme.err' \ ; if test -s readme.out ; then diff readme.out $(README) \ -- -2.28.0 +2.30.0 -From 12be2c18a73614bb4a3e33ffa54f7397ec707445 Mon Sep 17 00:00:00 2001 +From feca7337a49f664836aa65efa3844e136b0d5284 Mon Sep 17 00:00:00 2001 From: Leorize Date: Thu, 21 Jun 2018 17:36:28 +0200 Subject: test: use rpath to direct zzipself to correct libpath @@ -70,10 +70,10 @@ index f0639ef..bd42521 100644 ../zzip/libzzip.la : @top_srcdir@/zzip/*.c -- -2.28.0 +2.30.0 -From 9d0bfaf611d1e2e8e3066cd8b562cd386f59e1ad Mon Sep 17 00:00:00 2001 +From 5e435c473ce8b9c146fd4d5cff9fab16dbc464dd Mon Sep 17 00:00:00 2001 From: Leorize Date: Sun, 7 Jun 2020 11:11:25 -0500 Subject: zziptests: avoid large file list on the command line @@ -88,10 +88,10 @@ to have a printf builtin (so that the argument list limit won't apply to it). diff --git a/test/zziptests.py b/test/zziptests.py -index 03a8b6a..1c2d19d 100644 +index f315dc7..b97dd94 100644 --- a/test/zziptests.py +++ b/test/zziptests.py -@@ -290,7 +290,7 @@ class ZZipTest(unittest.TestCase): +@@ -321,7 +321,7 @@ class ZZipTest(unittest.TestCase): filename = os.path.join(tmpdir,"README") filetext = self.readme() self.mkfile(filename, filetext) @@ -100,7 +100,7 @@ index 03a8b6a..1c2d19d 100644 self.assertGreater(os.path.getsize(zipfile), 10) def test_10002_make_test2_zip(self): """ create a test2.zip for later tests using standard 'zip' -@@ -306,7 +306,7 @@ class ZZipTest(unittest.TestCase): +@@ -337,7 +337,7 @@ class ZZipTest(unittest.TestCase): filename = os.path.join(tmpdir,"README") filetext = self.readme() self.mkfile(filename, filetext) @@ -109,7 +109,7 @@ index 03a8b6a..1c2d19d 100644 self.assertGreater(os.path.getsize(zipfile), 10) def test_10003_make_test3_zip(self): """ create a test3.zip for later tests using standard 'zip' -@@ -322,7 +322,7 @@ class ZZipTest(unittest.TestCase): +@@ -353,7 +353,7 @@ class ZZipTest(unittest.TestCase): filename = os.path.join(tmpdir,"README") filetext = self.readme() self.mkfile(filename, filetext) @@ -118,7 +118,7 @@ index 03a8b6a..1c2d19d 100644 self.assertGreater(os.path.getsize(zipfile), 10) def test_10004_make_test4_zip(self): """ create a test4.zip for later tests using standard 'zip' -@@ -339,7 +339,7 @@ class ZZipTest(unittest.TestCase): +@@ -370,7 +370,7 @@ class ZZipTest(unittest.TestCase): filename = os.path.join(tmpdir,"README") filetext = self.readme() self.mkfile(filename, filetext) @@ -127,7 +127,7 @@ index 03a8b6a..1c2d19d 100644 self.assertGreater(os.path.getsize(zipfile), 1000000) def test_10005_make_test5_zip(self): """ create a test5.zip for later tests using standard 'zip' -@@ -363,7 +363,7 @@ class ZZipTest(unittest.TestCase): +@@ -394,7 +394,7 @@ class ZZipTest(unittest.TestCase): filename = os.path.join(tmpdir,"README") filetext = self.readme() self.mkfile(filename, filetext) @@ -137,20 +137,20 @@ index 03a8b6a..1c2d19d 100644 def test_10010_make_test0_dat(self): """ create test.dat from test.zip with xorcopy """ -- -2.28.0 +2.30.0 -From 0c19566f584b06908b437fca62aac04755c3bee7 Mon Sep 17 00:00:00 2001 +From c87b7913740034006c1de93d00f795275de55411 Mon Sep 17 00:00:00 2001 From: begasus Date: Sun, 27 Sep 2020 09:41:53 +0000 Subject: Fix crash diff --git a/test/zziptests.py b/test/zziptests.py -index 1c2d19d..83b0345 100644 +index b97dd94..e9a04dd 100644 --- a/test/zziptests.py +++ b/test/zziptests.py -@@ -3488,7 +3488,7 @@ class ZZipTest(unittest.TestCase): +@@ -3662,7 +3662,7 @@ class ZZipTest(unittest.TestCase): self.assertFalse(run.returncode) # list the ZIPfile exe=self.bins("unzip-mem"); @@ -160,20 +160,20 @@ index 1c2d19d..83b0345 100644 self.skipTest("FIXME: not solved") self.assertFalse(run.returncode) -- -2.28.0 +2.30.0 -From 9685f0f52961305d95337de879485104c3f89034 Mon Sep 17 00:00:00 2001 +From 2993f0bfc32fd518495638b35ea3f47a12b2ec73 Mon Sep 17 00:00:00 2001 From: begasus Date: Sun, 27 Sep 2020 09:42:50 +0000 Subject: Invalid compiler options for gcc2 diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt -index a9f6e3a..62c0156 100644 +index c95e1d3..64d62c8 100644 --- a/zzip/CMakeLists.txt +++ b/zzip/CMakeLists.txt -@@ -100,8 +100,8 @@ if(UNIX) +@@ -109,8 +109,8 @@ if(UNIX) -Wmissing-declarations # -Wdeclaration-after-statement -Werror-implicit-function-declaration @@ -185,39 +185,35 @@ index a9f6e3a..62c0156 100644 endif() -- -2.28.0 +2.30.0 -From 6aab2a37202243db54cf0582987d346f36282689 Mon Sep 17 00:00:00 2001 +From b4860bb00e6ccd366b1739ccb10fbc4321a3cb73 Mon Sep 17 00:00:00 2001 From: begasus Date: Tue, 29 Sep 2020 12:26:58 +0000 Subject: Installing man3 pages diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt -index 442e877..c30d48b 100644 +index 9271dd9..980a482 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt -@@ -118,9 +118,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" +@@ -129,6 +129,7 @@ add_custom_command(OUTPUT manpages.tar + COMMAND ${BASH} -c "ls -l `pwd`/manpages.tar >&2 || true" DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml VERBATIM) +if(ZZIPLIB_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 -@@ -131,6 +132,7 @@ add_custom_command(OUTPUT htmpages.tar - COMMAND ${BASH} -c "ls -l `pwd`/htmpages.tar `pwd`/manpages.tar >&2 || true" +@@ -139,6 +140,7 @@ add_custom_command(OUTPUT htmpages.tar + COMMAND ${BASH} -c "ls -l `pwd`/htmpages.tar || true" DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml VERBATIM) +endif() - add_custom_target(mans DEPENDS manpages) - add_custom_target(man DEPENDS manpages) + add_custom_target(manpages DEPENDS manpages.tar) + add_custom_target(htmpages DEPENDS htmpages.tar) -- -2.28.0 +2.30.0 diff --git a/dev-libs/zziplib/zziplib-0.13.71.recipe b/dev-libs/zziplib/zziplib-0.13.72.recipe similarity index 97% rename from dev-libs/zziplib/zziplib-0.13.71.recipe rename to dev-libs/zziplib/zziplib-0.13.72.recipe index 745baa420..a23cea8db 100644 --- a/dev-libs/zziplib/zziplib-0.13.71.recipe +++ b/dev-libs/zziplib/zziplib-0.13.72.recipe @@ -7,14 +7,14 @@ LICENSE="GNU LGPL v2.1 MPL v1.1" REVISION="1" SOURCE_URI="https://github.com/gdraheim/zziplib/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="2ee1e0fbbb78ec7cc46bde5b62857bc51f8d665dd265577cf93584344b8b9de2" +CHECKSUM_SHA256="93ef44bf1f1ea24fc66080426a469df82fa631d13ca3b2e4abaeab89538518dc" SOURCE_FILENAME="zziplib-v$portVersion.tar.gz" PATCHES="zziplib-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -libVersion="13.0.71" +libVersion="13.0.72" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES="