From 122a0da2985bf15da786047cab86496f21f1b5b3 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Thu, 8 Feb 2024 10:24:56 +0000
Subject: [PATCH] libzim, bump version, switch to icu74 (#10072)

---
 .../{libzim-8.2.1.recipe => libzim-9.1.0.recipe}    | 13 +++++++------
 ...{libzim-8.2.1.patchset => libzim-9.1.0.patchset} |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)
 rename app-arch/libzim/{libzim-8.2.1.recipe => libzim-9.1.0.recipe} (89%)
 rename app-arch/libzim/patches/{libzim-8.2.1.patchset => libzim-9.1.0.patchset} (93%)

diff --git a/app-arch/libzim/libzim-8.2.1.recipe b/app-arch/libzim/libzim-9.1.0.recipe
similarity index 89%
rename from app-arch/libzim/libzim-8.2.1.recipe
rename to app-arch/libzim/libzim-9.1.0.recipe
index b53e75723..669293964 100644
--- a/app-arch/libzim/libzim-8.2.1.recipe
+++ b/app-arch/libzim/libzim-9.1.0.recipe
@@ -5,9 +5,9 @@ More information about the ZIM format and the openZIM project at https://openzim
 HOMEPAGE="https://github.com/openzim/libzim"
 COPYRIGHT="2016-2023 openZIM and contributors"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="$HOMEPAGE/archive/refs/tags/$portVersion.tar.gz"
-CHECKSUM_SHA256="b8296644b04b02c04d2ff1458fed829df39b54e8fd1bcd23c10440e160819f13"
+CHECKSUM_SHA256="faf19a35882415212d46a51aab45692ccfa1e2e36beb7261eec1ec53e29b9e6a"
 SOURCE_URI_2="https://github.com/openzim/zim-testing-suite/archive/refs/tags/v0.4.tar.gz"
 CHECKSUM_SHA256_2="7a4f0c773e65be6fe49d3b2159bd9c0f051e8319932ebd3474db0f77f7ea9b27"
 PATCHES="libzim-$portVersion.patchset"
@@ -37,9 +37,9 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	libzim$secondaryArchSuffix == $portVersion base
-	devel:libicui18n$secondaryArchSuffix
-	devel:libicuuc$secondaryArchSuffix
-	devel:libicudata$secondaryArchSuffix
+	devel:libicui18n$secondaryArchSuffix >= 74
+	devel:libicuuc$secondaryArchSuffix >= 74
+	devel:libicudata$secondaryArchSuffix >= 74
 	devel:liblzma$secondaryArchSuffix
 	devel:libxapian$secondaryArchSuffix
 	devel:libzstd$secondaryArchSuffix
@@ -68,7 +68,8 @@ BUILD()
 	meson . build --buildtype=release \
 		--prefix=$prefix \
 		--includedir=$includeDir \
-		--libdir=$libDir #--reconfigure
+		--libdir=$libDir \
+		-Dwerror=false
 	ninja -C build
 }
 
diff --git a/app-arch/libzim/patches/libzim-8.2.1.patchset b/app-arch/libzim/patches/libzim-9.1.0.patchset
similarity index 93%
rename from app-arch/libzim/patches/libzim-8.2.1.patchset
rename to app-arch/libzim/patches/libzim-9.1.0.patchset
index f341c7ff5..7d8062452 100644
--- a/app-arch/libzim/patches/libzim-8.2.1.patchset
+++ b/app-arch/libzim/patches/libzim-9.1.0.patchset
@@ -1,4 +1,4 @@
-From 18376baa88c140926deb8d02fbc5e3a415bedf19 Mon Sep 17 00:00:00 2001
+From e5ebd1cca9111e6888d70829910dce77375fc0e3 Mon Sep 17 00:00:00 2001
 From: Begasus <begasus@gmail.com>
 Date: Thu, 3 Aug 2023 07:36:34 +0000
 Subject: Haiku build fixes
@@ -31,5 +31,5 @@ index e5f404f..6ac0767 100644
  #else
  # define PREAD pread64
 -- 
-2.37.3
+2.42.1