[arch-commits] Commit in libical/trunk (3 files)

[Antonio Rojas]

    Date: Sunday, January 24, 2021 @ 09:57:05
  Author: arojas
Revision: 406692

Update to 3.0.9

Modified:
  libical/trunk/PKGBUILD
Deleted:
  libical/trunk/icu68.patch
  libical/trunk/libical-glib-python-tests.patch

---------------------------------+
 PKGBUILD                        |   21 ++++++---------------
 icu68.patch                     |   29 -----------------------------
 libical-glib-python-tests.patch |   30 ------------------------------
 3 files changed, 6 insertions(+), 74 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-24 09:23:00 UTC (rev 406691)
+++ PKGBUILD	2021-01-24 09:57:05 UTC (rev 406692)
@@ -3,32 +3,23 @@
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=libical
-pkgver=3.0.8
-pkgrel=3
+pkgver=3.0.9
+pkgrel=1
 pkgdesc="An open source reference implementation of the icalendar data type and serialization format"
 arch=('x86_64')
 url='https://github.com/libical/libical'
 license=('LGPL' 'MPL')
-depends=('glibc' 'glib2' 'icu' 'db')
+depends=('glibc' 'glib2' 'icu' 'db' 'libxml2')
 makedepends=('cmake' 'gtk-doc' 'doxygen' 'vala' 'gobject-introspection')
 checkdepends=('python-gobject')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz"
-        libical-glib-python-tests.patch
-        icu68.patch)
-sha512sums=('ce015e6d4c1c7cb4af7b45748ce8251c663f80f6a4357ddff6a97796642619abe882f4cadeca10cabeb1b25577869f436da15bca882e032eb3ff0475f6010d8b'
-            '1b79b69ad4584b29259a656bed4ac1ee97cd3e7b65da478bfcdd51cecba2a9eb0375ecd6e796e289a58007ee03ed74bb4ab6f1488937dcd9329d296bfc438342'
-            '58d4d32e82af39d1acc56135c601483f6df92915e43bd053374da28359cc4750014766def9cf6eafea2280f0f6c53d546691f035beaa15007e3b603c02a7986c')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz")
+sha512sums=('4a9894d82776437cb2ef16df70bffb52da7b4fd57b52a4f6941430b3b1f9830829f0775fb495411f67393581bda1304b54c9f0031bc3d4ada56d2204900cb268')
 
-prepare() {
-  cd "${pkgname}-${pkgver}"
-  patch -Np1 -i ../libical-glib-python-tests.patch
-  patch -Np0 -i ../icu68.patch
-}
-
 build() {
   cmake -H"${pkgname}-${pkgver}" -Bbuild \
     -DCMAKE_BUILD_TYPE=None \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBEXECDIR=lib \
     -DGOBJECT_INTROSPECTION=true \
     -DICAL_GLIB_VAPI=true \
     -DSHARED_ONLY=true

Deleted: icu68.patch
===================================================================
--- icu68.patch	2021-01-24 09:23:00 UTC (rev 406691)
+++ icu68.patch	2021-01-24 09:57:05 UTC (rev 406692)
@@ -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");

Deleted: libical-glib-python-tests.patch
===================================================================
--- libical-glib-python-tests.patch	2021-01-24 09:23:00 UTC (rev 406691)
+++ libical-glib-python-tests.patch	2021-01-24 09:57:05 UTC (rev 406692)
@@ -1,30 +0,0 @@
-From 07d1edb3393e86c821282beb6f7aa607beaeedc4 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha at redhat.com>
-Date: Tue, 4 Aug 2020 18:37:14 +0200
-Subject: [PATCH] tests: Change how libical-glib python tests are invoked
-
-Add -I to not include the current source directory in the search path,
-which avoids to use 'array.py' (or other test files) as an import module
-of the dependencies.
-
-More information can be found here:
-https://bugzilla.redhat.com/show_bug.cgi?id=1865924
-
-Signed-off-by: Allen Winter <allen.winter at kdab.com>
----
- src/test/libical-glib/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/test/libical-glib/CMakeLists.txt b/src/test/libical-glib/CMakeLists.txt
-index c7b16655..1cd14cea 100644
---- a/src/test/libical-glib/CMakeLists.txt
-+++ b/src/test/libical-glib/CMakeLists.txt
-@@ -31,7 +31,7 @@ if(PYTHON3)
- 
-     add_test(
-       NAME ${test_name}
--      COMMAND ${PYTHON3} ${CMAKE_CURRENT_SOURCE_DIR}/${test_file}
-+      COMMAND ${PYTHON3} -I ${CMAKE_CURRENT_SOURCE_DIR}/${test_file}
-       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-     )
-