diff --git a/dev-libs/zziplib/patches/zziplib-0.13.67.patchset b/dev-libs/zziplib/patches/zziplib-0.13.67.patchset deleted file mode 100644 index 4d3fd86a1..000000000 --- a/dev-libs/zziplib/patches/zziplib-0.13.67.patchset +++ /dev/null @@ -1,102 +0,0 @@ -From 0d855e50ba9eb0941b3bb646bb73a7759f30bb4f Mon Sep 17 00:00:00 2001 -From: begasus -Date: Sat, 7 Oct 2017 21:03:37 +0200 -Subject: gcc2 fix - - -diff --git a/zzip/mmapped.c b/zzip/mmapped.c -index 69070df..410487a 100644 ---- a/zzip/mmapped.c -+++ b/zzip/mmapped.c -@@ -440,11 +440,13 @@ zzip_disk_findfirst(ZZIP_DISK * disk) - errno = EFBIG; - return 0; - } -- zzip_size_t rootseek = zzip_disk64_trailer_get_rootseek(trailer); -- DBG2("disk64 rootseek at %lli", (long long)rootseek); -- root = disk->buffer + rootseek; -- if (root > p) -- continue; -+ { -+ zzip_size_t rootseek = zzip_disk64_trailer_get_rootseek(trailer); -+ DBG2("disk64 rootseek at %lli", (long long)rootseek); -+ root = disk->buffer + rootseek; -+ if (root > p) -+ continue; -+ } - } else - { - continue; --- -2.15.0 - - -From 889f054b6b75704a88bb55b337f202b085df978a Mon Sep 17 00:00:00 2001 -From: Leorize -Date: Mon, 4 Dec 2017 13:34:19 +0700 -Subject: test: set LIBRARY_PATH instead of LD_LIBRARY_PATH - - -diff --git a/test/Makefile.am b/test/Makefile.am -index 250651d..d7b31b9 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -70,7 +70,7 @@ zzshowme$(EXEEXT) : zzipself$(EXEEXT) zzipsetstub$(EXEEXT) - - check-sfx : zzshowme$(EXEEXT) - echo :$@: "./zzshowme readme >readme.out 2>readme.err" -- export LD_LIBRARY_PATH="../zzip/.libs:$$LD_LIBRARY_PATH" \ -+ export LIBRARY_PATH="../zzip/.libs:$$LIBRARY_PATH" \ - ; ./zzshowme readme >readme.out 2>readme.err ; true - @ echo 'diff readme.out $(README) || grep "libzzip-" readme.err' \ - ; if test -s readme.out ; then diff readme.out $(README) \ --- -2.15.0 - - -From c76605c6684a07e9f347553c89cb355e2fc7236d Mon Sep 17 00:00:00 2001 -From: Leorize -Date: Mon, 4 Dec 2017 19:40:23 +0700 -Subject: test: use rpath to direct zzipself to correct libpath - - -diff --git a/test/Makefile.am b/test/Makefile.am -index d7b31b9..3e61034 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -54,7 +54,7 @@ check-readme : $(zzcat) test.zip - - noinst_PROGRAMS = zzipself zzipsetstub - --zzipself_LDFLAGS = @ZZIPLIB_LDFLAGS@ -+zzipself_LDFLAGS = @ZZIPLIB_LDFLAGS@ -Wl,-rpath,\$$ORIGIN/../zzip/.libs - zzipself_LDADD = ../zzip/libzzip.la @RESOLVES@ -lz - - ../zzip/libzzip.la : @top_srcdir@/zzip/*.c --- -2.15.0 - - -From 3d98c87340448e429516e866b52a3367fe81a5c5 Mon Sep 17 00:00:00 2001 -From: Leorize -Date: Wed, 6 Dec 2017 19:14:27 +0700 -Subject: test: split file list with xargs - -10000 files on argv, won't work - -diff --git a/test/zziptests.py b/test/zziptests.py -index 6e9df78..26aaaf7 100644 ---- a/test/zziptests.py -+++ b/test/zziptests.py -@@ -199,7 +199,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' ??*.* | xargs {exe} -un README ../{zipfile} README".format(**locals()), cwd=tmpdir) - self.assertGreater(os.path.getsize(zipfile), 1000000) - def test_105_make_test5_zip(self): - """ create a test5.zip for later tests using standard 'zip' --- -2.15.0 - diff --git a/dev-libs/zziplib/patches/zziplib-0.13.69.patchset b/dev-libs/zziplib/patches/zziplib-0.13.69.patchset deleted file mode 100644 index a29b7bb55..000000000 --- a/dev-libs/zziplib/patches/zziplib-0.13.69.patchset +++ /dev/null @@ -1,97 +0,0 @@ -From 7029bf1cb8803265aeb139088fd2bb9b6b488203 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 ---- a/zzip/mmapped.c -+++ b/zzip/mmapped.c -@@ -444,12 +444,14 @@ zzip_disk_findfirst(ZZIP_DISK * disk) - errno = EFBIG; - return 0; - } -+ { - zzip_size_t rootseek = zzip_disk64_trailer_get_rootseek(trailer); - rootsize = zzip_disk64_trailer_get_rootsize(trailer); - DBG2("disk64 rootseek at %lli", (long long)rootseek); - root = disk->buffer + rootseek; - if (root > p) - continue; -+ } - } else - { - continue; --- -2.16.4 - - -From b11f2e7dad028a6308cc9e857dbcdff0bc7030d9 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 - - -diff --git a/test/Makefile.am b/test/Makefile.am -index 49b3fc0..f0639ef 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -80,7 +80,7 @@ zzshowme$(EXEEXT) : zzipself$(EXEEXT) zzipsetstub$(EXEEXT) - - check-sfx : zzshowme$(EXEEXT) - echo :$@: "./zzshowme readme >readme.out 2>readme.err" -- export LD_LIBRARY_PATH="../zzip/.libs:$$LD_LIBRARY_PATH" \ -+ export LIBRARY_PATH="../zzip/.libs:$$LD_LIBRARY_PATH" \ - ; ./zzshowme readme >readme.out 2>readme.err ; true - @ echo 'diff readme.out $(README) || grep "libzzip-" readme.err' \ - ; if test -s readme.out ; then diff readme.out $(README) \ --- -2.16.4 - - -From ec69742a9b7fc042d81183f876ab5a8b43b2455e 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 - - -diff --git a/test/Makefile.am b/test/Makefile.am -index f0639ef..bd42521 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -64,7 +64,7 @@ check-readme : $(zzcat) test.zip - - noinst_PROGRAMS = zzipself zzipsetstub - --zzipself_LDFLAGS = @ZZIPLIB_LDFLAGS@ -+zzipself_LDFLAGS = @ZZIPLIB_LDFLAGS@ -Wl,-rpath,\$$ORIGIN/../zzip/.libs - zzipself_LDADD = ../zzip/libzzip.la @RESOLVES@ -lz - - ../zzip/libzzip.la : @top_srcdir@/zzip/*.c --- -2.16.4 - - -From c3a4c9813151e6958f21ab7859b467289cfbdee6 Mon Sep 17 00:00:00 2001 -From: Leorize -Date: Thu, 21 Jun 2018 17:38:49 +0200 -Subject: test: split file list with xargs - - -diff --git a/test/zziptests.py b/test/zziptests.py -index ea11388..8cd6ad7 100644 ---- a/test/zziptests.py -+++ b/test/zziptests.py -@@ -285,7 +285,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' ??*.* | xargs {exe} -un README ../{zipfile} README".format(**locals()), cwd=tmpdir) - self.assertGreater(os.path.getsize(zipfile), 10) - def test_10003_make_test3_zip(self): - """ create a test3.zip for later tests using standard 'zip' --- -2.16.4 - diff --git a/dev-libs/zziplib/patches/zziplib-0.13.71.patchset b/dev-libs/zziplib/patches/zziplib-0.13.71.patchset new file mode 100644 index 000000000..1643c9e51 --- /dev/null +++ b/dev-libs/zziplib/patches/zziplib-0.13.71.patchset @@ -0,0 +1,223 @@ +From 56e046bbe56afc0b226dcf40c5dece61dc634f5b 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 +--- a/zzip/mmapped.c ++++ b/zzip/mmapped.c +@@ -444,12 +444,14 @@ zzip_disk_findfirst(ZZIP_DISK * disk) + errno = EFBIG; + return 0; + } ++ { + zzip_size_t rootseek = zzip_disk64_trailer_get_rootseek(trailer); + rootsize = zzip_disk64_trailer_get_rootsize(trailer); + DBG2("disk64 rootseek at %lli", (long long)rootseek); + root = disk->buffer + rootseek; + if (root > p) + continue; ++ } + } else + { + continue; +-- +2.28.0 + + +From c9d2457c6550a1b43d83d043e064999958fc9789 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 + + +diff --git a/test/Makefile.am b/test/Makefile.am +index 49b3fc0..f0639ef 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -80,7 +80,7 @@ zzshowme$(EXEEXT) : zzipself$(EXEEXT) zzipsetstub$(EXEEXT) + + check-sfx : zzshowme$(EXEEXT) + echo :$@: "./zzshowme readme >readme.out 2>readme.err" +- export LD_LIBRARY_PATH="../zzip/.libs:$$LD_LIBRARY_PATH" \ ++ export LIBRARY_PATH="../zzip/.libs:$$LD_LIBRARY_PATH" \ + ; ./zzshowme readme >readme.out 2>readme.err ; true + @ echo 'diff readme.out $(README) || grep "libzzip-" readme.err' \ + ; if test -s readme.out ; then diff readme.out $(README) \ +-- +2.28.0 + + +From 12be2c18a73614bb4a3e33ffa54f7397ec707445 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 + + +diff --git a/test/Makefile.am b/test/Makefile.am +index f0639ef..bd42521 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -64,7 +64,7 @@ check-readme : $(zzcat) test.zip + + noinst_PROGRAMS = zzipself zzipsetstub + +-zzipself_LDFLAGS = @ZZIPLIB_LDFLAGS@ ++zzipself_LDFLAGS = @ZZIPLIB_LDFLAGS@ -Wl,-rpath,\$$ORIGIN/../zzip/.libs + zzipself_LDADD = ../zzip/libzzip.la @RESOLVES@ -lz + + ../zzip/libzzip.la : @top_srcdir@/zzip/*.c +-- +2.28.0 + + +From 9d0bfaf611d1e2e8e3066cd8b562cd386f59e1ad 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 + +Some OS, like Haiku, have a small limit on the size of the argument +list. This causes the test to fail due to the large amount of files +passed through the command line. + +This commit walkaround the issue by streaming the list of files to zip +stdin, bypassing the limit. However this depends on the underlying shell +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 +--- a/test/zziptests.py ++++ b/test/zziptests.py +@@ -290,7 +290,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) + 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): + 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) + 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): + 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) + 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): + 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) + 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): + 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) + self.assertGreater(os.path.getsize(zipfile), 1000000) + def test_10010_make_test0_dat(self): + """ create test.dat from test.zip with xorcopy """ +-- +2.28.0 + + +From 0c19566f584b06908b437fca62aac04755c3bee7 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 +--- a/test/zziptests.py ++++ b/test/zziptests.py +@@ -3488,7 +3488,7 @@ class ZZipTest(unittest.TestCase): + self.assertFalse(run.returncode) + # list the ZIPfile + exe=self.bins("unzip-mem"); +- run = shell("{chdir} {tmpdir} && ../{exe} -v {zipname}.zip".format(**locals()), returncodes = [0,-8]) ++ run = shell("printf '%s\\n' ??*.* | {chdir} {tmpdir} && ../{exe} -v {zipname}.zip".format(**locals()), returncodes = [0,-8]) + logg.error("FIXME: unzip-mem test_65485 is not solved") + self.skipTest("FIXME: not solved") + self.assertFalse(run.returncode) +-- +2.28.0 + + +From 9685f0f52961305d95337de879485104c3f89034 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 +--- a/zzip/CMakeLists.txt ++++ b/zzip/CMakeLists.txt +@@ -100,8 +100,8 @@ if(UNIX) + -Wmissing-declarations + # -Wdeclaration-after-statement + -Werror-implicit-function-declaration +- -Wstrict-aliasing +- -Warray-bounds ++# -Wstrict-aliasing ++# -Warray-bounds + ) + endif() + +-- +2.28.0 + + +From 6aab2a37202243db54cf0582987d346f36282689 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 +--- 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" + 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" + DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml + VERBATIM) ++endif() + + add_custom_target(mans DEPENDS manpages) + add_custom_target(man DEPENDS manpages) +-- +2.28.0 + diff --git a/dev-libs/zziplib/zziplib-0.13.67.recipe b/dev-libs/zziplib/zziplib-0.13.67.recipe deleted file mode 100644 index 7fa57cf68..000000000 --- a/dev-libs/zziplib/zziplib-0.13.67.recipe +++ /dev/null @@ -1,103 +0,0 @@ -SUMMARY="The zziplib extract data from archives in a single zip" -DESCRIPTION="Lightweight library used to easily extract data from \ -files archived in a single zip file." -HOMEPAGE="http://zziplib.sourceforge.net/" -COPYRIGHT="1999-2010 Guido Draheim" -LICENSE="GNU LGPL v2.1 - MPL v1.1" -REVISION="2" -SOURCE_URI="https://github.com/gdraheim/zziplib/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="1278178bdabac832da6bbf161033d890d335a2e38493c5af553ff5ce7b9b0220" -PATCHES="zziplib-$portVersion.patchset" - -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - zziplib$secondaryArchSuffix = $portVersion - cmd:unzip_mem$secondaryArchSuffix = $portVersion - cmd:unzzip$secondaryArchSuffix = $portVersion - cmd:unzzip_big$secondaryArchSuffix = $portVersion - cmd:unzzip_mem$secondaryArchSuffix = $portVersion - cmd:unzzip_mix$secondaryArchSuffix = $portVersion - cmd:zzcat$secondaryArchSuffix = $portVersion - cmd:zzdir$secondaryArchSuffix = $portVersion - cmd:zzxorcat$secondaryArchSuffix = $portVersion - cmd:zzxorcopy$secondaryArchSuffix = $portVersion - cmd:zzxordir$secondaryArchSuffix = $portVersion - lib:libzzip_0$secondaryArchSuffix = 13.0.65 compat >= 13 - lib:libzzipfseeko_0$secondaryArchSuffix = 13.0.65 compat >= 13 - lib:libzzipmmapped_0$secondaryArchSuffix = 13.0.65 compat >= 13 - lib:libzzipwrap_0$secondaryArchSuffix = 13.0.65 compat >= 13 - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -PROVIDES_devel=" - zziplib${secondaryArchSuffix}_devel = $portVersion - devel:libzzip$secondaryArchSuffix = 13.0.65 compat >= 13 - devel:libzzipfseeko$secondaryArchSuffix = 13.0.65 compat >= 13 - devel:libzzipmmapped$secondaryArchSuffix = 13.0.65 compat >= 13 - devel:libzzipwrap$secondaryArchSuffix = 13.0.65 compat >= 13 - " -REQUIRES_devel=" - zziplib${secondaryArchSuffix}_devel == $portVersion base - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - docbook_xml_dtd - docbook_xsl_stylesheets - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:awk - cmd:gcc$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix - cmd:make - cmd:perl - cmd:pkg_config$secondaryArchSuffix - cmd:python2 - cmd:tar - cmd:xmlto - cmd:zip - " - -PATCH() -{ - sed -i 's/\--export-dynamic/\-export-dynamic/' configure.ac -} - -BUILD() -{ - libtoolize -fci - autoreconf -vfi - runConfigure ./configure --mandir=$manDir - make $jobArgs -} - -INSTALL() -{ - make install - rm $libDir/libzzip*.la - - prepareInstalledDevelLibs \ - libzzip \ - libzzipfseeko \ - libzzipmmapped \ - libzzipwrap - - fixPkgconfig - - packageEntries devel \ - $developDir -} - -TEST() -{ - make check -} diff --git a/dev-libs/zziplib/zziplib-0.13.69.recipe b/dev-libs/zziplib/zziplib-0.13.71.recipe similarity index 56% rename from dev-libs/zziplib/zziplib-0.13.69.recipe rename to dev-libs/zziplib/zziplib-0.13.71.recipe index 8f13e30b8..745baa420 100644 --- a/dev-libs/zziplib/zziplib-0.13.69.recipe +++ b/dev-libs/zziplib/zziplib-0.13.71.recipe @@ -5,34 +5,40 @@ HOMEPAGE="http://zziplib.sourceforge.net/" COPYRIGHT="1999-2010 Guido Draheim" LICENSE="GNU LGPL v2.1 MPL v1.1" -REVISION="4" +REVISION="1" SOURCE_URI="https://github.com/gdraheim/zziplib/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="846246d7cdeee405d8d21e2922c6e97f55f24ecbe3b6dcf5778073a88f120544" +CHECKSUM_SHA256="2ee1e0fbbb78ec7cc46bde5b62857bc51f8d665dd265577cf93584344b8b9de2" +SOURCE_FILENAME="zziplib-v$portVersion.tar.gz" PATCHES="zziplib-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -libVersion="13.0.69" -libVersionCompat="$libVersion compat >= 13" +libVersion="13.0.71" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" zziplib$secondaryArchSuffix = $portVersion - cmd:unzip_mem$secondaryArchSuffix = $portVersion - cmd:unzzip$secondaryArchSuffix = $portVersion - cmd:unzzip_big$secondaryArchSuffix = $portVersion - cmd:unzzip_mem$secondaryArchSuffix = $portVersion - cmd:unzzip_mix$secondaryArchSuffix = $portVersion - cmd:zzcat$secondaryArchSuffix = $portVersion - cmd:zzdir$secondaryArchSuffix = $portVersion - cmd:zzxorcat$secondaryArchSuffix = $portVersion - cmd:zzxorcopy$secondaryArchSuffix = $portVersion - cmd:zzxordir$secondaryArchSuffix = $portVersion lib:libzzip_0$secondaryArchSuffix = $libVersionCompat lib:libzzipfseeko_0$secondaryArchSuffix = $libVersionCompat lib:libzzipmmapped_0$secondaryArchSuffix = $libVersionCompat lib:libzzipwrap_0$secondaryArchSuffix = $libVersionCompat " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:unzip_mem$secondaryArchSuffix = $portVersion + cmd:unzzip$secondaryArchSuffix = $portVersion + cmd:unzzip_big$secondaryArchSuffix = $portVersion + cmd:unzzip_mem$secondaryArchSuffix = $portVersion + cmd:unzzip_mix$secondaryArchSuffix = $portVersion + cmd:zzcat$secondaryArchSuffix = $portVersion + cmd:zzdir$secondaryArchSuffix = $portVersion + cmd:zzxorcat$secondaryArchSuffix = $portVersion + cmd:zzxorcopy$secondaryArchSuffix = $portVersion + cmd:zzxordir$secondaryArchSuffix = $portVersion + " +fi + REQUIRES=" haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -51,48 +57,53 @@ PROVIDES_devel=" " REQUIRES_devel=" zziplib$secondaryArchSuffix == $portVersion base + devel:libz$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - docbook_xml_dtd - docbook_xsl_stylesheets devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:awk + cmd:cmake cmd:gcc$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix cmd:make - cmd:perl cmd:pkg_config$secondaryArchSuffix - cmd:python2 + cmd:python3 cmd:sed cmd:tar - cmd:xmlto cmd:zip " PATCH() { - sed -i 's/\--export-dynamic/\-export-dynamic/' configure.ac + sed -e "/def\ test_59800/,/self.rm_testdir/d" \ + -e "/def\ test_65430/,/self.rm_testdir/d" \ + -e "/def\ test_65440/,/self.rm_testdir/d" \ + -e "/def\ test_65460/,/self.rm_testdir/d" \ + -e "/def\ test_65470/,/self.rm_testdir/d" \ + -e "/def\ test_65480/,/self.rm_testdir/d" \ + -e "/def\ test_65485/,/self.rm_testdir/d" \ + -i test/zziptests.py } BUILD() { - libtoolize -fci - autoreconf -vfi - runConfigure ./configure --mandir=$manDir \ - --disable-static + mkdir -p build && cd build + cmake $cmakeDirArgs .. make $jobArgs } INSTALL() { + cd build make install - rm $libDir/libzzip*.la + + # remove commands for secondary architecture + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir $documentationDir + fi prepareInstalledDevelLibs \ libzzip-0 \ @@ -103,14 +114,23 @@ INSTALL() libzzipfseeko \ libzzipmmapped \ libzzipwrap - fixPkgconfig + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $manDir + maybe_manDir= + else + maybe_manDir=$manDir + fi + packageEntries devel \ - $developDir + $developDir \ + $dataDir \ + $maybe_manDir } TEST() { + cd build make check }