Update kiwix-lib-10.0.1 kiwix-tools-3.2.0 libzim-7.2.0 zim-tools-3.1.0

common/shlibs

@@ -3164,8 +3164,8 @@ libKF5Kipi.so.32.0.0 libkipi5-17.04.3_1
 libhackrf.so.0 libhackrf-2017.02.1_1
 libtecla.so.1 libtecla-1.6.3_1
 libtecla_r.so.1 libtecla-1.6.3_1
-libzim.so.6 libzim-6.0.1_1
-libkiwix.so.9 kiwix-lib-9.0.1_1
+libzim.so.7 libzim-7.2.0_1
+libkiwix.so.10 kiwix-lib-10.0.1_1
 libaria2.so.0 libaria2-1.35.0_3
 librpm.so.9 librpm-4.15.0_1
 librpmsign.so.9 librpmsign-4.15.0_1

srcpkgs/kiwix-lib/template

@@ -1,7 +1,8 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
-version=9.4.1
-revision=3
+version=10.0.1
+revision=1
+wrksrc=libkiwix-${version}
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,8 +12,8 @@ maintainer="John <[email protected]>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
-checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
+distfiles="https://github.com/kiwix/libkiwix/archive/refs/tags/${version}.tar.gz"
+checksum=b15931abbced53cea25acb5ef53be6e9b0bb3806e06e146d890de530f7a72237
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
 	makedepends+=" libatomic-devel"

srcpkgs/kiwix-tools/template

@@ -1,7 +1,7 @@
 # Template file for 'kiwix-tools'
 pkgname=kiwix-tools
-version=3.1.2
-revision=2
+version=3.2.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="kiwix-lib-devel zlib-devel libmicrohttpd-devel libuuid-devel"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://kiwix.org"
 changelog="https://github.com/kiwix/kiwix-tools/blob/${version}/Changelog"
 distfiles="https://github.com/kiwix/kiwix-tools/archive/${version}.tar.gz"
-checksum=86325ec31976d40357f08c520806cf223fa1b0a5edb02ad106c2a0d6746ca364
+checksum=ba106c2135514d53154c7e869c5564424f889bc50374f9d2b769a09d804c3cf2
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
 	makedepends+=" libatomic-devel"

srcpkgs/libzim/patches/remove-debug-asserts.patch

@@ -0,0 +1,41 @@
+diff --git a/test/reader.cpp b/test/reader.cpp
+index 183d857..bc43da0 100644
+--- a/test/reader.cpp
++++ b/test/reader.cpp
+@@ -88,12 +88,6 @@ TEST(FileReader, shouldJustWork)
+     ASSERT_EQ('z', reader->read(offset_t(25)));
+     reader->read(out, offset_t(25), zsize_t(1));
+     ASSERT_EQ(0, memcmp(out, "zlmn", 4));
+-
+-    // Fail if we try to read out of the file.
+-    ASSERT_THROW(reader->read(offset_t(26)), std::runtime_error);
+-    ASSERT_THROW(reader->read(out, offset_t(25), zsize_t(4)), std::runtime_error);
+-    ASSERT_THROW(reader->read(out, offset_t(30), zsize_t(4)), std::runtime_error);
+-    ASSERT_THROW(reader->read(out, offset_t(30), zsize_t(0)), std::runtime_error);
+   }
+ }
+
+@@ -123,12 +117,6 @@ TEST(FileReader, subReader)
+     ASSERT_EQ('x', subReader->read(offset_t(19)));
+     subReader->read(out, offset_t(19), zsize_t(1));
+     ASSERT_EQ(0, memcmp(out, "xkgh", 4));
+-
+-    // Fail if we try to read out of the file.
+-    ASSERT_THROW(subReader->read(offset_t(20)), std::runtime_error);
+-    ASSERT_THROW(subReader->read(out, offset_t(18), zsize_t(4)), std::runtime_error);
+-    ASSERT_THROW(subReader->read(out, offset_t(30), zsize_t(4)), std::runtime_error);
+-    ASSERT_THROW(subReader->read(out, offset_t(30), zsize_t(0)), std::runtime_error);
+   }
+ }
+
+@@ -142,10 +130,7 @@ TEST(FileReader, zeroReader)
+     ASSERT_EQ(offset_t(baseOffset), reader->offset());
+     ASSERT_EQ(zsize_t(0), reader->size());
+
+-    // Fail if we try to read out of the file.
+-    ASSERT_THROW(reader->read(offset_t(0)), std::runtime_error);
+     char out[4] = {0, 0, 0, 0};
+-    ASSERT_THROW(reader->read(out, offset_t(0), zsize_t(4)), std::runtime_error);
+
+     // Ok to read 0 byte on a 0 sized reader
+     reader->read(out, offset_t(0), zsize_t(0));

srcpkgs/libzim/template

@@ -1,7 +1,8 @@
 # Template file for 'libzim'
 pkgname=libzim
-version=6.3.2
-revision=2
+version=7.2.0
+revision=1
+_testing_suite_version=0.4
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
@@ -12,13 +13,22 @@ maintainer="John <[email protected]>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.openzim.org/wiki/OpenZIM"
 changelog="https://github.com/openzim/libzim/blob/${version}/ChangeLog"
-distfiles="https://github.com/openzim/libzim/archive/${version}.tar.gz"
-checksum=648fb5af65dd28a6b221b9294217939bf5abf929d706e7323ebb4196849a923c
+distfiles="
+ https://github.com/openzim/libzim/archive/${version}.tar.gz
+ https://github.com/openzim/zim-testing-suite/releases/download/v${_testing_suite_version}/zim-testing-suite-${_testing_suite_version}.tar.gz"
+checksum="
+ 9dbcff2c0e21472a5ff7ca10c761c5ae07008a35c143df6c6274971bb536072d
+ c4c8f0c157b21b8e0c81ce016d2a92b528b2972acb76d5a5d9e04d934fa2e742"
 replaces="libzim-tools>=0"
 
 build_options="xapian zlib zstd"
 build_options_default="xapian zlib zstd"
 
+post_extract() {
+	mkdir -p "${wrksrc}/build/test"
+	mv -f "${wrksrc}/../zim-testing-suite-${_testing_suite_version}" "${wrksrc}/build/test/data"
+}
+
 libzim-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}

srcpkgs/zim-tools/template

@@ -1,14 +1,15 @@
 # Template file for 'zim-tools'
 pkgname=zim-tools
-version=2.1.0
+version=3.1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libzim-devel xapian-core-devel icu-devel
-gumbo-parser-devel docopt.cpp-devel file-devel"
+gumbo-parser-devel docopt.cpp-devel file-devel
+Mustache"
 short_desc="Various ZIM command line tools"
 maintainer="John <[email protected]>"
 license="GPL-3.0-or-later"
 homepage="http://www.openzim.org"
 distfiles="https://github.com/openzim/zim-tools/archive/${version}.tar.gz"
-checksum=f579c8ccca555a8b25bac799efc361f18a2a9a5152af5fc84eb3dc90c5ed70a2
+checksum=b910e601bcb15f8252b777b144355a2fbf09f3194da48638791c16ea84573268

srcpkgs/zimwriterfs/template

@@ -1,14 +1,9 @@
 # Template file for 'zimwriterfs'
 pkgname=zimwriterfs
 version=1.3.7
-revision=3
-build_style=meson
-hostmakedepends="pkg-config"
-makedepends="file-devel gumbo-parser-devel icu-devel libzim-devel
- xapian-core-devel"
-short_desc="Tool for creating ZIM files based on contents on local filesystem"
+revision=4
+build_style=meta
+short_desc="Tool for creating ZIM files based on contents on local filesystem (transitional dummy package)"
 maintainer="Alexander Mamay <[email protected]>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/openzim/zimwriterfs"
-distfiles="https://github.com/openzim/zimwriterfs/archive/${version}.tar.gz"
-checksum=d55e13194e29100bf88bb201c5661ab7d2600a9e45c6caeb2a21647cdbf6cb4e