diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2024-08-12 00:14:29 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2024-08-12 00:14:29 -0500 |
| commit | afc1f48ad2395c60a543a0f4b039308459fb1f63 (patch) | |
| tree | 98815fc0546607855ca7cd61c1b294afbe6550b6 | |
| parent | bf5f471ea7d6c17d2341305485b953b20d62f540 (diff) | |
| download | packages-afc1f48ad2395c60a543a0f4b039308459fb1f63.tar.gz packages-afc1f48ad2395c60a543a0f4b039308459fb1f63.tar.bz2 packages-afc1f48ad2395c60a543a0f4b039308459fb1f63.tar.xz packages-afc1f48ad2395c60a543a0f4b039308459fb1f63.zip | |
user/libical: Update to 3.0.18, add ICU 75 patch
| -rw-r--r-- | user/libical/APKBUILD | 9 | ||||
| -rw-r--r-- | user/libical/icu75.patch | 31 |
2 files changed, 37 insertions, 3 deletions
diff --git a/user/libical/APKBUILD b/user/libical/APKBUILD index 6b51d3b78..68a0e7c77 100644 --- a/user/libical/APKBUILD +++ b/user/libical/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Zach van Rijn <me@zv.io> pkgname=libical -pkgver=3.0.14 +pkgver=3.0.18 pkgrel=0 pkgdesc="Reference implementation of the iCalendar format" url="https://libical.github.io/libical/" @@ -10,7 +10,9 @@ depends="" depends_dev="db-dev" makedepends="$depends_dev cmake glib-dev icu-dev libxml2-dev perl" subpackages="$pkgname-dev" -source="https://github.com/libical/libical/releases/download/v$pkgver/libical-$pkgver.tar.gz" +source="https://github.com/libical/libical/releases/download/v$pkgver/libical-$pkgver.tar.gz + icu75.patch + " build() { cmake \ @@ -29,4 +31,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="36da5516672976c71b049a12af36164d91f9b655f81f1884766558149f25e80c30e64d15da848842f8a629295d708f39ce6fa63a3b0da39b5cbeb91911a4e6d8 libical-3.0.14.tar.gz" +sha512sums="53ecf6c14a68d569dd11bfdeb1a072def847a14d189c6af16eab202e004350ee7d9488c6b63e9cb67889e8c2dec90643fef46aec143a915f28270d0752eaa9d5 libical-3.0.18.tar.gz +d6f4082a6b3a3ad6a2b2aae92696446be6260fa99152fe6e09dad2d7942f8495698cc218f2feee542da4021a03dca0006167d6bc46a7dd3d8103e1998092d3fb icu75.patch" diff --git a/user/libical/icu75.patch b/user/libical/icu75.patch new file mode 100644 index 000000000..321c02aba --- /dev/null +++ b/user/libical/icu75.patch @@ -0,0 +1,31 @@ +From ec62c552df8e1fcc187855bb342c082e22a08edc Mon Sep 17 00:00:00 2001 +From: Lukas Fleischer <lfleischer@lfos.de> +Date: Wed, 15 May 2024 12:28:38 +0700 +Subject: [PATCH] Fix build with ICU 75 + +--- + src/libical/icalrecur.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libical/icalrecur.c b/src/libical/icalrecur.c +index 3c1789480..1907a3636 100644 +--- a/src/libical/icalrecur.c ++++ b/src/libical/icalrecur.c +@@ -1125,7 +1125,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", "", false, &status); + while ((cal = uenum_next(en, NULL, &status))) { + cal = icalmemory_tmp_copy(cal); + icalarray_append(calendars, &cal); +@@ -1526,7 +1526,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", "", false, &status); + while ((cal = uenum_next(en, NULL, &status))) { + if (!strcmp(cal, rule.rscale)) { + is_hebrew = !strcmp(rule.rscale, "hebrew"); |