Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 30 Apr 2023 13:09:09 GMT
From:      Hajimu UMEMOTO <ume@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 095a3512c60c - main - devel/libical: update to 3.0.16
Message-ID:  <202304301309.33UD99p8084284@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by ume:

URL: https://cgit.FreeBSD.org/ports/commit/?id=095a3512c60c8c62fbe6be687d0dea82cbc4ce4f

commit 095a3512c60c8c62fbe6be687d0dea82cbc4ce4f
Author:     Hajimu UMEMOTO <ume@FreeBSD.org>
AuthorDate: 2023-04-30 13:06:01 +0000
Commit:     Hajimu UMEMOTO <ume@FreeBSD.org>
CommitDate: 2023-04-30 13:08:57 +0000

    devel/libical: update to 3.0.16
    
    PR:             270368
    Exp-run by:     antoine
    Relnotes:       https://github.com/libical/libical/releases/tag/v3.0.16
---
 devel/libical/Makefile                             |   4 +-
 devel/libical/distinfo                             |   6 +-
 devel/libical/files/patch-icu68                    |  29 ------
 .../files/patch-src__libical__icaltz-util.c        |  13 +++
 devel/libical/pkg-plist                            | 101 +++++++++++----------
 5 files changed, 70 insertions(+), 83 deletions(-)

diff --git a/devel/libical/Makefile b/devel/libical/Makefile
index 2a591dd3aff4..a38d5bec6806 100644
--- a/devel/libical/Makefile
+++ b/devel/libical/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	libical
-DISTVERSION=	3.0.8
-PORTREVISION=	9
+DISTVERSION=	3.0.16
+PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/libical/libical/releases/download/v${PORTVERSION}/
 
diff --git a/devel/libical/distinfo b/devel/libical/distinfo
index c42ef38e900e..9111ad691e25 100644
--- a/devel/libical/distinfo
+++ b/devel/libical/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600018384
-SHA256 (libical-3.0.8.tar.gz) = 09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
-SIZE (libical-3.0.8.tar.gz) = 881462
+TIMESTAMP = 1679333121
+SHA256 (libical-3.0.16.tar.gz) = b44705dd71ca4538c86fb16248483ab4b48978524fb1da5097bd76aa2e0f0c33
+SIZE (libical-3.0.16.tar.gz) = 921245
diff --git a/devel/libical/files/patch-icu68 b/devel/libical/files/patch-icu68
deleted file mode 100644
index 8fc1516a74bb..000000000000
--- a/devel/libical/files/patch-icu68
+++ /dev/null
@@ -1,29 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-src/libical/icalrecur.c:1021:59: error: use of undeclared identifier 'FALSE'
-    en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status);
-                                                          ^
-src/libical/icalrecur.c:1414:63: error: use of undeclared identifier 'FALSE'
-        en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status);
-                                                              ^
-
---- src/libical/icalrecur.c.orig	2020-03-07 14:42:42 UTC
-+++ src/libical/icalrecur.c
-@@ -1018,7 +1018,7 @@ icalarray *icalrecurrencetype_rscale_supported_calenda
- 
-     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 +1411,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");
diff --git a/devel/libical/files/patch-src__libical__icaltz-util.c b/devel/libical/files/patch-src__libical__icaltz-util.c
new file mode 100644
index 000000000000..a4452c531f52
--- /dev/null
+++ b/devel/libical/files/patch-src__libical__icaltz-util.c
@@ -0,0 +1,13 @@
+--- src/libical/icaltz-util.c.orig	2022-10-17 20:53:57 UTC
++++ src/libical/icaltz-util.c
+@@ -82,6 +82,10 @@
+ #define bswap_64 __builtin_bswap64
+ #endif
+ 
++#if defined(__FreeBSD__) && !defined(bswap_64)
++#define bswap_64(x) __bswap64(x)
++#endif
++
+ typedef struct
+ {
+     char magic[4];
diff --git a/devel/libical/pkg-plist b/devel/libical/pkg-plist
index 9d63783b5e5e..d819fd64dcb5 100644
--- a/devel/libical/pkg-plist
+++ b/devel/libical/pkg-plist
@@ -83,11 +83,13 @@ include/libical/vcaltmp.h
 include/libical/vcc.h
 include/libical/vcomponent_cxx.h
 include/libical/vobject.h
+%%GLIB%%lib/cmake/LibIcal/IcalGlibSrcGenerator-release.cmake
+%%GLIB%%lib/cmake/LibIcal/IcalGlibSrcGenerator.cmake
 lib/cmake/LibIcal/LibIcalConfig.cmake
 lib/cmake/LibIcal/LibIcalConfigVersion.cmake
 lib/cmake/LibIcal/LibIcalTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/LibIcal/LibIcalTargets.cmake
-%%INTROSPECTION%%%%GLIB%%lib/girepository-1.0/ICal-3.0.typelib
+%%INTROSPECTION%%lib/girepository-1.0/ICal-3.0.typelib
 %%INTROSPECTION%%%%GLIB%%lib/girepository-1.0/ICalGLib-3.0.typelib
 %%GLIB%%lib/libical-glib.a
 %%GLIB%%lib/libical-glib.so
@@ -115,53 +117,54 @@ lib/libicalvcal.so.3
 lib/libicalvcal.so.%%VERSION%%
 %%GLIB%%libdata/pkgconfig/libical-glib.pc
 libdata/pkgconfig/libical.pc
-%%INTROSPECTION%%%%GLIB%%share/gir-1.0/ICal-3.0.gir
+%%GLIB%%libexec/libical/ical-glib-src-generator
+%%INTROSPECTION%%share/gir-1.0/ICal-3.0.gir
 %%INTROSPECTION%%%%GLIB%%share/gir-1.0/ICalGLib-3.0.gir
-%%PORTDOCS%%%%DOCSDIR%%/ICalArray.html
-%%PORTDOCS%%%%DOCSDIR%%/ICalAttach.html
-%%PORTDOCS%%%%DOCSDIR%%/ICalCompIter.html
-%%PORTDOCS%%%%DOCSDIR%%/ICalComponent.html
-%%PORTDOCS%%%%DOCSDIR%%/ICalDatetimeperiod.html
-%%PORTDOCS%%%%DOCSDIR%%/ICalDuration.html
-%%PORTDOCS%%%%DOCSDIR%%/ICalGeo.html
-%%PORTDOCS%%%%DOCSDIR%%/ICalObject.html
-%%PORTDOCS%%%%DOCSDIR%%/ICalParameter.html
-%%PORTDOCS%%%%DOCSDIR%%/ICalParser.html
-%%PORTDOCS%%%%DOCSDIR%%/ICalPeriod.html
-%%PORTDOCS%%%%DOCSDIR%%/ICalProperty.html
-%%PORTDOCS%%%%DOCSDIR%%/ICalRecurIterator.html
-%%PORTDOCS%%%%DOCSDIR%%/ICalRecurrence.html
-%%PORTDOCS%%%%DOCSDIR%%/ICalReqstat.html
-%%PORTDOCS%%%%DOCSDIR%%/ICalTime.html
-%%PORTDOCS%%%%DOCSDIR%%/ICalTimeSpan.html
-%%PORTDOCS%%%%DOCSDIR%%/ICalTimezone.html
-%%PORTDOCS%%%%DOCSDIR%%/ICalTrigger.html
-%%PORTDOCS%%%%DOCSDIR%%/ICalValue.html
-%%PORTDOCS%%%%DOCSDIR%%/annotation-glossary.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-1-0.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-0.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-3-0-5.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-3-0.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-full.html
-%%PORTDOCS%%%%DOCSDIR%%/ch01.html
-%%PORTDOCS%%%%DOCSDIR%%/home.png
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/left-insensitive.png
-%%PORTDOCS%%%%DOCSDIR%%/left.png
-%%PORTDOCS%%%%DOCSDIR%%/libical-glib-i-cal-derived-parameter.html
-%%PORTDOCS%%%%DOCSDIR%%/libical-glib-i-cal-derived-property.html
-%%PORTDOCS%%%%DOCSDIR%%/libical-glib-i-cal-derived-value.html
-%%PORTDOCS%%%%DOCSDIR%%/libical-glib-i-cal-enums.html
-%%PORTDOCS%%%%DOCSDIR%%/libical-glib-i-cal-error.html
-%%PORTDOCS%%%%DOCSDIR%%/libical-glib-i-cal-memory.html
-%%PORTDOCS%%%%DOCSDIR%%/libical-glib-i-cal-mime.html
-%%PORTDOCS%%%%DOCSDIR%%/libical-glib-i-cal-recur.html
-%%PORTDOCS%%%%DOCSDIR%%/libical-glib-i-cal-restriction.html
-%%PORTDOCS%%%%DOCSDIR%%/libical-glib-i-cal-unknowntokenhandling.html
-%%PORTDOCS%%%%DOCSDIR%%/libical-glib.devhelp2
-%%PORTDOCS%%%%DOCSDIR%%/right-insensitive.png
-%%PORTDOCS%%%%DOCSDIR%%/right.png
-%%PORTDOCS%%%%DOCSDIR%%/style.css
-%%PORTDOCS%%%%DOCSDIR%%/up-insensitive.png
-%%PORTDOCS%%%%DOCSDIR%%/up.png
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/ICalArray.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/ICalAttach.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/ICalCompIter.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/ICalComponent.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/ICalDatetimeperiod.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/ICalDuration.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/ICalGeo.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/ICalObject.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/ICalParameter.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/ICalParser.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/ICalPeriod.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/ICalProperty.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/ICalRecurIterator.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/ICalRecurrence.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/ICalReqstat.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/ICalTime.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/ICalTimeSpan.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/ICalTimezone.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/ICalTrigger.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/ICalValue.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/annotation-glossary.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/api-index-1-0.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/api-index-2-0.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/api-index-3-0-5.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/api-index-3-0.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/api-index-full.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/ch01.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/home.png
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/left-insensitive.png
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/left.png
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/libical-glib-i-cal-derived-parameter.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/libical-glib-i-cal-derived-property.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/libical-glib-i-cal-derived-value.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/libical-glib-i-cal-enums.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/libical-glib-i-cal-error.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/libical-glib-i-cal-memory.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/libical-glib-i-cal-mime.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/libical-glib-i-cal-recur.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/libical-glib-i-cal-restriction.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/libical-glib-i-cal-unknowntokenhandling.html
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/libical-glib.devhelp2
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/right-insensitive.png
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/right.png
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/up-insensitive.png
+%%PORTDOCS%%%%GLIB%%%%DOCSDIR%%/up.png
 %%VAPI%%%%GLIB%%share/vala/vapi/libical-glib.vapi



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304301309.33UD99p8084284>