diff options
Diffstat (limited to 'user/libical')
| -rw-r--r-- | user/libical/APKBUILD | 17 | ||||
| -rw-r--r-- | user/libical/automake.patch | 11 | ||||
| -rw-r--r-- | user/libical/icu75.patch | 31 |
3 files changed, 39 insertions, 20 deletions
diff --git a/user/libical/APKBUILD b/user/libical/APKBUILD index 4d03d3c27..68a0e7c77 100644 --- a/user/libical/APKBUILD +++ b/user/libical/APKBUILD @@ -1,36 +1,35 @@ -# Maintainer: +# Maintainer: Zach van Rijn <me@zv.io> pkgname=libical -pkgver=3.0.5 +pkgver=3.0.18 pkgrel=0 pkgdesc="Reference implementation of the iCalendar format" url="https://libical.github.io/libical/" arch="all" -#options="!check" # Test suite is very broken. license="MPL-2.0 OR LGPL-2.1-only" 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() { - cd "$builddir" cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DSHARED_ONLY=true \ - -DENABLE_GTK_DOC=OFF + -DENABLE_GTK_DOC=OFF . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="9bf24b535864f66ea0b8d52d902d15fbfd20efbc480b5188ecd1b3d4aafdba063219763f99a8c30413964f7a024c7a902bade6bc40224bc59a438e672f65d656 libical-3.0.5.tar.gz" +sha512sums="53ecf6c14a68d569dd11bfdeb1a072def847a14d189c6af16eab202e004350ee7d9488c6b63e9cb67889e8c2dec90643fef46aec143a915f28270d0752eaa9d5 libical-3.0.18.tar.gz +d6f4082a6b3a3ad6a2b2aae92696446be6260fa99152fe6e09dad2d7942f8495698cc218f2feee542da4021a03dca0006167d6bc46a7dd3d8103e1998092d3fb icu75.patch" diff --git a/user/libical/automake.patch b/user/libical/automake.patch deleted file mode 100644 index 757220a62..000000000 --- a/user/libical/automake.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./configure.in.orig 2012-12-31 20:03:51.355227119 +0000 -+++ ./configure.in 2012-12-31 20:04:03.445327143 +0000 -@@ -5,7 +5,7 @@ - AC_CANONICAL_SYSTEM - AM_INIT_AUTOMAKE - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADER(config.h) - - dnl Initialize maintainer mode - AM_MAINTAINER_MODE 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"); |