kiwix, bump version (#11263)

www-misc/libkiwix/libkiwix-13.1.0.recipe

@@ -4,9 +4,9 @@ all Kiwix ports (Windows, GNU/Linux, macOS, Android, iOS, ...)."
 HOMEPAGE="https://github.com/kiwix/libkiwix"
 COPYRIGHT="2022 Kiwix contributors"
 LICENSE="GNU GPL v3"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="$HOMEPAGE/archive/refs/tags/$portVersion.tar.gz"
-CHECKSUM_SHA256="26c5da2283505265d69dd7c6e1f1a56539acff3278bc86aaa7c44641b82a3fa8"
+CHECKSUM_SHA256="04d93f66b939f937df2c941af517966128d4c9872b707f9ed192177fe51364d3"
 PATCHES="libkiwix-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -24,15 +24,13 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libcurl$secondaryArchSuffix
-	lib:libgnutls$secondaryArchSuffix
 	lib:libicui18n$secondaryArchSuffix
-	lib:liblzma$secondaryArchSuffix
+	lib:libicuuc$secondaryArchSuffix
 	lib:libmicrohttpd$secondaryArchSuffix
 	lib:libpugixml$secondaryArchSuffix
 	lib:libxapian$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libzim$secondaryArchSuffix
-	lib:libzstd$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -91,5 +89,6 @@ INSTALL()
 
 TEST()
 {
-	ninja -C build test
+	unset meson
+	meson test -Cbuild --print-errorlogs
 }

www-misc/libkiwix/patches/libkiwix-13.0.0.patchset

@@ -1,47 +0,0 @@
-From 06f5c258bc481ee55d3631b35f02f7be07a7553a Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Sun, 27 Nov 2022 12:27:09 +0100
-Subject: Fix undeclared SIOCGIFCONF
-
-
-diff --git a/src/tools/networkTools.cpp b/src/tools/networkTools.cpp
-index 01c3e95..191eb85 100644
---- a/src/tools/networkTools.cpp
-+++ b/src/tools/networkTools.cpp
-@@ -43,6 +43,10 @@
- #include <netdb.h>
- #endif
- 
-+#ifdef __HAIKU__
-+#include <sys/sockio.h>
-+#endif
-+
- size_t write_callback_to_iss(char* ptr, size_t size, size_t nmemb, void* userdata)
- {
-   auto str = static_cast<std::stringstream*>(userdata);
--- 
-2.42.1
-
-
-From 273ffd4cd74f79220ecd0b78a7c9fbca4b2a1c30 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Sun, 27 Nov 2022 12:28:36 +0100
-Subject: Fix for getifaddrs
-
-
-diff --git a/test/httplib.h b/test/httplib.h
-index 57b84ea..ca43408 100644
---- a/test/httplib.h
-+++ b/test/httplib.h
-@@ -1516,7 +1516,7 @@ inline bool bind_ip_address(socket_t sock, const char *host) {
- }
- 
- inline std::string if2ip(const std::string &ifn) {
--#ifndef _WIN32
-+#if !defined(_WIN32) && !defined(__HAIKU__)
-   struct ifaddrs *ifap;
-   getifaddrs(&ifap);
-   for (auto ifa = ifap; ifa; ifa = ifa->ifa_next) {
--- 
-2.42.1
-

www-misc/libkiwix/patches/libkiwix-13.1.0.patchset

@@ -0,0 +1,21 @@
+From 24563ab82ac0196349b9211ee3b8951b5441d3e7 Mon Sep 17 00:00:00 2001
+From: Begasus <begasus@gmail.com>
+Date: Sat, 26 Oct 2024 19:09:41 +0200
+Subject: Fix for NI_MAXHOST
+
+
+diff --git a/test/httplib.h b/test/httplib.h
+index ca43408..8bd430f 100644
+--- a/test/httplib.h
++++ b/test/httplib.h
+@@ -4,6 +4,7 @@
+ //  Copyright (c) 2020 Yuji Hirose. All rights reserved.
+ //  MIT License
+ //
++#define _DEFAULT_SOURCE // for NI_MAXHOST
+ 
+ #ifndef CPPHTTPLIB_HTTPLIB_H
+ #define CPPHTTPLIB_HTTPLIB_H
+-- 
+2.45.2
+