Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/calibre/files/
Date: Sun, 29 Nov 2020 11:09:12
Message-Id: 1606648146.50de6b10f55646a2e12183285189881916bbdd67.polynomial-c@gentoo
1 commit: 50de6b10f55646a2e12183285189881916bbdd67
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 29 11:07:56 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 29 11:09:06 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50de6b10
7
8 app-text/calibre: Added missing part of icu68 patch
9
10 Without that missing chunk build fails as follows:
11
12 /var/tmp/portage/app-text/calibre-4.23.0/work/calibre-4.23.0/src/calib
13 re/utils/matcher.c:18:23: error: two or more data types in declaration
14 specifiers
15 18 | typedef unsigned char bool;
16 | ^~~~
17
18 Package-Manager: Portage-3.0.10, Repoman-3.0.2
19 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
20
21 app-text/calibre/files/calibre-4.22.0-icu68.patch | 12 ++++++++++++
22 1 file changed, 12 insertions(+)
23
24 diff --git a/app-text/calibre/files/calibre-4.22.0-icu68.patch b/app-text/calibre/files/calibre-4.22.0-icu68.patch
25 index 33cd7830d35..c4b3baf0570 100644
26 --- a/app-text/calibre/files/calibre-4.22.0-icu68.patch
27 +++ b/app-text/calibre/files/calibre-4.22.0-icu68.patch
28 @@ -32,6 +32,18 @@ index 62d05de310..4e918492d9 100644
29 }
30 end:
31 if (search != NULL) usearch_close(search);
32 +diff --git a/src/calibre/utils/matcher.c b/src/calibre/utils/matcher.c
33 +index f38a7082ce..8e57947867 100644
34 +--- a/src/calibre/utils/matcher.c
35 ++++ b/src/calibre/utils/matcher.c
36 +@@ -15,7 +15,6 @@
37 + #define inline
38 + #endif
39 +
40 +-typedef unsigned char bool;
41 + #define TRUE 1
42 + #define FALSE 0
43 + #define MAX(x, y) ((x > y) ? x : y)
44 --
45 2.29.2