diff options
Diffstat (limited to 'user/libical')
-rw-r--r-- | user/libical/APKBUILD | 9 | ||||
-rw-r--r-- | user/libical/icu75.patch | 31 |
2 files changed, 3 insertions, 37 deletions
diff --git a/user/libical/APKBUILD b/user/libical/APKBUILD index 68a0e7c77..3068a35d5 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.18 +pkgver=3.0.20 pkgrel=0 pkgdesc="Reference implementation of the iCalendar format" url="https://libical.github.io/libical/" @@ -10,9 +10,7 @@ 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 - icu75.patch - " +source="https://github.com/libical/libical/releases/download/v$pkgver/libical-$pkgver.tar.gz" build() { cmake \ @@ -31,5 +29,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="53ecf6c14a68d569dd11bfdeb1a072def847a14d189c6af16eab202e004350ee7d9488c6b63e9cb67889e8c2dec90643fef46aec143a915f28270d0752eaa9d5 libical-3.0.18.tar.gz -d6f4082a6b3a3ad6a2b2aae92696446be6260fa99152fe6e09dad2d7942f8495698cc218f2feee542da4021a03dca0006167d6bc46a7dd3d8103e1998092d3fb icu75.patch" +sha512sums="2506320240ba0e4287b6ef1b90b653eacd51105d392b91f8c772f3b0745fecbf55eecfe81f89413cc56106b71ccca780754df31f5190ffce6c372126e27bf1da libical-3.0.20.tar.gz" diff --git a/user/libical/icu75.patch b/user/libical/icu75.patch deleted file mode 100644 index 321c02aba..000000000 --- a/user/libical/icu75.patch +++ /dev/null @@ -1,31 +0,0 @@ -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"); |