From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BE237138359 for ; Sat, 31 Oct 2020 11:16:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0E7E3E0824; Sat, 31 Oct 2020 11:16:50 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CE85DE0824 for ; Sat, 31 Oct 2020 11:16:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ECCE633DE47 for ; Sat, 31 Oct 2020 11:16:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 971EB373 for ; Sat, 31 Oct 2020 11:16:47 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1604142992.892954cc08b34103186121c8e7552921ba18859b.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/libebook/files/, app-text/libebook/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/libebook/files/libebook-0.1.3-icu68.patch app-text/libebook/libebook-0.1.3.ebuild X-VCS-Directories: app-text/libebook/ app-text/libebook/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 892954cc08b34103186121c8e7552921ba18859b X-VCS-Branch: master Date: Sat, 31 Oct 2020 11:16:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 45e2fe05-f6d2-4485-8488-17dfed29cc61 X-Archives-Hash: 691162bc6e86029df70a300c15f9d81b commit: 892954cc08b34103186121c8e7552921ba18859b Author: David Seifert gentoo org> AuthorDate: Sat Oct 31 11:16:32 2020 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Oct 31 11:16:32 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=892954cc Reverts: a228bb748aa2c136269471a8efe74bee45a17af0 "app-text/libebook: Add patch for icu 68.1" * Patch was already in, missed it when looking at the log Closes: https://bugs.gentoo.org/751925 Signed-off-by: David Seifert 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 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 deleted file mode 100644 index 5fef619fbf9..00000000000 --- a/app-text/libebook/files/libebook-0.1.3-icu68.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9ea3b4c2552770b66b83d44b6e6ccdd338296316 Mon Sep 17 00:00:00 2001 -From: Lars Wendler -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 ---- - 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 227b6d2509c..ebf1a337366 100644 --- a/app-text/libebook/libebook-0.1.3.ebuild +++ b/app-text/libebook/libebook-0.1.3.ebuild @@ -36,8 +36,6 @@ RDEPEND="${RDEPEND}" S="${WORKDIR}/${MY_P}" -PATCHES=( "${FILESDIR}"/${P}-icu68.patch ) - src_prepare() { default eautoreconf