| 1 |
commit: 1d13714f2a66bb0eb4ea88b33dc2404f6d4120df |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 28 22:50:26 2020 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 28 22:50:45 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d13714f |
| 7 |
|
| 8 |
app-text/calibre: Fix build with icu-68 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/752015 |
| 11 |
Package-Manager: Portage-3.0.9, Repoman-3.0.2 |
| 12 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 13 |
|
| 14 |
app-text/calibre/calibre-4.22.0.ebuild | 3 +- |
| 15 |
app-text/calibre/calibre-4.23.0.ebuild | 3 +- |
| 16 |
app-text/calibre/calibre-5.4.2.ebuild | 1 + |
| 17 |
app-text/calibre/files/calibre-4.22.0-icu68.patch | 37 +++++++++++++++++++++++ |
| 18 |
4 files changed, 42 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-text/calibre/calibre-4.22.0.ebuild b/app-text/calibre/calibre-4.22.0.ebuild |
| 21 |
index 7dca7d16c3d..317dde69399 100644 |
| 22 |
--- a/app-text/calibre/calibre-4.22.0.ebuild |
| 23 |
+++ b/app-text/calibre/calibre-4.22.0.ebuild |
| 24 |
@@ -122,7 +122,8 @@ src_prepare() { |
| 25 |
# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface |
| 26 |
eapply \ |
| 27 |
"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \ |
| 28 |
- "${FILESDIR}/${PN}-disable_plugins.patch" |
| 29 |
+ "${FILESDIR}/${PN}-disable_plugins.patch" \ |
| 30 |
+ "${FILESDIR}/${PN}-4.22.0-icu68.patch" |
| 31 |
|
| 32 |
eapply_user |
| 33 |
|
| 34 |
|
| 35 |
diff --git a/app-text/calibre/calibre-4.23.0.ebuild b/app-text/calibre/calibre-4.23.0.ebuild |
| 36 |
index 2e529363d2c..fffb7f953b4 100644 |
| 37 |
--- a/app-text/calibre/calibre-4.23.0.ebuild |
| 38 |
+++ b/app-text/calibre/calibre-4.23.0.ebuild |
| 39 |
@@ -122,7 +122,8 @@ src_prepare() { |
| 40 |
# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface |
| 41 |
eapply \ |
| 42 |
"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \ |
| 43 |
- "${FILESDIR}/${PN}-disable_plugins.patch" |
| 44 |
+ "${FILESDIR}/${PN}-disable_plugins.patch" \ |
| 45 |
+ "${FILESDIR}/${PN}-4.22.0-icu68.patch" |
| 46 |
|
| 47 |
eapply_user |
| 48 |
|
| 49 |
|
| 50 |
diff --git a/app-text/calibre/calibre-5.4.2.ebuild b/app-text/calibre/calibre-5.4.2.ebuild |
| 51 |
index 6c46bbdb063..ca89fb15aef 100644 |
| 52 |
--- a/app-text/calibre/calibre-5.4.2.ebuild |
| 53 |
+++ b/app-text/calibre/calibre-5.4.2.ebuild |
| 54 |
@@ -124,6 +124,7 @@ src_prepare() { |
| 55 |
eapply \ |
| 56 |
"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \ |
| 57 |
"${FILESDIR}/${PN}-disable_plugins.patch" \ |
| 58 |
+ "${FILESDIR}/${PN}-4.22.0-icu68.patch" \ |
| 59 |
"${WORKDIR}/${PN}-5.4.2-SIP-v4.patch" |
| 60 |
|
| 61 |
eapply_user |
| 62 |
|
| 63 |
diff --git a/app-text/calibre/files/calibre-4.22.0-icu68.patch b/app-text/calibre/files/calibre-4.22.0-icu68.patch |
| 64 |
new file mode 100644 |
| 65 |
index 00000000000..33cd7830d35 |
| 66 |
--- /dev/null |
| 67 |
+++ b/app-text/calibre/files/calibre-4.22.0-icu68.patch |
| 68 |
@@ -0,0 +1,37 @@ |
| 69 |
+From c211f9b17af410463ce9cfc9b1b100228b51720f Mon Sep 17 00:00:00 2001 |
| 70 |
+From: Lars Wendler <polynomial-c@g.o> |
| 71 |
+Date: Sat, 31 Oct 2020 10:44:36 +0100 |
| 72 |
+Subject: [PATCH] Fix build with icu-68.1 |
| 73 |
+ |
| 74 |
+icu-68.1 removed public macro definitions for TRUE and FALSE |
| 75 |
+ |
| 76 |
+Signed-off-by: Lars Wendler <polynomial-c@g.o> |
| 77 |
+--- |
| 78 |
+ src/calibre/utils/icu.c | 4 ++-- |
| 79 |
+ src/calibre/utils/matcher.c | 1 - |
| 80 |
+ 2 files changed, 2 insertions(+), 3 deletions(-) |
| 81 |
+ |
| 82 |
+diff --git a/src/calibre/utils/icu.c b/src/calibre/utils/icu.c |
| 83 |
+index 62d05de310..4e918492d9 100644 |
| 84 |
+--- a/src/calibre/utils/icu.c |
| 85 |
++++ b/src/calibre/utils/icu.c |
| 86 |
+@@ -238,14 +238,14 @@ icu_Collator_contains(icu_Collator *self, PyObject *args) { |
| 87 |
+ |
| 88 |
+ a = python_to_icu(a_, &asz); |
| 89 |
+ if (a == NULL) goto end; |
| 90 |
+- if (asz == 0) { found = TRUE; goto end; } |
| 91 |
++ if (asz == 0) { found = 1; goto end; } |
| 92 |
+ b = python_to_icu(b_, &bsz); |
| 93 |
+ if (b == NULL) goto end; |
| 94 |
+ |
| 95 |
+ search = usearch_openFromCollator(a, asz, b, bsz, self->collator, NULL, &status); |
| 96 |
+ if (U_SUCCESS(status)) { |
| 97 |
+ pos = usearch_first(search, &status); |
| 98 |
+- if (pos != USEARCH_DONE) found = TRUE; |
| 99 |
++ if (pos != USEARCH_DONE) found = 1; |
| 100 |
+ } |
| 101 |
+ end: |
| 102 |
+ if (search != NULL) usearch_close(search); |
| 103 |
+-- |
| 104 |
+2.29.2 |
| 105 |
+ |
Archives