Here is the revised patch, now SHARED_LIBS bumped to 2.0. It build and run well.
There are 6 tests failed(sometimes 4 failed), compared to current 8.2.1 version in porttree, 9.0 has less tests failed. And Only one port(www/kiwix/libkiwix) depends on libzim, it build well with this patch and passed all tests. wen ________________________________________ 发件人: Klemens Nanni <[email protected]> 发送时间: 2023年12月15日 19:46 收件人: wen heping 抄送: [email protected] 主题: Re: archivers/libzim: Update to 9.0.0 On Fri, Dec 15, 2023 at 01:24:33AM +0000, wen heping wrote: > Hi, ports@: > > Here is a patch for archivers/libzim: > i) Update to 9.0.0 > ii) Remove the patch which had been included upstream > > It build well and run well on amd64-current system. > Only one port(www/kiwix/libkiwix) depends on libzim, > build well with thsi patch and passed all tests. libzim tests do fail, however: 8.2.1: Ok: 18 Expected Fail: 0 Fail: 8 Unexpected Pass: 0 Skipped: 0 Timeout: 3 9.0.0: Ok: 22 Expected Fail: 0 Fail: 6 Unexpected Pass: 0 Skipped: 0 Timeout: 1 Tests also fill up /tmp/ without cleaning up after themselves. TEST_ENV = TMPDIR=${WRKDIR} keeps /tmp/ clean, but it only fixes some failure cases. > > > Cheers ! > wen > Index: Makefile > =================================================================== > RCS file: /cvs/ports/archivers/libzim/Makefile,v > retrieving revision 1.4 > diff -u -p -r1.4 Makefile > --- Makefile 5 Sep 2023 14:59:17 -0000 1.4 > +++ Makefile 15 Dec 2023 01:20:02 -0000 > @@ -1,6 +1,6 @@ > COMMENT = reference implementation of the ZIM specification > > -DISTNAME = libzim-8.2.1 > +DISTNAME = libzim-9.0.0 > > SHARED_LIBS += zim 1.0 # 0.0 Needs a major bump due to removal of dynamically exported symbols. > > Index: distinfo > =================================================================== > RCS file: /cvs/ports/archivers/libzim/distinfo,v > retrieving revision 1.2 > diff -u -p -r1.2 distinfo > --- distinfo 23 Aug 2023 06:24:44 -0000 1.2 > +++ distinfo 15 Dec 2023 01:20:02 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (libzim-8.2.1.tar.xz) = /N20AMtxssIdXahv1gbg9FCDhz8N9dRSk0WFWjm1cHw= > -SIZE (libzim-8.2.1.tar.xz) = 195324 > +SHA256 (libzim-9.0.0.tar.xz) = 72AAbvZuwtpIHA7dx4tuRy5KBuNxzaGYorPZG7daeQw= > +SIZE (libzim-9.0.0.tar.xz) = 196000 > Index: patches/patch-meson_build > =================================================================== > RCS file: patches/patch-meson_build > diff -N patches/patch-meson_build > --- patches/patch-meson_build 23 Aug 2023 06:24:44 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,13 +0,0 @@ > -https://github.com/openzim/libzim/issues/757 > -Index: meson.build > ---- meson.build.orig > -+++ meson.build > -@@ -1,7 +1,7 @@ > - project('libzim', ['c', 'cpp'], > - version : '8.2.1', > - license : 'GPL2', > -- default_options : ['c_std=c11', 'cpp_std=c++11']) > -+ default_options : ['c_std=c11', 'cpp_std=c++14']) > - > - if build_machine.system() != 'windows' > - add_project_arguments('-D_LARGEFILE64_SOURCE=1', > '-D_FILE_OFFSET_BITS=64', language: 'cpp')
Index: Makefile =================================================================== RCS file: /cvs/ports/archivers/libzim/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- Makefile 5 Sep 2023 14:59:17 -0000 1.4 +++ Makefile 19 Dec 2023 02:36:14 -0000 @@ -1,8 +1,8 @@ COMMENT = reference implementation of the ZIM specification -DISTNAME = libzim-8.2.1 +DISTNAME = libzim-9.0.0 -SHARED_LIBS += zim 1.0 # 0.0 +SHARED_LIBS += zim 2.0 # 0.0 CATEGORIES = archivers Index: distinfo =================================================================== RCS file: /cvs/ports/archivers/libzim/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 23 Aug 2023 06:24:44 -0000 1.2 +++ distinfo 19 Dec 2023 02:36:14 -0000 @@ -1,2 +1,2 @@ -SHA256 (libzim-8.2.1.tar.xz) = /N20AMtxssIdXahv1gbg9FCDhz8N9dRSk0WFWjm1cHw= -SIZE (libzim-8.2.1.tar.xz) = 195324 +SHA256 (libzim-9.0.0.tar.xz) = 72AAbvZuwtpIHA7dx4tuRy5KBuNxzaGYorPZG7daeQw= +SIZE (libzim-9.0.0.tar.xz) = 196000 Index: patches/patch-meson_build =================================================================== RCS file: patches/patch-meson_build diff -N patches/patch-meson_build --- patches/patch-meson_build 23 Aug 2023 06:24:44 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -https://github.com/openzim/libzim/issues/757 -Index: meson.build ---- meson.build.orig -+++ meson.build -@@ -1,7 +1,7 @@ - project('libzim', ['c', 'cpp'], - version : '8.2.1', - license : 'GPL2', -- default_options : ['c_std=c11', 'cpp_std=c++11']) -+ default_options : ['c_std=c11', 'cpp_std=c++14']) - - if build_machine.system() != 'windows' - add_project_arguments('-D_LARGEFILE64_SOURCE=1', '-D_FILE_OFFSET_BITS=64', language: 'cpp')
