diff --git a/dev-libs/zziplib/patches/zziplib-0.13.79.patchset b/dev-libs/zziplib/patches/zziplib-0.13.80.patchset similarity index 67% rename from dev-libs/zziplib/patches/zziplib-0.13.79.patchset rename to dev-libs/zziplib/patches/zziplib-0.13.80.patchset index ee5479f31..f36f8ff36 100644 --- a/dev-libs/zziplib/patches/zziplib-0.13.79.patchset +++ b/dev-libs/zziplib/patches/zziplib-0.13.80.patchset @@ -1,4 +1,4 @@ -From 604e8a91836a51d2744cfa0e0814d28f373fcb21 Mon Sep 17 00:00:00 2001 +From 12fb6e0ffcf6b106b35b91d1d53b23d7d9371fac 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 @@ -21,7 +21,7 @@ index 49b3fc0..f0639ef 100644 2.48.1 -From c4f6eb1d21d6863a4be729d50c2b67d9a3eb855f Mon Sep 17 00:00:00 2001 +From bb034dbf735d5c8519792f8aaf8b35396ed1c4ed 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 @@ -44,7 +44,7 @@ index f0639ef..bd42521 100644 2.48.1 -From 98f50c4e665af29200aa53bd7521ae728c993332 Mon Sep 17 00:00:00 2001 +From 5546bc941f6bae316fadde7bcb1f99c0758a44d0 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 @@ -59,77 +59,54 @@ 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 8e21d9f..d5e5cb5 100644 +index 2039a34..157047c 100644 --- a/test/zziptests.py +++ b/test/zziptests.py -@@ -334,7 +334,7 @@ class ZZipTest(unittest.TestCase): +@@ -338,7 +338,7 @@ class ZZipTest(unittest.TestCase): filename = os.path.join(tmpdir, "README") filetext = self.readme() self.mkfile(filename, filetext) -- shell("{exe} ../{zipfile} ??*.* README".format(**locals()), cwd=tmpdir) -+ shell("printf '%s\\n' ??*.* README | {exe} ../{zipfile} -@".format(**locals()), cwd=tmpdir) +- sh___("{exe} ../{zipfile} ??*.* README".format(**locals()), cwd=tmpdir) ++ sh___("printf '%s\\n' ??*.* README | {exe} ../{zipfile} -@".format(**locals()), cwd=tmpdir) self.assertGreater(os.path.getsize(zipfile), 10) def test_10002_make_test2_zip(self) -> None: """ create a test2.zip for later tests using standard 'zip' -@@ -350,7 +350,7 @@ class ZZipTest(unittest.TestCase): +@@ -354,7 +354,7 @@ class ZZipTest(unittest.TestCase): filename = os.path.join(tmpdir, "README") filetext = self.readme() self.mkfile(filename, filetext) -- shell("{exe} ../{zipfile} ??*.* README".format(**locals()), cwd=tmpdir) -+ shell("printf '%s\\n' ??*.* README | {exe} ../{zipfile} -@".format(**locals()), cwd=tmpdir) +- sh___("{exe} ../{zipfile} ??*.* README".format(**locals()), cwd=tmpdir) ++ sh___("printf '%s\\n' ??*.* README | {exe} ../{zipfile} -@".format(**locals()), cwd=tmpdir) self.assertGreater(os.path.getsize(zipfile), 10) def test_10003_make_test3_zip(self) -> None: """ create a test3.zip for later tests using standard 'zip' -@@ -366,7 +366,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) -- shell("{exe} ../{zipfile} ??*.* README".format(**locals()), cwd=tmpdir) -+ shell("printf '%s\\n' ??*.* README | {exe} ../{zipfile} -@".format(**locals()), cwd=tmpdir) +- sh___("{exe} ../{zipfile} ??*.* README".format(**locals()), cwd=tmpdir) ++ sh___("printf '%s\\n' ??*.* README | {exe} ../{zipfile} -@".format(**locals()), cwd=tmpdir) self.assertGreater(os.path.getsize(zipfile), 10) def test_10004_make_test4_zip(self) -> None: """ create a test4.zip for later tests using standard 'zip' -@@ -383,7 +383,7 @@ class ZZipTest(unittest.TestCase): +@@ -387,7 +387,7 @@ class ZZipTest(unittest.TestCase): filename = os.path.join(tmpdir, "README") filetext = self.readme() self.mkfile(filename, filetext) -- shell("{exe} -n README ../{zipfile} ??*.* README".format(**locals()), cwd=tmpdir) -+ shell("printf '%s\\n' ??*.* README | {exe} -n README ../{zipfile} -@".format(**locals()), cwd=tmpdir) +- sh___("{exe} -n README ../{zipfile} ??*.* README".format(**locals()), cwd=tmpdir) ++ sh___("printf '%s\\n' ??*.* README | {exe} -n README ../{zipfile} -@".format(**locals()), cwd=tmpdir) self.assertGreater(os.path.getsize(zipfile), 1000000) def test_10005_make_test5_zip(self) -> None: """ create a test5.zip for later tests using standard 'zip' -@@ -407,7 +407,7 @@ class ZZipTest(unittest.TestCase): +@@ -411,7 +411,7 @@ class ZZipTest(unittest.TestCase): filename = os.path.join(tmpdir, "README") filetext = self.readme() self.mkfile(filename, filetext) -- shell("{exe} ../{zipfile} -r file* subdir* README".format(**locals()), cwd=tmpdir) -+ shell("printf '%s\\n' file* subdir* README | {exe} ../{zipfile} -r -@".format(**locals()), cwd=tmpdir) +- sh___("{exe} ../{zipfile} -r file* subdir* README".format(**locals()), cwd=tmpdir) ++ sh___("printf '%s\\n' file* subdir* README | {exe} ../{zipfile} -r -@".format(**locals()), cwd=tmpdir) self.assertGreater(os.path.getsize(zipfile), 1000000) def test_10010_make_test0_dat(self) -> None: """ create test.dat from test.zip with xorcopy """ -- 2.48.1 - -From f420844f6d4dab38ef3159d4e8f4db406e53c4a0 Mon Sep 17 00:00:00 2001 -From: Luc Schrijvers -Date: Wed, 21 May 2025 12:56:20 +0200 -Subject: Fix install path for pkgconfig files - - -diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt -index 646903b..c300011 100644 ---- a/zzip/CMakeLists.txt -+++ b/zzip/CMakeLists.txt -@@ -304,7 +304,7 @@ set(outdir ${CMAKE_CURRENT_BINARY_DIR}) - - if(ZZIP_PKGCONFIG) - install(FILES ${outdir}/zziplib.pc ${outdir}/zzipmmapped.pc ${outdir}/zzipfseeko.pc -- DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig" ) -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" ) - endif() - - install(FILES ${libzzip_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) --- -2.48.1 - diff --git a/dev-libs/zziplib/zziplib-0.13.79.recipe b/dev-libs/zziplib/zziplib-0.13.80.recipe similarity index 94% rename from dev-libs/zziplib/zziplib-0.13.79.recipe rename to dev-libs/zziplib/zziplib-0.13.80.recipe index 50f1d20a0..ce2e92179 100644 --- a/dev-libs/zziplib/zziplib-0.13.79.recipe +++ b/dev-libs/zziplib/zziplib-0.13.80.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="ed6f3017bb353b4a8f730c31a2fa065adb2d264c00d922aada48a5893eda26e4" +CHECKSUM_SHA256="21f40d111c0f7a398cfee3b0a30b20c5d92124b08ea4290055fbfe7bdd53a22c" SOURCE_FILENAME="zziplib-v$portVersion.tar.gz" PATCHES="zziplib-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="13.0.79" +libVersion="13.0.80" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -67,10 +67,13 @@ REQUIRES_tools=" ARCHITECTURES_doc="any" PROVIDES_doc=" - zziplib${secondaryArchSuffix}_doc = $portVersion + zziplib_doc = $portVersion " REQUIRES_doc=" - zziplib$secondaryArchSuffix == $portVersion base + " + +REPLACES_doc=" + zziplib_x86_doc " BUILD_REQUIRES="