From 647a2d439773e2d5b2d23c7d318b353382642b55 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 15 Mar 2025 14:11:31 +0000 Subject: libical: upgrade 3.0.19 -> 3.0.20 (From OE-Core rev: 88c6ffab00f9da9075c7cafe619d5e7d823f9d77) Signed-off-by: Richard Purdie --- ...-cmake-Do-not-export-CC-into-gir-compiler.patch | 2 +- meta/recipes-support/libical/libical_3.0.19.bb | 55 ---------------------- meta/recipes-support/libical/libical_3.0.20.bb | 55 ++++++++++++++++++++++ 3 files changed, 56 insertions(+), 56 deletions(-) delete mode 100644 meta/recipes-support/libical/libical_3.0.19.bb create mode 100644 meta/recipes-support/libical/libical_3.0.20.bb diff --git a/meta/recipes-support/libical/libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch b/meta/recipes-support/libical/libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch index 0a7c696530..0f0dadb4e4 100644 --- a/meta/recipes-support/libical/libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch +++ b/meta/recipes-support/libical/libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch @@ -1,4 +1,4 @@ -From 145a0f3919f6884c377a9e6b8a03de707feb45fe Mon Sep 17 00:00:00 2001 +From 7b20ca7f24a4cac25998bfcc70eed75bf796816b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 3 Mar 2022 20:10:04 -0800 Subject: [PATCH] cmake: Do not export CC into gir compiler diff --git a/meta/recipes-support/libical/libical_3.0.19.bb b/meta/recipes-support/libical/libical_3.0.19.bb deleted file mode 100644 index 1ee39aa94f..0000000000 --- a/meta/recipes-support/libical/libical_3.0.19.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "iCal and scheduling (RFC 2445, 2446, 2447) library" -DESCRIPTION = "An Open Source implementation of the iCalendar protocols \ -and protocol data units. The iCalendar specification describes how \ -calendar clients can communicate with calendar servers so users can store \ -their calendar data and arrange meetings with other users. " -HOMEPAGE = "https://github.com/libical/libical" -BUGTRACKER = "https://github.com/libical/libical/issues" -LICENSE = "LGPL-2.1-only | MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1910a2a76ddf6a9ba369182494170d87 \ - file://LICENSE.LGPL21.txt;md5=8f690bb538f4b301d931374a6eb864d0 \ - file://LICENSE.MPL2.txt;md5=f75d2927d3c1ed2414ef72048f5ad640 \ - " -SECTION = "libs" - -SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ - file://0001-cmake-Do-not-export-CC-into-gir-compiler.patch \ - " -SRC_URI[sha256sum] = "6a1e7f0f50a399cbad826bcc286ce10d7151f3df7cc103f641de15160523c73f" - -inherit cmake pkgconfig gobject-introspection vala github-releases - -DEPENDS += "libical-native" - -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" -# Disable the test suite as we can't install it -EXTRA_OECMAKE += "-DLIBICAL_BUILD_TESTING=false" -# doc build fails with linker error (??) for libical-glib so disable it -EXTRA_OECMAKE += "-DICAL_BUILD_DOCS=false" -# gobject-introspection -EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper" -EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper" -EXTRA_OECMAKE += "-DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen" -EXTRA_OECMAKE += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DGOBJECT_INTROSPECTION=ON -DICAL_GLIB_VAPI=ON', '-DGOBJECT_INTROSPECTION=OFF -DICAL_GLIB_VAPI=OFF', d)}" -EXTRA_OECMAKE:append:class-native = " -DGOBJECT_INTROSPECTION=OFF -DICAL_GLIB_VAPI=OFF" - -# Tell the cross-libical where the tool it needs to build is -EXTRA_OECMAKE:append:class-target = " -DIMPORT_ICAL_GLIB_SRC_GENERATOR=${STAGING_LIBDIR_NATIVE}/cmake/LibIcal/IcalGlibSrcGenerator.cmake" - -do_install:append () { - # Remove build host references (https://github.com/libical/libical/issues/532) - sed -i \ - -e 's,${STAGING_LIBDIR},${libdir},g' \ - -e 's,${STAGING_INCDIR},${includedir},g' \ - ${D}${libdir}/cmake/LibIcal/LibIcal*.cmake \ - ${D}${libdir}/cmake/LibIcal/Ical*.cmake -} - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-support/libical/libical_3.0.20.bb b/meta/recipes-support/libical/libical_3.0.20.bb new file mode 100644 index 0000000000..d62c88e347 --- /dev/null +++ b/meta/recipes-support/libical/libical_3.0.20.bb @@ -0,0 +1,55 @@ +SUMMARY = "iCal and scheduling (RFC 2445, 2446, 2447) library" +DESCRIPTION = "An Open Source implementation of the iCalendar protocols \ +and protocol data units. The iCalendar specification describes how \ +calendar clients can communicate with calendar servers so users can store \ +their calendar data and arrange meetings with other users. " +HOMEPAGE = "https://github.com/libical/libical" +BUGTRACKER = "https://github.com/libical/libical/issues" +LICENSE = "LGPL-2.1-only | MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1910a2a76ddf6a9ba369182494170d87 \ + file://LICENSE.LGPL21.txt;md5=8f690bb538f4b301d931374a6eb864d0 \ + file://LICENSE.MPL2.txt;md5=f75d2927d3c1ed2414ef72048f5ad640 \ + " +SECTION = "libs" + +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ + file://0001-cmake-Do-not-export-CC-into-gir-compiler.patch \ + " +SRC_URI[sha256sum] = "e73de92f5a6ce84c1b00306446b290a2b08cdf0a80988eca0a2c9d5c3510b4c2" + +inherit cmake pkgconfig gobject-introspection vala github-releases + +DEPENDS += "libical-native" + +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" +# Disable the test suite as we can't install it +EXTRA_OECMAKE += "-DLIBICAL_BUILD_TESTING=false" +# doc build fails with linker error (??) for libical-glib so disable it +EXTRA_OECMAKE += "-DICAL_BUILD_DOCS=false" +# gobject-introspection +EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper" +EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper" +EXTRA_OECMAKE += "-DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen" +EXTRA_OECMAKE += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DGOBJECT_INTROSPECTION=ON -DICAL_GLIB_VAPI=ON', '-DGOBJECT_INTROSPECTION=OFF -DICAL_GLIB_VAPI=OFF', d)}" +EXTRA_OECMAKE:append:class-native = " -DGOBJECT_INTROSPECTION=OFF -DICAL_GLIB_VAPI=OFF" + +# Tell the cross-libical where the tool it needs to build is +EXTRA_OECMAKE:append:class-target = " -DIMPORT_ICAL_GLIB_SRC_GENERATOR=${STAGING_LIBDIR_NATIVE}/cmake/LibIcal/IcalGlibSrcGenerator.cmake" + +do_install:append () { + # Remove build host references (https://github.com/libical/libical/issues/532) + sed -i \ + -e 's,${STAGING_LIBDIR},${libdir},g' \ + -e 's,${STAGING_INCDIR},${includedir},g' \ + ${D}${libdir}/cmake/LibIcal/LibIcal*.cmake \ + ${D}${libdir}/cmake/LibIcal/Ical*.cmake +} + +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf