commit: a228bb748aa2c136269471a8efe74bee45a17af0 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Oct 31 11:04:52 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Oct 31 11:04:52 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a228bb74
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 <AT> gentoo.org> app-text/libebook/files/libebook-0.1.3-icu68.patch | 28 ++++++++++++++++++++++ app-text/libebook/libebook-0.1.3.ebuild | 2 ++ 2 files changed, 30 insertions(+) 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 00000000000..5fef619fbf9 --- /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 <[email protected]> +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 <[email protected]> +--- + 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 ebf1a337366..227b6d2509c 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
