[gentoo-commits] repo/gentoo:master commit in: dev-libs/libical/, dev-libs/libical/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     e3f601190368dea81c1f86f75f5b70dccb220129
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 16:32:17 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 09:20:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3f60119

dev-libs/libical: Fix build with ICU-68

Thanks-to: Lars Wendler <polynomial-c <AT> gentoo.org>
Closes: https://bugs.gentoo.org/751928
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/libical/files/libical-3.0.8-icu-68.patch | 44 +++++++++++++++++++++++
 dev-libs/libical/libical-3.0.8.ebuild             |  1 +
 2 files changed, 45 insertions(+)

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 00000000000..1974db76b0a
--- /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 fa889a4d229..376befd62e0 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() {