[crux-commits] ports/contrib (refs/remotes/origin/3.6): libical: 3.0.8 -> 3.0.9

crux at crux.nu crux at crux.nu
Sat Apr 10 19:06:02 UTC 2021


commit 26dfb7de4fe0f4fbf8eec8e6211974d12e45f089
Author: Tim Biermann <tbier at posteo.de>
Date:   Sun Jan 17 12:19:32 2021 +0000

    libical: 3.0.8 -> 3.0.9

diff --git a/libical/.footprint b/libical/.footprint
index b54880fab..bae8732af 100644
--- a/libical/.footprint
+++ b/libical/.footprint
@@ -91,28 +91,33 @@ drwxr-xr-x	root/root	usr/include/libical/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/cmake/
 drwxr-xr-x	root/root	usr/lib/cmake/LibIcal/
+-rw-r--r--	root/root	usr/lib/cmake/LibIcal/IcalGlibSrcGenerator-release.cmake
+-rw-r--r--	root/root	usr/lib/cmake/LibIcal/IcalGlibSrcGenerator.cmake
 -rw-r--r--	root/root	usr/lib/cmake/LibIcal/LibIcalConfig.cmake
 -rw-r--r--	root/root	usr/lib/cmake/LibIcal/LibIcalConfigVersion.cmake
 -rw-r--r--	root/root	usr/lib/cmake/LibIcal/LibIcalTargets-release.cmake
 -rw-r--r--	root/root	usr/lib/cmake/LibIcal/LibIcalTargets.cmake
 lrwxrwxrwx	root/root	usr/lib/libical-glib.so -> libical-glib.so.3
-lrwxrwxrwx	root/root	usr/lib/libical-glib.so.3 -> libical-glib.so.3.0.8
--rwxr-xr-x	root/root	usr/lib/libical-glib.so.3.0.8
+lrwxrwxrwx	root/root	usr/lib/libical-glib.so.3 -> libical-glib.so.3.0.9
+-rwxr-xr-x	root/root	usr/lib/libical-glib.so.3.0.9
 lrwxrwxrwx	root/root	usr/lib/libical.so -> libical.so.3
-lrwxrwxrwx	root/root	usr/lib/libical.so.3 -> libical.so.3.0.8
--rwxr-xr-x	root/root	usr/lib/libical.so.3.0.8
+lrwxrwxrwx	root/root	usr/lib/libical.so.3 -> libical.so.3.0.9
+-rwxr-xr-x	root/root	usr/lib/libical.so.3.0.9
+drwxr-xr-x	root/root	usr/lib/libical/
+drwxr-xr-x	root/root	usr/lib/libical/libical/
+-rwxr-xr-x	root/root	usr/lib/libical/libical/ical-glib-src-generator
 lrwxrwxrwx	root/root	usr/lib/libical_cxx.so -> libical_cxx.so.3
-lrwxrwxrwx	root/root	usr/lib/libical_cxx.so.3 -> libical_cxx.so.3.0.8
--rwxr-xr-x	root/root	usr/lib/libical_cxx.so.3.0.8
+lrwxrwxrwx	root/root	usr/lib/libical_cxx.so.3 -> libical_cxx.so.3.0.9
+-rwxr-xr-x	root/root	usr/lib/libical_cxx.so.3.0.9
 lrwxrwxrwx	root/root	usr/lib/libicalss.so -> libicalss.so.3
-lrwxrwxrwx	root/root	usr/lib/libicalss.so.3 -> libicalss.so.3.0.8
--rwxr-xr-x	root/root	usr/lib/libicalss.so.3.0.8
+lrwxrwxrwx	root/root	usr/lib/libicalss.so.3 -> libicalss.so.3.0.9
+-rwxr-xr-x	root/root	usr/lib/libicalss.so.3.0.9
 lrwxrwxrwx	root/root	usr/lib/libicalss_cxx.so -> libicalss_cxx.so.3
-lrwxrwxrwx	root/root	usr/lib/libicalss_cxx.so.3 -> libicalss_cxx.so.3.0.8
--rwxr-xr-x	root/root	usr/lib/libicalss_cxx.so.3.0.8
+lrwxrwxrwx	root/root	usr/lib/libicalss_cxx.so.3 -> libicalss_cxx.so.3.0.9
+-rwxr-xr-x	root/root	usr/lib/libicalss_cxx.so.3.0.9
 lrwxrwxrwx	root/root	usr/lib/libicalvcal.so -> libicalvcal.so.3
-lrwxrwxrwx	root/root	usr/lib/libicalvcal.so.3 -> libicalvcal.so.3.0.8
--rwxr-xr-x	root/root	usr/lib/libicalvcal.so.3.0.8
+lrwxrwxrwx	root/root	usr/lib/libicalvcal.so.3 -> libicalvcal.so.3.0.9
+-rwxr-xr-x	root/root	usr/lib/libicalvcal.so.3.0.9
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libical-glib.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libical.pc
diff --git a/libical/.signature b/libical/.signature
index 0e17f8b43..a8460cf64 100644
--- a/libical/.signature
+++ b/libical/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF30U5QfrCKMwHagqfrzTR/JsDNJSk4KzuZ4a3db4RwPUOf/z6XPdvqTSo7zwIEk90zBVOnfu0rqAhdEnPYzAMXw0=
-SHA256 (Pkgfile) = 73b5fabaa25ad641142acaace1539925a60dabad3372bb200e208566eebdc4a0
-SHA256 (.footprint) = d1a385335cc807f8b066454c2c7e35faf99ecbe880937899e2b44985bcf091c3
-SHA256 (libical-3.0.8.tar.gz) = 09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
-SHA256 (icu-68.1.patch) = 35baa04a18b66441ecc5a67e674e11c020e596e124f57cbf94a69595c4ca581c
+RWSagIOpLGJF33F3YMCDB+mzCQFvwGmbO8eLcXR708oEJhBUCc2AIBJwHbLCAcbRy6P3J1ZbWpzOBppZdlor2dvVQhJi66XxIAM=
+SHA256 (Pkgfile) = cdd45ab802085655426dc2f9dd0eaf85ed4d21f3a184607d92fe95f61beada13
+SHA256 (.footprint) = 27812d389ac7f16b04d984525c02a82eeaec5f151d0a4c51015aa03400d48d74
+SHA256 (libical-3.0.9.tar.gz) = bd26d98b7fcb2eb0cd5461747bbb02024ebe38e293ca53a7dfdcb2505265a728
diff --git a/libical/Pkgfile b/libical/Pkgfile
index 548cf6fbf..8291f72ac 100644
--- a/libical/Pkgfile
+++ b/libical/Pkgfile
@@ -4,19 +4,15 @@
 # Depends on: cmake glib libxml2
 
 name=libical
-version=3.0.8
+version=3.0.9
 release=1
-source=(https://github.com/libical/libical/archive/v$version/$name-$version.tar.gz
-  # https://github.com/libical/libical/commit/a3308a23912bba2db654a8c456165c31888cc897
-  # i removed the ReleaseNotes.txt as it failed to apply on the tagged ball
-  icu-68.1.patch)
+source=(https://github.com/libical/libical/archive/v$version/$name-$version.tar.gz)
 
 build() {
-  [ $(pkginfo -i | awk '/^icu / {split($2,a,"."); print a[1]}') -ge 68 ] && \
-    patch -p1 -d $name-$version -i $SRC/icu-68.1.patch
   cmake -S $name-$version -B build -G Ninja \
     -D CMAKE_INSTALL_PREFIX=/usr \
     -D CMAKE_INSTALL_LIBDIR=lib \
+    -D CMAKE_INSTALL_LIBEXECDIR=lib/$name \
     -D CMAKE_BUILD_TYPE=Release \
     -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
     -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
diff --git a/libical/icu-68.1.patch b/libical/icu-68.1.patch
deleted file mode 100644
index f17ca0cd5..000000000
--- a/libical/icu-68.1.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From a3308a23912bba2db654a8c456165c31888cc897 Mon Sep 17 00:00:00 2001
-From: Allen Winter <allen.winter at kdab.com>
-Date: Sat, 31 Oct 2020 17:38:01 -0400
-Subject: [PATCH] Fix build with icu-68.1
-
-Use stdbool.h to define true and false when possible
-
-Issue#448
----
- ConfigureChecks.cmake   |  1 +
- config.h.cmake          |  3 +++
- src/libical/icalrecur.c | 10 ++++++++--
- 4 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index e4d0e2ec..bba33fa9 100644
---- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
-@@ -10,6 +10,7 @@ check_include_files(sys/utsname.h HAVE_SYS_UTSNAME_H)
- 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)
- 
- Version 3.0.8 (07 March 2020):
- ------------------------------
-diff --git a/config.h.cmake b/config.h.cmake
-index 8fd3421b..c8008692 100644
---- a/config.h.cmake
-+++ b/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/src/libical/icalrecur.c b/src/libical/icalrecur.c
-index 38ee2bb3..64ec9732 100644
---- a/src/libical/icalrecur.c
-+++ b/src/libical/icalrecur.c
-@@ -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_supported_calendars(void)
- 
-     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_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");


More information about the crux-commits mailing list