From afa8f8dfd44ddbaab1b8124d0d4244c31a1bcd97 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Tue, 21 Dec 2021 14:55:34 +0100 Subject: [PATCH] hardknott: libical: sync with meta-imx hardknott-5.10.72-2.2.0 branch Remove the v3.0.8 version of the recipe to use the v3.0.9 recipe in poky. Also, adapt our .bbappend since some of its changes are outdated. Signed-off-by: Gabriel Valcazar --- ...-option-to-build-without-ICU-support.patch | 31 -------------- .../libical/libical_%.bbappend | 12 +----- .../recipes-support/libical/libical_3.0.8.bb | 40 ------------------- 3 files changed, 1 insertion(+), 82 deletions(-) delete mode 100644 meta-digi-dey/recipes-support/libical/libical/0001-CMakeList-add-option-to-build-without-ICU-support.patch delete mode 100644 meta-digi-dey/recipes-support/libical/libical_3.0.8.bb diff --git a/meta-digi-dey/recipes-support/libical/libical/0001-CMakeList-add-option-to-build-without-ICU-support.patch b/meta-digi-dey/recipes-support/libical/libical/0001-CMakeList-add-option-to-build-without-ICU-support.patch deleted file mode 100644 index bf68851c8..000000000 --- a/meta-digi-dey/recipes-support/libical/libical/0001-CMakeList-add-option-to-build-without-ICU-support.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Javier Viguera -Date: Mon, 20 Mar 2017 20:14:09 +0100 -Subject: [PATCH] CMakeLists: add option to build without ICU support - -Signed-off-by: Javier Viguera - ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 47d54d6..9717a82 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -191,6 +191,8 @@ endif() - # libicu is highly recommended for RSCALE support - # libicu can be found at http://www.icu-project.org - # RSCALE info at https://tools.ietf.org/html/rfc7529 -+option(WITH_LIBICU "Build with ICU support. Libicu is highly recommended for RSCALE support") -+if(WITH_LIBICU) - find_package(ICU) - set_package_properties(ICU PROPERTIES - TYPE RECOMMENDED -@@ -213,6 +215,7 @@ endif() - if(ICU_I18N_FOUND) - set(HAVE_LIBICU_I18N 1) - endif() -+endif() - - # compile in Berkeley DB support - find_package(BDB) diff --git a/meta-digi-dey/recipes-support/libical/libical_%.bbappend b/meta-digi-dey/recipes-support/libical/libical_%.bbappend index 2bff50c9d..9d81de0e0 100644 --- a/meta-digi-dey/recipes-support/libical/libical_%.bbappend +++ b/meta-digi-dey/recipes-support/libical/libical_%.bbappend @@ -1,14 +1,4 @@ -# Copyright (C) 2017 Digi International Inc. - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://0001-CMakeList-add-option-to-build-without-ICU-support.patch" - -# Remove inconditional 'icu' dependence if not set through PACKAGECONFIG -DEPENDS_remove = "${@bb.utils.contains('PACKAGECONFIG', 'icu', '', 'icu', d)}" - -PACKAGECONFIG ?= "icu" -PACKAGECONFIG[icu] = "-DWITH_LIBICU=1,-DWITH_LIBICU=0" +# Copyright (C) 2017-2021 Digi International Inc. # # Remove ICU support for 'ccimx6ul' to save space in the rootfs. diff --git a/meta-digi-dey/recipes-support/libical/libical_3.0.8.bb b/meta-digi-dey/recipes-support/libical/libical_3.0.8.bb deleted file mode 100644 index 0fac8d4ae..000000000 --- a/meta-digi-dey/recipes-support/libical/libical_3.0.8.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "iCal and scheduling (RFC 2445, 2446, 2447) library" -HOMEPAGE = "https://github.com/libical/libical" -BUGTRACKER = "https://github.com/libical/libical/issues" -LICENSE = "LGPLv2.1 | MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1910a2a76ddf6a9ba369182494170d87 \ - file://LICENSE.LGPL21.txt;md5=933adb561f159e7c3da079536f0ed871 \ - file://LICENSE.MPL2.txt;md5=f75d2927d3c1ed2414ef72048f5ad640 \ - " -SECTION = "libs" - -FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-support/libical/libical:" - -SRC_URI = " \ - https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ - file://0001-Use-our-hand-build-native-src-generator.patch \ -" -SRC_URI[md5sum] = "41bd1f1fcdcb4779cea478bb55cf07bf" -SRC_URI[sha256sum] = "09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f" -UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases" - -inherit cmake pkgconfig - -PACKAGECONFIG ??= "icu glib" -PACKAGECONFIG[bdb] = ",-DCMAKE_DISABLE_FIND_PACKAGE_BDB=True,db" -PACKAGECONFIG[glib] = "-DICAL_GLIB=True,-DICAL_GLIB=False,glib-2.0-native libxml2-native glib-2.0 libxml2" -# ICU is used for RSCALE (RFC7529) support -PACKAGECONFIG[icu] = ",-DCMAKE_DISABLE_FIND_PACKAGE_ICU=True,icu" - -# No need to use perl-native, the host perl is sufficient. -EXTRA_OECMAKE += "-DPERL_EXECUTABLE=${HOSTTOOLS_DIR}/perl" -# doc build fails with linker error (??) for libical-glib so disable it -EXTRA_OECMAKE += "-DICAL_BUILD_DOCS=false" - -do_install_append () { - # Remove build host references - sed -i \ - -e 's,${STAGING_LIBDIR},${libdir},g' \ - -e 's,${STAGING_INCDIR},${includedir},g' \ - ${D}${libdir}/cmake/LibIcal/LibIcal*.cmake -}