libe-book: icu 68 fix

libe-book/.signature

@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3wU1YclJeKhKJjQ+sTeJ8UbxlTFJJcNJdRCPWbS4IzHry58circIoGmkqrL7nSDv62bStJH1R8LSIS1zLDHi5Aw=
-SHA256 (Pkgfile) = 5c1f328880bb56d95c705f1769d8724f05197ce627108410c9040723a7f2dcc9
+RWSagIOpLGJF3zb0ALIxNwiN5EdTbMWj9ibmx3aVTiQliFyG5MRoHOasMWy5eS79a52V2q6/5tCVIbrSz7nDNrF3ptx0+fxBXg0=
+SHA256 (Pkgfile) = 90ec8586e2c404c02cc5d80dd4c3d945f501aeb40747a248ae4cdf8a3e74d835
 SHA256 (.footprint) = 29095ae079951d22653c41754fbae8ecad3adfbc33ada913cf2f7e610b926c41
 SHA256 (libe-book-0.1.3.tar.xz) = 7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9
+SHA256 (libebook-0.1.3-icu-68.patch) = d183878b0e543af9aa1da0de3f7d7914ee68a393d136b3731044254315af6920

libe-book/Pkgfile

@@ -6,10 +6,13 @@
 name=libe-book
 version=0.1.3
 release=2
-source=(https://sourceforge.net/projects/${name//-/}/files//${name}-${version}/$name-$version.tar.xz)
+source=(https://sourceforge.net/projects/${name//-/}/files//${name}-${version}/$name-$version.tar.xz
+	libebook-0.1.3-icu-68.patch)
 
 build() {
   cd $name-$version
+  [ $(pkginfo -i | awk '/^icu / {split($2,a,"."); print a[1]}') -ge 68 ] && \
+    patch -p1 -i $SRC/libebook-0.1.3-icu-68.patch
   ./configure --prefix=/usr \
     --without-docs
   make

libe-book/libebook-0.1.3-icu-68.patch

@@ -0,0 +1,27 @@
+From 9ea3b4c2552770b66b83d44b6e6ccdd338296316 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 30 Oct 2020 10:52:10 +0100
+Subject: [PATCH] Fix build with icu-68.0
+
+icu-68.1 removed public macro definitions for TRUE and FALSE
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ src/lib/EBOOKCharsetConverter.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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.29.2