libical: use upstream patches to fix icu fallout.

4 files changed, 70 insertions, 17 deletions

diff --git a/time/libical/distinfo b/time/libical/distinfo
index 5b8bdc176f1..df6938844cd 100644
--- a/time/libical/distinfo
+++ b/time/libical/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.14 2020/11/07 09:06:32 mef Exp $
+$NetBSD: distinfo,v 1.15 2020/11/07 10:30:20 nia Exp $
 
 SHA1 (libical-3.0.8.tar.gz) = d2a9cecb9b8d825d5b6989e44b424235a27173a7
 RMD160 (libical-3.0.8.tar.gz) = 1b5fa93675e74e6721107214202ab922fd5a164c
 SHA512 (libical-3.0.8.tar.gz) = ce015e6d4c1c7cb4af7b45748ce8251c663f80f6a4357ddff6a97796642619abe882f4cadeca10cabeb1b25577869f436da15bca882e032eb3ff0475f6010d8b
 Size (libical-3.0.8.tar.gz) = 881462 bytes
-SHA1 (patch-src_libical_icalrecur.c) = 1ae42a3cad1a662f37001b3de056bbeb30b9a9fa
+SHA1 (patch-ConfigureChecks.cmake) = fe6d75c6217a303aefb6aaaef1d6f1eca883bc75
+SHA1 (patch-config.h.cmake) = ae5ae3dd64a0fddf4929d925627412b04852975e
+SHA1 (patch-src_libical_icalrecur.c) = bca2a5ce3868522aacbe7f59a43283063b0c91b0
 SHA1 (patch-src_libical_icaltz-util.c) = eb3b6d1d63faf138897968d4e2c4ee8da4ada15a
diff --git a/time/libical/patches/patch-ConfigureChecks.cmake b/time/libical/patches/patch-ConfigureChecks.cmake
new file mode 100644
index 00000000000..19f9b49d085
--- /dev/null
+++ b/time/libical/patches/patch-ConfigureChecks.cmake
@@ -0,0 +1,16 @@
+$NetBSD: patch-ConfigureChecks.cmake,v 1.1 2020/11/07 10:30:20 nia Exp $
+
+[PATCH] Fix build with icu-68.1
+
+https://github.com/libical/libical/commit/a3308a23912bba2db654a8c456165c31888cc897.patch
+
+--- ConfigureChecks.cmake.orig	2020-03-07 14:42:42.000000000 +0000
++++ ConfigureChecks.cmake
+@@ -10,6 +10,7 @@ check_include_files(sys/utsname.h HAVE_S
+ check_include_files(fcntl.h HAVE_FCNTL_H)
+ check_include_files(unistd.h HAVE_UNISTD_H)
+ check_include_files(wctype.h HAVE_WCTYPE_H)
++check_include_files(stdbool.h HAVE_STDBOOL_H)
+ 
+ include(CheckFunctionExists)
+ if(WIN32 AND MSVC)
diff --git a/time/libical/patches/patch-config.h.cmake b/time/libical/patches/patch-config.h.cmake
new file mode 100644
index 00000000000..09333abed61
--- /dev/null
+++ b/time/libical/patches/patch-config.h.cmake
@@ -0,0 +1,18 @@
+$NetBSD: patch-config.h.cmake,v 1.1 2020/11/07 10:30:20 nia Exp $
+
+[PATCH] Fix build with icu-68.1
+
+https://github.com/libical/libical/commit/a3308a23912bba2db654a8c456165c31888cc897.patch
+
+--- config.h.cmake.orig	2020-03-07 14:42:42.000000000 +0000
++++ config.h.cmake
+@@ -39,6 +39,9 @@
+ /* Define to 1 if you have the <dirent.h> header file. */
+ #cmakedefine HAVE_DIRENT_H 1
+ 
++/* Define to 1 if you have the <stdbool.h> header file. */
++#cmakedefine HAVE_STDBOOL_H 1
++
+ /* Define if we have pthread. */
+ #cmakedefine HAVE_PTHREAD_ATTR_GET_NP 1
+ #cmakedefine HAVE_PTHREAD_GETATTR_NP 1
diff --git a/time/libical/patches/patch-src_libical_icalrecur.c b/time/libical/patches/patch-src_libical_icalrecur.c
index 860f0ba5f12..1650512081e 100644
--- a/time/libical/patches/patch-src_libical_icalrecur.c
+++ b/time/libical/patches/patch-src_libical_icalrecur.c
@@ -1,22 +1,39 @@
-$NetBSD: patch-src_libical_icalrecur.c,v 1.1 2020/11/07 09:06:32 mef Exp $
+$NetBSD: patch-src_libical_icalrecur.c,v 1.2 2020/11/07 10:30:20 nia Exp $
 
-Adhoc fix:  FALSE is not defined
+[PATCH] Fix build with icu-68.1
 
-/tmp/time/libical/work/libical-3.0.8/src/libical/icalrecur.c:1021:59: error: 'FALSE' undeclared (first use in this function); did you mean 'FILE'?
-     en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status);
-                                                           ^~~~~
-                                                           FILE
-/tmp/time/libical/work/libical-3.0.8/src/libical/icalrecur.c:1021:59: note: each undeclared identifier is reported only once for each function it appears in
+https://github.com/libical/libical/commit/a3308a23912bba2db654a8c456165c31888cc897.patch
 
 --- src/libical/icalrecur.c.orig	2020-03-07 14:42:42.000000000 +0000
 +++ src/libical/icalrecur.c
-@@ -127,6 +127,9 @@
-   end_of_data to 1x. This signals next_month to increment the month.
- 
-  ======================================================================*/
-+#ifndef FALSE
-+#define FALSE (0)
+@@ -145,6 +145,12 @@
+ #if defined(HAVE_LIBICU)
+ #include <unicode/ucal.h>
+ #include <unicode/ustring.h>
++#if defined(HAVE_STDBOOL_H)
++#include <stdbool.h>
++#else
++#define false 0
++#define true 1
 +#endif
+ #define RSCALE_IS_SUPPORTED 1
+ #else
+ #define RSCALE_IS_SUPPORTED 0
+@@ -1018,7 +1024,7 @@ icalarray *icalrecurrencetype_rscale_sup
+ 
+     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);
+@@ -1411,7 +1417,7 @@ static int initialize_rscale(icalrecur_i
+         }
  
- #ifdef HAVE_CONFIG_H
- #include <config.h>
+         /* 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");