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 78B161382C5 for ; Sun, 29 Nov 2020 11:09:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5B8DE0849; Sun, 29 Nov 2020 11:09:11 +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 9972AE0849 for ; Sun, 29 Nov 2020 11:09:11 +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 ABBC0340E28 for ; Sun, 29 Nov 2020 11:09:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5A7462CA for ; Sun, 29 Nov 2020 11:09:09 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1606648146.50de6b10f55646a2e12183285189881916bbdd67.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/calibre/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/calibre/files/calibre-4.22.0-icu68.patch X-VCS-Directories: app-text/calibre/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 50de6b10f55646a2e12183285189881916bbdd67 X-VCS-Branch: master Date: Sun, 29 Nov 2020 11:09:09 +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: 8c0d5f20-fb96-47f0-a8a8-1c830c084b05 X-Archives-Hash: 9bba90c5bb79da456f73cb92488bfadb commit: 50de6b10f55646a2e12183285189881916bbdd67 Author: Lars Wendler gentoo org> AuthorDate: Sun Nov 29 11:07:56 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sun Nov 29 11:09:06 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50de6b10 app-text/calibre: Added missing part of icu68 patch Without that missing chunk build fails as follows: /var/tmp/portage/app-text/calibre-4.23.0/work/calibre-4.23.0/src/calib re/utils/matcher.c:18:23: error: two or more data types in declaration specifiers 18 | typedef unsigned char bool; | ^~~~ Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> app-text/calibre/files/calibre-4.22.0-icu68.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app-text/calibre/files/calibre-4.22.0-icu68.patch b/app-text/calibre/files/calibre-4.22.0-icu68.patch index 33cd7830d35..c4b3baf0570 100644 --- a/app-text/calibre/files/calibre-4.22.0-icu68.patch +++ b/app-text/calibre/files/calibre-4.22.0-icu68.patch @@ -32,6 +32,18 @@ index 62d05de310..4e918492d9 100644 } end: if (search != NULL) usearch_close(search); +diff --git a/src/calibre/utils/matcher.c b/src/calibre/utils/matcher.c +index f38a7082ce..8e57947867 100644 +--- a/src/calibre/utils/matcher.c ++++ b/src/calibre/utils/matcher.c +@@ -15,7 +15,6 @@ + #define inline + #endif + +-typedef unsigned char bool; + #define TRUE 1 + #define FALSE 0 + #define MAX(x, y) ((x > y) ? x : y) -- 2.29.2