summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2020-10-31 12:04:52 +0100
committerDavid Seifert <soap@gentoo.org>2020-10-31 12:04:52 +0100
commita228bb748aa2c136269471a8efe74bee45a17af0 (patch)
tree7abf433912adfbc8f3d003bfa4d410ada37924b4 /app-text
parentmedia-libs/libcdr: Remove USE="static-libs" (diff)
downloadgentoo-a228bb748aa2c136269471a8efe74bee45a17af0.tar.gz
gentoo-a228bb748aa2c136269471a8efe74bee45a17af0.tar.bz2
gentoo-a228bb748aa2c136269471a8efe74bee45a17af0.zip
app-text/libebook: Add patch for icu 68.1
Closes: https://bugs.gentoo.org/751925 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'app-text')
-rw-r--r--app-text/libebook/files/libebook-0.1.3-icu68.patch28
-rw-r--r--app-text/libebook/libebook-0.1.3.ebuild2
2 files changed, 30 insertions, 0 deletions
diff --git a/app-text/libebook/files/libebook-0.1.3-icu68.patch b/app-text/libebook/files/libebook-0.1.3-icu68.patch
new file mode 100644
index 000000000000..5fef619fbf96
--- /dev/null
+++ b/app-text/libebook/files/libebook-0.1.3-icu68.patch
@@ -0,0 +1,28 @@
+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
+
diff --git a/app-text/libebook/libebook-0.1.3.ebuild b/app-text/libebook/libebook-0.1.3.ebuild
index ebf1a3373666..227b6d2509c1 100644
--- a/app-text/libebook/libebook-0.1.3.ebuild
+++ b/app-text/libebook/libebook-0.1.3.ebuild
@@ -36,6 +36,8 @@ RDEPEND="${RDEPEND}"
S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}"/${P}-icu68.patch )
+
src_prepare() {
default
eautoreconf