From 3e533dc9545c5a0bf3ca204601c92aa02e29037a Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Fri, 9 Feb 2024 11:50:52 +0000 Subject: [PATCH] libebook, revbump, use icu74 (#10088) --- app-text/libebook/libebook-0.1.3.recipe | 9 +++---- .../libebook/patches/libebook-0.1.3.patchset | 24 +++++++++++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 app-text/libebook/patches/libebook-0.1.3.patchset diff --git a/app-text/libebook/libebook-0.1.3.recipe b/app-text/libebook/libebook-0.1.3.recipe index 78e4498e1..2fc9e7e9c 100644 --- a/app-text/libebook/libebook-0.1.3.recipe +++ b/app-text/libebook/libebook-0.1.3.recipe @@ -4,10 +4,11 @@ converting various reflowable e-book formats." HOMEPAGE="https://sourceforge.net/projects/libebook/" COPYRIGHT="David Tardon" LICENSE="MPL v2.0" -REVISION="3" +REVISION="4" SOURCE_URI="http://prdownloads.sourceforge.net/libebook/libe-book-$portVersion.tar.bz2" CHECKSUM_SHA256="5170222409c13b75ffafa99a42b1125e16202e3ba5fa40be37e9b7e2edca95aa" SOURCE_DIR="libe-book-$portVersion" +PATCHES="libebook-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -21,7 +22,7 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - lib:libicui18n$secondaryArchSuffix >= 66 + lib:libicui18n$secondaryArchSuffix lib:liblangtag$secondaryArchSuffix lib:librevenge_0.0$secondaryArchSuffix lib:librevenge_generators_0.0$secondaryArchSuffix @@ -40,9 +41,9 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libboost_system$secondaryArchSuffix + devel:libboost_system$secondaryArchSuffix >= 1.83.0 devel:libcppunit$secondaryArchSuffix - devel:libicui18n$secondaryArchSuffix >= 66 + devel:libicui18n$secondaryArchSuffix >= 74 devel:liblangtag$secondaryArchSuffix devel:librevenge_0.0$secondaryArchSuffix devel:librevenge_generators_0.0$secondaryArchSuffix diff --git a/app-text/libebook/patches/libebook-0.1.3.patchset b/app-text/libebook/patches/libebook-0.1.3.patchset new file mode 100644 index 000000000..03ab8bd65 --- /dev/null +++ b/app-text/libebook/patches/libebook-0.1.3.patchset @@ -0,0 +1,24 @@ +From 282e67b6a569aa01e689d630155869dadc107f82 Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Fri, 9 Feb 2024 12:04:20 +0100 +Subject: icu build fix inspired on FreeBSD patch-icu68 + +https://gitlab.com/FreeBSD/freebsd-ports/-/blob/e55b80195e2af4bd63088de216ccd3e23be81c1f/textproc/libe-book/files/patch-icu68 + + +diff --git a/src/lib/EBOOKCharsetConverter.cpp b/src/lib/EBOOKCharsetConverter.cpp +index 0d85fa3..c9f8be0 100644 +--- a/src/lib/EBOOKCharsetConverter.cpp ++++ b/src/lib/EBOOKCharsetConverter.cpp +@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *const in, const unsigned le + m_converterToUTF8.get(), m_converterToUnicode.get(), + &outText, outText + out.size(), &inText, inText + length, + nullptr, nullptr, nullptr, nullptr, +- TRUE, TRUE, &status) ++ true, true, &status) + ; + if (status==U_BUFFER_OVERFLOW_ERROR) + { +-- +2.42.1 +