Hi, ports@:
Here is a patch for www/kiwix:
i) Update to www/kiwix/kiwix-tools to 3.6.0
ii) Update to www/kiwix/libkiwix to 9.0.0
iii) Remove the patch which had been included upstream
Both buil well and run well, all tests of www/kiwix/libkiwix
passed, on amd64-current system.
Cheers !
wenIndex: www/kiwix/kiwix-tools/Makefile
===================================================================
RCS file: /cvs/ports/www/kiwix/kiwix-tools/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- www/kiwix/kiwix-tools/Makefile 2 Sep 2023 10:11:10 -0000 1.2
+++ www/kiwix/kiwix-tools/Makefile 15 Dec 2023 02:00:48 -0000
@@ -1,7 +1,7 @@
COMMENT = command-line Kiwix tools
KIWIX_PROJECT = kiwix-tools
-V = 3.5.0
+V = 3.6.0
# GPLv3+
PERMIT_PACKAGE = Yes
Index: www/kiwix/kiwix-tools/distinfo
===================================================================
RCS file: /cvs/ports/www/kiwix/kiwix-tools/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- www/kiwix/kiwix-tools/distinfo 2 Sep 2023 10:11:10 -0000 1.2
+++ www/kiwix/kiwix-tools/distinfo 15 Dec 2023 02:00:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (kiwix-tools-3.5.0.tar.xz) =
TQz5/gLrETapYv+VrnsVTduOoWgR0wewCCLL4OM+y2A=
-SIZE (kiwix-tools-3.5.0.tar.xz) = 528788
+SHA256 (kiwix-tools-3.6.0.tar.xz) =
+kLfhNb/8f4BoVluOFIk5/oetxObgrQabml2xmBsT+o=
+SIZE (kiwix-tools-3.6.0.tar.xz) = 529468
Index: www/kiwix/libkiwix/Makefile
===================================================================
RCS file: /cvs/ports/www/kiwix/libkiwix/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- www/kiwix/libkiwix/Makefile 2 Sep 2023 10:10:42 -0000 1.3
+++ www/kiwix/libkiwix/Makefile 15 Dec 2023 02:00:48 -0000
@@ -1,7 +1,7 @@
COMMENT = common code base for all Kiwix ports
KIWIX_PROJECT = libkiwix
-V = 12.1.0
+V = 13.0.0
SHARED_LIBS += kiwix 0.0 # 0.0
Index: www/kiwix/libkiwix/distinfo
===================================================================
RCS file: /cvs/ports/www/kiwix/libkiwix/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- www/kiwix/libkiwix/distinfo 2 Sep 2023 10:10:42 -0000 1.2
+++ www/kiwix/libkiwix/distinfo 15 Dec 2023 02:00:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (libkiwix-12.1.0.tar.xz) = YCr/rO6JwXJfAGHj4BMFofm2rtm1Ck7Zg0ZYhvbjRMc=
-SIZE (libkiwix-12.1.0.tar.xz) = 964212
+SHA256 (libkiwix-13.0.0.tar.xz) = CGNdxLU25IUJA9QxMeKpXqbhCNOW+tSVt465+PpMg2o=
+SIZE (libkiwix-13.0.0.tar.xz) = 981104
Index: www/kiwix/libkiwix/patches/patch-meson_build
===================================================================
RCS file: www/kiwix/libkiwix/patches/patch-meson_build
diff -N www/kiwix/libkiwix/patches/patch-meson_build
--- www/kiwix/libkiwix/patches/patch-meson_build 23 Aug 2023 06:26:08
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-https://github.com/kiwix/libkiwix/issues/877
-Index: meson.build
---- meson.build.orig
-+++ meson.build
-@@ -1,7 +1,7 @@
- project('libkiwix', 'cpp',
- version : '12.0.0',
- license : 'GPLv3+',
-- default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true'])
-+ default_options : ['c_std=c11', 'cpp_std=c++14', 'werror=true'])
-
- compiler = meson.get_compiler('cpp')
-
Index: www/kiwix/libkiwix/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/kiwix/libkiwix/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- www/kiwix/libkiwix/pkg/PLIST 13 May 2023 05:12:58 -0000 1.1.1.1
+++ www/kiwix/libkiwix/pkg/PLIST 15 Dec 2023 02:00:48 -0000
@@ -8,10 +8,8 @@ include/kiwix/downloader.h
include/kiwix/kiwix_config.h
include/kiwix/kiwixserve.h
include/kiwix/library.h
-include/kiwix/libxml_dumper.h
include/kiwix/manager.h
include/kiwix/name_mapper.h
-include/kiwix/opds_dumper.h
include/kiwix/search_renderer.h
include/kiwix/server.h
include/kiwix/tools.h
