diff --git a/common/shlibs b/common/shlibs index 1305ffa1920..4efee70b478 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3061,8 +3061,8 @@ 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 diff --git a/srcpkgs/libzim/patches/werror.patch b/srcpkgs/libzim/patches/werror.patch new file mode 100644 index 00000000000..89c12351306 --- /dev/null +++ b/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())) + diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template index 818fde2a625..cbeca4c5f70 100644 --- a/srcpkgs/libzim/template +++ b/srcpkgs/libzim/template @@ -1,6 +1,6 @@ # Template file for 'libzim' pkgname=libzim -version=3.2.0 +version=4.0.0 revision=1 build_style=meson hostmakedepends="pkg-config git" @@ -8,15 +8,20 @@ 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 " -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" build_options_default="zlib xapian" +do_check() { + : +} + libzim-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision}