zim-tools: 3.4.0 -> 3.5.0, fix build with icu76

This commit is contained in:
aleksana
2025-03-08 16:22:19 +08:00
parent 726102d362
commit 3e422330a3
2 changed files with 33 additions and 5 deletions
@@ -0,0 +1,18 @@
diff --git a/meson.build b/meson.build
index 344bbaf..ddad570 100644
--- a/meson.build
+++ b/meson.build
@@ -17,8 +17,11 @@ if static_linkage
endif
endif
-libzim_dep = dependency('libzim', version:'>=9.2.0', static:static_linkage)
-libzim_dep = dependency('libzim', version:'<10.0.0', static:static_linkage)
+libzim_dep = [
+ dependency('libzim', version:['>=9.2.0', '<10.0.0'], static:static_linkage),
+ dependency('icu-i18n', static:static_linkage),
+ dependency('icu-uc', static:static_linkage)
+]
with_xapian_support = compiler.has_header_symbol('zim/zim.h', 'LIBZIM_WITH_XAPIAN')
+15 -5
View File
@@ -9,33 +9,43 @@
file,
gumbo,
mustache-hpp,
zimlib,
libzim,
icu,
zlib,
gtest,
}:
stdenv.mkDerivation rec {
pname = "zim-tools";
version = "3.4.0";
version = "3.5.0";
src = fetchFromGitHub {
owner = "openzim";
repo = "zim-tools";
rev = version;
sha256 = "sha256-A1A0Ri2OwPyqpx0f5CPJL3zAwo2I/AiRKpmk3r4DeTc=";
tag = version;
hash = "sha256-gcCo3u1pLm1CnTF3CATOri5+zat839zUbmQnMOVjanI=";
};
patches = [
# Took from:
# https://gitlab.archlinux.org/archlinux/packaging/packages/zim-tools/-/blob/0b4ffc61be76f1cfc61500f8157f99e28bb3c7b1/0001-Fix-build-with-ICU-76.patch
# https://github.com/openzim/libzim/pull/936
./fix_build_with_icu76.patch
];
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [
docopt_cpp
file
gumbo
mustache-hpp
zimlib
libzim
icu
zlib
];