[PR PATCH] Update openzim/kiwix ecosystem

[PR PATCH] Update openzim/kiwix ecosystem

[cinerea0]

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

There is a new pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages kiwix
https://github.com/void-linux/void-packages/pull/46092

Update openzim/kiwix ecosystem
#### Testing the changes
- I tested the changes in this PR: **YES**

---

cc @Johnnynator 

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

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

From 2787a4ac8332679fd829a688ae39757657334b92 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 14 Sep 2023 11:52:55 -0400
Subject: [PATCH 1/4] libzim: update to 8.2.1

---
 common/shlibs                              |  2 +-
 srcpkgs/libzim/patches/disable-check.patch | 13 +++++++++++++
 srcpkgs/libzim/patches/execinfo.patch      | 20 --------------------
 srcpkgs/libzim/template                    | 20 +++++++++++++-------
 4 files changed, 27 insertions(+), 28 deletions(-)
 create mode 100644 srcpkgs/libzim/patches/disable-check.patch
 delete mode 100644 srcpkgs/libzim/patches/execinfo.patch

diff --git a/common/shlibs b/common/shlibs
index c407ffde9b8fd..80abd6cc0227e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3131,7 +3131,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.8 libzim-8.2.1_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/disable-check.patch b/srcpkgs/libzim/patches/disable-check.patch
new file mode 100644
index 0000000000000..00a70a0dd481b
--- /dev/null
+++ b/srcpkgs/libzim/patches/disable-check.patch
@@ -0,0 +1,13 @@
+# Reader test hangs indefinitely, reported upstream: https://github.com/openzim/libzim/issues/670
+diff --git a/test/meson.build b/test/meson.build
+index 20545b17b0..0263eb04e7 100644
+--- a/test/meson.build
++++ b/test/meson.build
+@@ -9,7 +9,6 @@ tests = [
+     'template',
+     'archive',
+     'iterator',
+-    'reader',
+     'find',
+     'compression',
+     'dirent_lookup',
diff --git a/srcpkgs/libzim/patches/execinfo.patch b/srcpkgs/libzim/patches/execinfo.patch
deleted file mode 100644
index f3a1234562eab..0000000000000
--- 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 cb6d1be1620a8..f916c99fc261e 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,9 +1,12 @@
 # Template file for 'libzim'
 pkgname=libzim
-version=6.3.2
-revision=5
+version=8.2.1
+revision=1
+_testsuite_version=0.4
 build_style=meson
-hostmakedepends="pkg-config git"
+build_wrksrc="${pkgname}-${version}"
+configure_args="-Dtest_data_dir=${XBPS_BUILDDIR}/${pkgname}-${version}/zim-testing-suite-${_testsuite_version}/data"
+hostmakedepends="pkg-config"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
  $(vopt_if xapian "xapian-core-devel icu-devel")
  $(vopt_if zstd libzstd-devel) gtest-devel"
@@ -11,10 +14,13 @@ short_desc="Library to read and write ZIM files"
 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
-replaces="libzim-tools>=0"
+changelog="https://raw.githubusercontent.com/openzim/libzim/main/ChangeLog"
+distfiles="https://github.com/openzim/libzim/archive/refs/tags/${version}.tar.gz
+ https://github.com/openzim/zim-testing-suite/archive/refs/tags/v${_testsuite_version}.tar.gz"
+checksum="b8296644b04b02c04d2ff1458fed829df39b54e8fd1bcd23c10440e160819f13
+ 7a4f0c773e65be6fe49d3b2159bd9c0f051e8319932ebd3474db0f77f7ea9b27"
+make_check_pre="env SKIP_BIG_MEMORY_TEST=1"
+patch_args="-Np1 -d ${build_wrksrc}"
 
 build_options="xapian zlib zstd"
 build_options_default="xapian zlib zstd"

From 6b6ddaa43b2108c7d7b4b97a75d2214c1f39bfbf Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 14 Sep 2023 11:56:08 -0400
Subject: [PATCH 2/4] zim-tools: update to 3.2.0, add dummy subpackages

libzim-tools: change to dummy subpackage, no longer replaced by libzim
zimwriterfs: change to dummy subpackage, source merged into zim-tools
---
 srcpkgs/libzim-tools          |  1 +
 srcpkgs/libzim-tools/template | 10 ----------
 srcpkgs/zim-tools/template    | 23 +++++++++++++++++++----
 srcpkgs/zimwriterfs           |  1 +
 srcpkgs/zimwriterfs/template  | 14 --------------
 5 files changed, 21 insertions(+), 28 deletions(-)
 create mode 120000 srcpkgs/libzim-tools
 delete mode 100644 srcpkgs/libzim-tools/template
 create mode 120000 srcpkgs/zimwriterfs
 delete mode 100644 srcpkgs/zimwriterfs/template

diff --git a/srcpkgs/libzim-tools b/srcpkgs/libzim-tools
new file mode 120000
index 0000000000000..3b15a55d05104
--- /dev/null
+++ b/srcpkgs/libzim-tools
@@ -0,0 +1 @@
+zim-tools
\ No newline at end of file
diff --git a/srcpkgs/libzim-tools/template b/srcpkgs/libzim-tools/template
deleted file mode 100644
index 74530543c43b5..0000000000000
--- a/srcpkgs/libzim-tools/template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'libzim-tools'
-pkgname=libzim-tools
-version=4.0.0
-revision=1
-build_style=meta
-depends="zim-tools"
-short_desc="Libzim-tool (transitional dummy package)"
-maintainer="John Zimmermann <me@johnnynator.dev>"
-license="GPL-3.0-or-later"
-homepage="http://www.openzim.org"
diff --git a/srcpkgs/zim-tools/template b/srcpkgs/zim-tools/template
index aeed97a5a7c10..36b1972d0ee69 100644
--- a/srcpkgs/zim-tools/template
+++ b/srcpkgs/zim-tools/template
@@ -1,14 +1,29 @@
 # Template file for 'zim-tools'
 pkgname=zim-tools
-version=2.1.0
+version=3.2.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 zlib-devel"
+checkdepends="gtest-devel"
 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
+changelog="https://raw.githubusercontent.com/openzim/zim-tools/main/ChangeLog"
+distfiles="https://github.com/openzim/zim-tools/archive/refs/tags/${version}.tar.gz"
+checksum=ba67da31da199ff8c759ca156501d216a5175fcea72b7e7e6b7b358e5de4af54
+make_check=no # Tests are broken upstream, see https://github.com/openzim/zim-tools/issues/345
+
+libzim-tools_package() {
+	build_style=meta
+	short_desc+=" - transitional dummy package"
+	depends="${sourcepkg}>=${version}_${revision}"
+}
+
+zimwriterfs_package() {
+	build_style=meta
+	short_desc+=" - transitional dummy package"
+	depends="${sourcepkg}>=${version}_${revision}"
+}
diff --git a/srcpkgs/zimwriterfs b/srcpkgs/zimwriterfs
new file mode 120000
index 0000000000000..3b15a55d05104
--- /dev/null
+++ b/srcpkgs/zimwriterfs
@@ -0,0 +1 @@
+zim-tools
\ No newline at end of file
diff --git a/srcpkgs/zimwriterfs/template b/srcpkgs/zimwriterfs/template
deleted file mode 100644
index bf13bf7e65bce..0000000000000
--- a/srcpkgs/zimwriterfs/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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"
-maintainer="Alexander Mamay <alexander@mamay.su>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/openzim/zimwriterfs"
-distfiles="https://github.com/openzim/zimwriterfs/archive/${version}.tar.gz"
-checksum=d55e13194e29100bf88bb201c5661ab7d2600a9e45c6caeb2a21647cdbf6cb4e

From df6e40bd1066831a1286f65b853d9f7bac3ff76d Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 14 Sep 2023 12:00:29 -0400
Subject: [PATCH 3/4] kiwix-lib: update to 12.1.0

---
 common/shlibs              |  2 +-
 srcpkgs/kiwix-lib/template | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 80abd6cc0227e..38205f5a60fd1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3132,7 +3132,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.8 libzim-8.2.1_1
-libkiwix.so.9 kiwix-lib-9.0.1_1
+libkiwix.so.12 kiwix-lib-12.1.0_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 4b8fa31866db7..5a6401a106e70 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,27 +1,30 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
-version=9.4.1
-revision=6
+version=12.1.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
- libmicrohttpd-devel libcurl-devel Mustache gtest-devel"
+ libmicrohttpd-devel libcurl-devel Mustache zlib-devel"
+depends="aria2"
+checkdepends="gtest-devel"
 short_desc="Common code base for all Kiwix ports"
 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
+changelog="https://raw.githubusercontent.com/kiwix/libkiwix/main/ChangeLog"
+distfiles="https://github.com/kiwix/libkiwix/archive/refs/tags/${version}.tar.gz"
+checksum=42e8f9f973054e11f17381c988790c8f8267898b5a611741f0aa03cc4ccf3f75
 
 kiwix-lib-devel_package() {
-	short_desc+=" - development packages"
+	short_desc+=" - development files"
 	depends="pugixml-devel icu-devel xapian-core-devel libzim-devel
 	 libaria2-devel ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/lib/*.so
 		vmove usr/lib/pkgconfig
 		vmove usr/bin
+		vmove usr/share/man
 		vmove usr/include
 	}
 }

From dcedfbf73e834bb179486d37f93e70572b19c42d Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 14 Sep 2023 12:00:49 -0400
Subject: [PATCH 4/4] kiwix-tools: update to 3.5.0

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

diff --git a/srcpkgs/kiwix-tools/template b/srcpkgs/kiwix-tools/template
index 3b1f6441cb1d2..c16b5a67ac92e 100644
--- a/srcpkgs/kiwix-tools/template
+++ b/srcpkgs/kiwix-tools/template
@@ -1,18 +1,18 @@
 # Template file for 'kiwix-tools'
 pkgname=kiwix-tools
-version=3.1.2
-revision=2
+version=3.5.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="kiwix-lib-devel zlib-devel libmicrohttpd-devel libuuid-devel
- libcurl-devel"
+ libcurl-devel libzim-devel"
 short_desc="Kiwix command line tools"
 maintainer="John <me@johnnynator.dev>"
 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
+changelog="https://raw.githubusercontent.com/kiwix/kiwix-tools/main/Changelog"
+distfiles="https://github.com/kiwix/kiwix-tools/archive/refs/tags/${version}.tar.gz"
+checksum=b15e69dd0ae690cb7a000ad815e5037db5276d92310e0b44832b960a51bfaeac
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kiwix-lib-devel"

Re: [PR PATCH] [Merged]: Update openzim/kiwix ecosystem

[Johnnynator]

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

There's a merged pull request on the void-packages repository

Update openzim/kiwix ecosystem
https://github.com/void-linux/void-packages/pull/46092

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

---

cc @Johnnynator