diff --git a/srcpkgs/kiwix-tools/patches/01-meson.patch b/srcpkgs/kiwix-tools/patches/01-meson.patch new file mode 100644 index 00000000000..a44ed2b45c4 --- /dev/null +++ b/srcpkgs/kiwix-tools/patches/01-meson.patch @@ -0,0 +1,26 @@ +From ce3c3bd153cc7611ee4f107e8589d3e7b7816a65 Mon Sep 17 00:00:00 2001 +From: Emmanuel Engelhart +Date: Sun, 15 Sep 2024 19:01:25 +0200 +Subject: [PATCH] Better check libzim and libkiwix deps + +--- + meson.build | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/meson.build b/meson.build +index 8b6c1ec4..53a477c5 100644 +--- a/meson.build ++++ b/meson.build +@@ -16,10 +16,8 @@ + endif + + thread_dep = dependency('threads') +-libzim_dep = dependency('libzim', version:'>=9.0.0', static:static_linkage) +-libzim_dep = dependency('libzim', version:'<10.0.0', static:static_linkage) +-kiwixlib_dep = dependency('kiwix', version:'>=13.0.0', static:static_linkage) +-kiwixlib_dep = dependency('kiwix', version:'<14.0.0', static:static_linkage) ++libzim_dep = dependency('libzim', version:['>=9.0.0', '<10.0.0'], static:static_linkage) ++kiwixlib_dep = dependency('kiwix', version:['>=14.0.0', '<15.0.0'], static:static_linkage) + + all_deps = [thread_dep, kiwixlib_dep, libzim_dep] + diff --git a/srcpkgs/kiwix-tools/patches/02-meson.patch b/srcpkgs/kiwix-tools/patches/02-meson.patch new file mode 100644 index 00000000000..162c0993228 --- /dev/null +++ b/srcpkgs/kiwix-tools/patches/02-meson.patch @@ -0,0 +1,21 @@ +From 3599e8476d11127fe49fe696fc6e2b05e7687d12 Mon Sep 17 00:00:00 2001 +From: Veloman Yunkan +Date: Mon, 16 Sep 2024 17:50:20 +0400 +Subject: [PATCH] libkiwix now identifies itself as libkiwix + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 53a477c5..8b1454d7 100644 +--- a/meson.build ++++ b/meson.build +@@ -21,6 +21,6 @@ endif + + thread_dep = dependency('threads') + libzim_dep = dependency('libzim', version:['>=9.0.0', '<10.0.0'], static:static_linkage) +-kiwixlib_dep = dependency('kiwix', version:['>=14.0.0', '<15.0.0'], static:static_linkage) ++kiwixlib_dep = dependency('libkiwix', version:['>=14.0.0', '<15.0.0'], static:static_linkage) + + all_deps = [thread_dep, kiwixlib_dep, libzim_dep] diff --git a/srcpkgs/kiwix-tools/patches/addr.patch b/srcpkgs/kiwix-tools/patches/addr.patch new file mode 100644 index 00000000000..5ef27af332b --- /dev/null +++ b/srcpkgs/kiwix-tools/patches/addr.patch @@ -0,0 +1,11 @@ +--- kiwix-tools-3.7.0/src/server/kiwix-serve.cpp 2024-03-13 15:17:32.000000000 +0100 ++++ - 2025-03-15 23:48:03.235468369 +0100 +@@ -413,7 +413,7 @@ + exit(1); + } + +- std::string url = "http://" + server.getAddress() + ":" + std::to_string(server.getPort()) + normalizeRootUrl(rootLocation); ++ std::string url = "http://" + server.getAddress().addr + ":" + std::to_string(server.getPort()) + normalizeRootUrl(rootLocation); + std::cout << "The Kiwix server is running and can be accessed in the local network at: " + << url << std::endl; + diff --git a/srcpkgs/kiwix-tools/template b/srcpkgs/kiwix-tools/template index c16b5a67ac9..1e775d971ae 100644 --- a/srcpkgs/kiwix-tools/template +++ b/srcpkgs/kiwix-tools/template @@ -1,6 +1,6 @@ # Template file for 'kiwix-tools' pkgname=kiwix-tools -version=3.5.0 +version=3.7.0 revision=1 build_style=meson hostmakedepends="pkg-config" @@ -12,7 +12,7 @@ license="GPL-3.0-or-later" homepage="https://kiwix.org" 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 +checksum=7367400dab80fcf0702657b2d5324ec29f344581318659c106f5b7fca30fa0db if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kiwix-lib-devel"