diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-10-30 17:32:17 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-10-31 10:20:31 +0100 |
| commit | e3f601190368dea81c1f86f75f5b70dccb220129 (patch) | |
| tree | a22a1dc5751eca1b04532e6cc0d5ee3d8170bf97 /dev-libs/libical | |
| parent | app-text/libebook: Fix build with ICU-68, EAPI-7 bump (diff) | |
| download | gentoo-e3f601190368dea81c1f86f75f5b70dccb220129.tar.gz gentoo-e3f601190368dea81c1f86f75f5b70dccb220129.tar.bz2 gentoo-e3f601190368dea81c1f86f75f5b70dccb220129.zip | |
dev-libs/libical: Fix build with ICU-68
Thanks-to: Lars Wendler <polynomial-c@gentoo.org>
Closes: https://bugs.gentoo.org/751928
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-libs/libical')
| -rw-r--r-- | dev-libs/libical/files/libical-3.0.8-icu-68.patch | 44 | ||||
| -rw-r--r-- | dev-libs/libical/libical-3.0.8.ebuild | 1 |
2 files changed, 45 insertions, 0 deletions
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 new file mode 100644 index 000000000000..1974db76b0a5 --- /dev/null +++ b/dev-libs/libical/files/libical-3.0.8-icu-68.patch @@ -0,0 +1,44 @@ +From a90657f5bbc5e2eb45fa419e7f43889aeccd4c39 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomial-c@gentoo.org> +Date: Fri, 30 Oct 2020 11:24:34 +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 <polynomial-c@gentoo.org> +--- + src/libical/icalrecur.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/libical/icalrecur.c b/src/libical/icalrecur.c +index 91522161..159163c5 100644 +--- a/src/libical/icalrecur.c ++++ b/src/libical/icalrecur.c +@@ -143,6 +143,7 @@ + #include <stdlib.h> + + #if defined(HAVE_LIBICU) ++#include <stdbool.h> + #include <unicode/ucal.h> + #include <unicode/ustring.h> + #else +@@ -1079,7 +1080,7 @@ icalarray *icalrecurrencetype_rscale_supported_calendars(void) + + calendars = icalarray_new(sizeof(const char **), 20); + +- en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status); ++ en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status); + while ((cal = uenum_next(en, NULL, &status))) { + cal = icalmemory_tmp_copy(cal); + icalarray_append(calendars, &cal); +@@ -1472,7 +1473,7 @@ static int initialize_rscale(icalrecur_iterator *impl) + } + + /* Check if specified calendar is supported */ +- en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status); ++ en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status); + while ((cal = uenum_next(en, NULL, &status))) { + if (!strcmp(cal, rule.rscale)) { + is_hebrew = !strcmp(rule.rscale, "hebrew"); +-- +2.29.2 diff --git a/dev-libs/libical/libical-3.0.8.ebuild b/dev-libs/libical/libical-3.0.8.ebuild index fa889a4d2296..376befd62e06 100644 --- a/dev-libs/libical/libical-3.0.8.ebuild +++ b/dev-libs/libical/libical-3.0.8.ebuild @@ -48,6 +48,7 @@ DOCS=( PATCHES=( "${FILESDIR}/${PN}-3.0.4-tests.patch" "${FILESDIR}/${PN}-3.0.5-pkgconfig-libdir.patch" + "${FILESDIR}/${P}-icu-68.patch" # pending upstream PR #448, bug #751928 ) pkg_setup() { |