libical: upgrade 3.0.20 -> 4.0.3
PATCH 1/1 libical: upgrade 3.0.20 -> 4.0.3
From: Alexander Kanavin <[email protected]>
Drop -DSHARED_ONLY=True (replaced upstream with LIBICAL_STATIC, false by default).
Drop 0001-cmake-Do-not-export-CC-into-gir-compiler.patch (merged upstream).
Rebase flags.patch (couldn't find evidence of ical-glib-static and so that chunk was dropped).
Rework various upstream cmake options.
License-Update: file renamed, additional information added at the bottom:
https://github.com/libical/libical/blob/v4.0.3/LICENSE.txt
LGPL/MPL texts aren't necessary to track, as LICENSE.txt specifies what the actual terms are.
Signed-off-by Alexander Kanavin <[email protected]>
---
meta/conf/distro/include/no-static-libs.inc | 1 -
...e-Do-not-export-CC-into-gir-compiler.patch | 30 -------------
.../libical/libical/flags.patch | 42 +++++++++----------
.../{libical_3.0.20.bb => libical_4.0.3.bb} | 19 ++++-----
4 files changed, 29 insertions(+), 63 deletions(-)
delete mode 100644 meta/recipes-support/libical/libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch
rename meta/recipes-support/libical/{libical_3.0.20.bb => libical_4.0.3.bb} (74%)meta/conf/distro/include/no-static-libs.inc +0 -1
@@ -23,7 +23,6 @@ DISABLE_STATIC:pn-musl = "" EXTRA_OECONF:append = "${DISABLE_STATIC}" -EXTRA_OECMAKE:append:pn-libical = " -DSHARED_ONLY=True" EXTRA_OECMAKE:append:pn-libjpeg-turbo = " -DENABLE_STATIC=False" EXTRA_OECMAKE:append:pn-libjpeg-turbo-native = " -DENABLE_STATIC=False"
meta/recipes-support/libical/libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From 7b20ca7f24a4cac25998bfcc70eed75bf796816b Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Thu, 3 Mar 2022 20:10:04 -0800 -Subject: [PATCH] cmake: Do not export CC into gir compiler - -this helps cross compilers where full compiler commandline defines the -compiler rather than just CC variable, therefore let it use the default -values from environment and not synthesize it from CMAKE_C_COMPILER just -for this case. - -Upstream-Status: Backport [https://github.com/libical/libical/pull/552] -Signed-off-by: Khem Raj <[email protected]> ---- - cmake/modules/GObjectIntrospectionMacros.cmake | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/cmake/modules/GObjectIntrospectionMacros.cmake b/cmake/modules/GObjectIntrospectionMacros.cmake -index 83aff93..d7d3f89 100644 ---- a/cmake/modules/GObjectIntrospectionMacros.cmake -+++ b/cmake/modules/GObjectIntrospectionMacros.cmake -@@ -50,8 +50,7 @@ macro(gir_add_introspections introspections_girs) - set(_gir_libtool "--no-libtool") - - add_custom_command( -- COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" -- ${GObjectIntrospection_SCANNER} -+ COMMAND ${GObjectIntrospection_SCANNER} - ${GObjectIntrospection_SCANNER_ARGS} - --namespace=${_gir_namespace} - --nsversion=${_gir_version}
meta/recipes-support/libical/libical/flags.patch +20 -22
56 lines not on this page · raw message
meta/recipes-support/libical/libical_4.0.3.bb renamed from meta/recipes-support/libical/libical_3.0.20.bb +9 -10
@@ -6,17 +6,14 @@ 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 \ +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=6d9294493d031c817783b0400a126c89 \ " SECTION = "libs" SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ - file://0001-cmake-Do-not-export-CC-into-gir-compiler.patch \ file://flags.patch \ - " -SRC_URI[sha256sum] = "e73de92f5a6ce84c1b00306446b290a2b08cdf0a80988eca0a2c9d5c3510b4c2" + " +SRC_URI[sha256sum] = "86f29029d0ec9fa30c9001de16c0859a3816ae154ff5b097392b014e21a3d254" inherit cmake pkgconfig gobject-introspection vala github-releases
@@ -24,7 +21,7 @@ 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" +PACKAGECONFIG[glib] = "-DLIBICAL_GLIB=True,-DLIBICAL_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"
@@ -33,13 +30,15 @@ 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" +EXTRA_OECMAKE += "-DLIBICAL_GLIB_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" +EXTRA_OECMAKE += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DLIBICAL_GOBJECT_INTROSPECTION=ON -DLIBICAL_GLIB_VAPI=ON', '-DLIBICAL_GOBJECT_INTROSPECTION=OFF -DLIBICAL_GLIB_VAPI=OFF', d)}" +EXTRA_OECMAKE:append:class-native = " -DLIBICAL_GOBJECT_INTROSPECTION=OFF -DLIBICAL_GLIB_VAPI=OFF" +# no java +EXTRA_OECMAKE += "-DLIBICAL_JAVA_BINDINGS=False" # 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"
Signature · 1 line
2.47.3