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 40C351382C5 for ; Sat, 28 Nov 2020 22:51:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D7F4E0802; Sat, 28 Nov 2020 22:51:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 50B06E0802 for ; Sat, 28 Nov 2020 22:51:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 BAB4D34135D for ; Sat, 28 Nov 2020 22:50:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 42FCE2CA for ; Sat, 28 Nov 2020 22:50:58 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1606603845.1d13714f2a66bb0eb4ea88b33dc2404f6d4120df.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/calibre/files/, app-text/calibre/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/calibre/calibre-4.22.0.ebuild app-text/calibre/calibre-4.23.0.ebuild app-text/calibre/calibre-5.4.2.ebuild app-text/calibre/files/calibre-4.22.0-icu68.patch X-VCS-Directories: app-text/calibre/files/ app-text/calibre/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 1d13714f2a66bb0eb4ea88b33dc2404f6d4120df X-VCS-Branch: master Date: Sat, 28 Nov 2020 22:50:58 +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: bac777a3-db61-4bc5-86c0-bcf098549f8f X-Archives-Hash: 0d86762abe4ec47994fb024b0ef81786 commit: 1d13714f2a66bb0eb4ea88b33dc2404f6d4120df Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Nov 28 22:50:26 2020 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Nov 28 22:50:45 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d13714f app-text/calibre: Fix build with icu-68 Closes: https://bugs.gentoo.org/752015 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Andreas K. Hüttel gentoo.org> app-text/calibre/calibre-4.22.0.ebuild | 3 +- app-text/calibre/calibre-4.23.0.ebuild | 3 +- app-text/calibre/calibre-5.4.2.ebuild | 1 + app-text/calibre/files/calibre-4.22.0-icu68.patch | 37 +++++++++++++++++++++++ 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/app-text/calibre/calibre-4.22.0.ebuild b/app-text/calibre/calibre-4.22.0.ebuild index 7dca7d16c3d..317dde69399 100644 --- a/app-text/calibre/calibre-4.22.0.ebuild +++ b/app-text/calibre/calibre-4.22.0.ebuild @@ -122,7 +122,8 @@ src_prepare() { # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface eapply \ "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \ - "${FILESDIR}/${PN}-disable_plugins.patch" + "${FILESDIR}/${PN}-disable_plugins.patch" \ + "${FILESDIR}/${PN}-4.22.0-icu68.patch" eapply_user diff --git a/app-text/calibre/calibre-4.23.0.ebuild b/app-text/calibre/calibre-4.23.0.ebuild index 2e529363d2c..fffb7f953b4 100644 --- a/app-text/calibre/calibre-4.23.0.ebuild +++ b/app-text/calibre/calibre-4.23.0.ebuild @@ -122,7 +122,8 @@ src_prepare() { # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface eapply \ "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \ - "${FILESDIR}/${PN}-disable_plugins.patch" + "${FILESDIR}/${PN}-disable_plugins.patch" \ + "${FILESDIR}/${PN}-4.22.0-icu68.patch" eapply_user diff --git a/app-text/calibre/calibre-5.4.2.ebuild b/app-text/calibre/calibre-5.4.2.ebuild index 6c46bbdb063..ca89fb15aef 100644 --- a/app-text/calibre/calibre-5.4.2.ebuild +++ b/app-text/calibre/calibre-5.4.2.ebuild @@ -124,6 +124,7 @@ src_prepare() { eapply \ "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \ "${FILESDIR}/${PN}-disable_plugins.patch" \ + "${FILESDIR}/${PN}-4.22.0-icu68.patch" \ "${WORKDIR}/${PN}-5.4.2-SIP-v4.patch" eapply_user diff --git a/app-text/calibre/files/calibre-4.22.0-icu68.patch b/app-text/calibre/files/calibre-4.22.0-icu68.patch new file mode 100644 index 00000000000..33cd7830d35 --- /dev/null +++ b/app-text/calibre/files/calibre-4.22.0-icu68.patch @@ -0,0 +1,37 @@ +From c211f9b17af410463ce9cfc9b1b100228b51720f Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Sat, 31 Oct 2020 10:44:36 +0100 +Subject: [PATCH] Fix build with icu-68.1 + +icu-68.1 removed public macro definitions for TRUE and FALSE + +Signed-off-by: Lars Wendler +--- + src/calibre/utils/icu.c | 4 ++-- + src/calibre/utils/matcher.c | 1 - + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/calibre/utils/icu.c b/src/calibre/utils/icu.c +index 62d05de310..4e918492d9 100644 +--- a/src/calibre/utils/icu.c ++++ b/src/calibre/utils/icu.c +@@ -238,14 +238,14 @@ icu_Collator_contains(icu_Collator *self, PyObject *args) { + + a = python_to_icu(a_, &asz); + if (a == NULL) goto end; +- if (asz == 0) { found = TRUE; goto end; } ++ if (asz == 0) { found = 1; goto end; } + b = python_to_icu(b_, &bsz); + if (b == NULL) goto end; + + search = usearch_openFromCollator(a, asz, b, bsz, self->collator, NULL, &status); + if (U_SUCCESS(status)) { + pos = usearch_first(search, &status); +- if (pos != USEARCH_DONE) found = TRUE; ++ if (pos != USEARCH_DONE) found = 1; + } + end: + if (search != NULL) usearch_close(search); +-- +2.29.2 +