| 1 |
commit: e3f601190368dea81c1f86f75f5b70dccb220129 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 30 16:32:17 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 31 09:20:31 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3f60119 |
| 7 |
|
| 8 |
dev-libs/libical: Fix build with ICU-68 |
| 9 |
|
| 10 |
Thanks-to: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 11 |
Closes: https://bugs.gentoo.org/751928 |
| 12 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-libs/libical/files/libical-3.0.8-icu-68.patch | 44 +++++++++++++++++++++++ |
| 16 |
dev-libs/libical/libical-3.0.8.ebuild | 1 + |
| 17 |
2 files changed, 45 insertions(+) |
| 18 |
|
| 19 |
diff --git a/dev-libs/libical/files/libical-3.0.8-icu-68.patch b/dev-libs/libical/files/libical-3.0.8-icu-68.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..1974db76b0a |
| 22 |
--- /dev/null |
| 23 |
+++ b/dev-libs/libical/files/libical-3.0.8-icu-68.patch |
| 24 |
@@ -0,0 +1,44 @@ |
| 25 |
+From a90657f5bbc5e2eb45fa419e7f43889aeccd4c39 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Lars Wendler <polynomial-c@g.o> |
| 27 |
+Date: Fri, 30 Oct 2020 11:24:34 +0100 |
| 28 |
+Subject: [PATCH] Fix build with icu-68.1 |
| 29 |
+ |
| 30 |
+icu-68.1 removed public macro definitions for TRUE and FALSE |
| 31 |
+ |
| 32 |
+Signed-off-by: Lars Wendler <polynomial-c@g.o> |
| 33 |
+--- |
| 34 |
+ src/libical/icalrecur.c | 5 +++-- |
| 35 |
+ 1 file changed, 3 insertions(+), 2 deletions(-) |
| 36 |
+ |
| 37 |
+diff --git a/src/libical/icalrecur.c b/src/libical/icalrecur.c |
| 38 |
+index 91522161..159163c5 100644 |
| 39 |
+--- a/src/libical/icalrecur.c |
| 40 |
++++ b/src/libical/icalrecur.c |
| 41 |
+@@ -143,6 +143,7 @@ |
| 42 |
+ #include <stdlib.h> |
| 43 |
+ |
| 44 |
+ #if defined(HAVE_LIBICU) |
| 45 |
++#include <stdbool.h> |
| 46 |
+ #include <unicode/ucal.h> |
| 47 |
+ #include <unicode/ustring.h> |
| 48 |
+ #else |
| 49 |
+@@ -1079,7 +1080,7 @@ icalarray *icalrecurrencetype_rscale_supported_calendars(void) |
| 50 |
+ |
| 51 |
+ calendars = icalarray_new(sizeof(const char **), 20); |
| 52 |
+ |
| 53 |
+- en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status); |
| 54 |
++ en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status); |
| 55 |
+ while ((cal = uenum_next(en, NULL, &status))) { |
| 56 |
+ cal = icalmemory_tmp_copy(cal); |
| 57 |
+ icalarray_append(calendars, &cal); |
| 58 |
+@@ -1472,7 +1473,7 @@ static int initialize_rscale(icalrecur_iterator *impl) |
| 59 |
+ } |
| 60 |
+ |
| 61 |
+ /* Check if specified calendar is supported */ |
| 62 |
+- en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status); |
| 63 |
++ en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status); |
| 64 |
+ while ((cal = uenum_next(en, NULL, &status))) { |
| 65 |
+ if (!strcmp(cal, rule.rscale)) { |
| 66 |
+ is_hebrew = !strcmp(rule.rscale, "hebrew"); |
| 67 |
+-- |
| 68 |
+2.29.2 |
| 69 |
|
| 70 |
diff --git a/dev-libs/libical/libical-3.0.8.ebuild b/dev-libs/libical/libical-3.0.8.ebuild |
| 71 |
index fa889a4d229..376befd62e0 100644 |
| 72 |
--- a/dev-libs/libical/libical-3.0.8.ebuild |
| 73 |
+++ b/dev-libs/libical/libical-3.0.8.ebuild |
| 74 |
@@ -48,6 +48,7 @@ DOCS=( |
| 75 |
PATCHES=( |
| 76 |
"${FILESDIR}/${PN}-3.0.4-tests.patch" |
| 77 |
"${FILESDIR}/${PN}-3.0.5-pkgconfig-libdir.patch" |
| 78 |
+ "${FILESDIR}/${P}-icu-68.patch" # pending upstream PR #448, bug #751928 |
| 79 |
) |
| 80 |
|
| 81 |
pkg_setup() { |
Archives