Re: [PR PATCH] [Updated] Update kiwix-lib-10.0.1 kiwix-tools-3.2.0 libzim-7.2.0 zim-tools-3.1.0

[Animeshz <Animeshz@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 514 bytes --]

There is an updated pull request by Animeshz against master on the void-packages repository

https://github.com/Animeshz/void-packages kiwix
https://github.com/void-linux/void-packages/pull/35607

Update kiwix-lib-10.0.1 kiwix-tools-3.2.0 libzim-7.2.0 zim-tools-3.1.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


A patch file from https://github.com/void-linux/void-packages/pull/35607.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kiwix-35607.patch --]
[-- Type: text/x-diff, Size: 7687 bytes --]

From 7e548fc5145b9a4dbe2f1d90b4bb15f28fe6ea94 Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Mon, 14 Feb 2022 12:24:24 +0530
Subject: [PATCH 1/4] libzim: update to 7.2.0

---
 common/shlibs                         |  2 +-
 srcpkgs/libzim/patches/execinfo.patch | 20 --------------------
 srcpkgs/libzim/template               | 18 ++++++++++++++----
 3 files changed, 15 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/libzim/patches/execinfo.patch

diff --git a/common/shlibs b/common/shlibs
index 0c60260b4642..46720a76ceba 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3164,7 +3164,7 @@ 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
+libzim.so.7 libzim-7.2.0_1
 libkiwix.so.9 kiwix-lib-9.0.1_1
 libaria2.so.0 libaria2-1.35.0_3
 librpm.so.9 librpm-4.15.0_1
diff --git a/srcpkgs/libzim/patches/execinfo.patch b/srcpkgs/libzim/patches/execinfo.patch
deleted file mode 100644
index f3a1234562ea..000000000000
--- a/srcpkgs/libzim/patches/execinfo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/debug.h	2018-03-27 11:19:24.000000000 +0200
-+++ b/src/debug.h	2018-03-27 11:19:24.000000000 +0200
-@@ -24,7 +24,7 @@
- # define ASSERT(left, operator, right) (void(0))
- #else
- 
--#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__)
-+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) && defined(__GLIBC__)
- #include <execinfo.h>
- #endif
- 
-@@ -35,7 +35,7 @@
-       vara << "[" << a << "] " << op << " " << varb << "[" << b << "]" <<
-       std::endl;
- 
--#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__)
-+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) && defined(__GLIBC__)
-   void *callstack[64];
-   size_t size;
-   size = backtrace(callstack, 64);
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index 910e099870b8..70d7a8f26400 100644
--- a/srcpkgs/libzim/template
+++ b/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 <me@johnnynator.dev>"
 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}

From 6b97995c52fbc16badad70058c6658dc9c669363 Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Mon, 14 Feb 2022 12:36:57 +0530
Subject: [PATCH 2/4] zim-tools: update to 3.1.0

---
 srcpkgs/zim-tools/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zim-tools/template b/srcpkgs/zim-tools/template
index aeed97a5a7c1..e11183ffc2a9 100644
--- a/srcpkgs/zim-tools/template
+++ b/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 <me@johnnynator.dev>"
 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

From 2943289b446b379e625f70ea501bae06c27637a7 Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Mon, 14 Feb 2022 13:23:32 +0530
Subject: [PATCH 3/4] kiwix-lib: update to 10.0.1

---
 common/shlibs              | 2 +-
 srcpkgs/kiwix-lib/template | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 46720a76ceba..9388091e0d60 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3165,7 +3165,7 @@ 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.7 libzim-7.2.0_1
-libkiwix.so.9 kiwix-lib-9.0.1_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
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index 2daaa6fd404b..6d926bde4249 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/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 <me@johnnynator.dev>"
 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"

From 8ea2239f8c9b8d4aa1939410c05f44af7b754de8 Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Mon, 14 Feb 2022 13:25:58 +0530
Subject: [PATCH 4/4] kiwix-tools: update to 3.2.0

---
 srcpkgs/kiwix-tools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kiwix-tools/template b/srcpkgs/kiwix-tools/template
index e9f0841b61ae..3a6933c0eb8f 100644
--- a/srcpkgs/kiwix-tools/template
+++ b/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"