Update kiwix-{lib,tools}, libzim and enable libaria2 for aria2.

common/shlibs

@@ -3061,13 +3061,14 @@ libfswatch.so.9 fswatch-1.11.2_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.3 libzim-3.0.0_1
-libkiwix.so.1 kiwix-lib-1.0.1_1
+libzim.so.4 libzim-4.0.0_1
+libkiwix.so.2 kiwix-lib-2.0.0_1
 libctpp2.so.2 ctpp2-2.8.3_1
 librpm.so.8 rpm-4.14.1_1
 librpmsign.so.8 rpm-4.14.1_1
 librpmbuild.so.8 rpm-4.14.1_1
 librpmio.so.8 rpm-4.14.1_1
+libaria2.so.0 libaria2-1.33.1_3
 libsquirrel.so.0 squirrel-libs-3.1_1
 libsqstdlib.so.0 squirrel-libs-3.1_1
 libexecinfo.so.1 libexecinfo-1.1_1

srcpkgs/aria2/template

@@ -1,11 +1,12 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.34.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
- --with-bashcompletiondir=/usr/share/bash-completion/completions"
+ --with-bashcompletiondir=/usr/share/bash-completion/completions
+ --enable-libaria2"
 hostmakedepends="pkg-config"
 makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
  zlib-devel"
@@ -18,3 +19,21 @@ homepage="https://aria2.github.io/"
 #changelog="https://raw.githubusercontent.com/aria2/aria2/master/NEWS"
 distfiles="https://github.com/aria2/aria2/releases/download/release-${version}/aria2-${version}.tar.xz"
 checksum=3a44a802631606e138a9e172a3e9f5bcbaac43ce2895c1d8e2b46f30487e77a3
+
+libaria2_package() {
+	short_desc="Multi-Protocol/multi-source download library"
+	pkg_install() {
+		vmove "usr/lib/libaria2.so.*"
+	}
+}
+
+libaria2-devel_package() {
+	short_desc="Multi-Protocol/multi-source download library - development files"
+	depends="libaria2>=${version}_${revision} ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.la"
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

srcpkgs/kiwix-lib/template

@@ -1,21 +1,23 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
-version=1.1.1
+version=2.0.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config ctpp2"
-makedepends="ctpp2-devel icu-devel libzim-devel pugixml-devel xapian-core-devel"
+makedepends="ctpp2-devel icu-devel libzim-devel pugixml-devel xapian-core-devel
+ libaria2-devel"
 short_desc="Common code base for all Kiwix ports"
 maintainer="John <johnz@posteo.net>"
-license="GPL-3"
-homepage="kiwix.org"
+license="GPL-3.0-or-later"
+#changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
+homepage="https://www.kiwix.org/"
 distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
-checksum=a33219f4e291e21d557660f05f5a4df1cf84b3281131d17d638cf8842e006c23
+checksum=ff2cb31da5183d541451158bfb678ff864ceea5cd22b655350cc0d80e7cfa3ac
 
 kiwix-lib-devel_package() {
 	short_desc+=" - development packages"
 	depends="pugixml-devel icu-devel xapian-core-devel libzim-devel
-	ctpp2-devel ${sourcepkg}>=${version}_${revision}"
+	ctpp2-devel libaria2-devel ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/lib/*.so
 		vmove usr/lib/pkgconfig

srcpkgs/kiwix-tools/template

@@ -1,16 +1,17 @@
 # Template file for 'kiwix-tools'
 pkgname=kiwix-tools
-version=0.4.0
+version=0.6.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="kiwix-lib-devel zlib-devel libmicrohttpd-devel libuuid-devel ctpp2-devel"
 short_desc="Kiwix command line tools"
 maintainer="John <johnz@posteo.net>"
-license="GPL-3"
+license="GPL-3.0-or-later"
+#changelog="https://github.com/kiwix/kiwix-tools/blob/${verion}/Changelog"
 homepage="https://kiwix.org"
 distfiles="https://github.com/kiwix/kiwix-tools/archive/${version}.tar.gz"
-checksum=168d2616c2f1829c897462e1f7557ca3b352d6baef80d0a1f3499748031f00cd
+checksum=0907b21937d64bf89950c50ea8a8d396cf88bb8db76cc51f4fdcbdedbbd71cc2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kiwix-lib-devel"

srcpkgs/libaria2

@@ -0,0 +1 @@
+aria2

srcpkgs/libaria2-devel

@@ -0,0 +1 @@
+aria2

srcpkgs/libzim/patches/werror.patch

@@ -0,0 +1,16 @@
+Author: maxice8
+Upstream: no
+Reason: Fixes compilation
+
+--- meson.build
++++ meson.build
+@@ -1,7 +1,7 @@
+ project('libzim', ['c', 'cpp'],
+   version : '3.3.0',
+   license : 'GPL2',
+-  default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true'])
++  default_options : ['c_std=c11', 'cpp_std=c++11'])
+
+ conf = configuration_data()
+ conf.set('VERSION', '"@0@"'.format(meson.project_version()))
+

srcpkgs/libzim/template

@@ -1,17 +1,18 @@
 # Template file for 'libzim'
 pkgname=libzim
-version=3.2.0
+version=4.0.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
  $(vopt_if xapian "xapian-core-devel icu-devel")"
 short_desc="Library to read and write ZIM files"
 maintainer="John <johnz@posteo.net>"
-license="GPL-2"
+license="GPL-2.0-or-later"
+#changelog="https://github.com/openzim/libzim/blob/${version}/ChangeLog"
 homepage="http://www.openzim.org/"
 distfiles="https://github.com/openzim/libzim/archive/${version}.tar.gz"
-checksum=9b39a21b62b88b60fdb2f59870ed611c175b9b20c8cd7e51ed01589bf055c8af
+checksum=e195d30ba1b55dd2b6529fdd84fcbed6ec35ed4ddc957ad7725edabd20c3126c
 replaces="libzim-tools>=0"
 
 build_options="zlib xapian"