[OE-core] [PATCH v2] libical: upgrade to 3.0.5

Fri Jul 26 10:04:55 UTC 2019

I wonder how that happened, it must be finding a libdb somewhere...

On Fri, 26 Jul 2019 at 04:32, Mittal, Anuj <anuj.mittal at intel.com> wrote:
>
> Hi Ross
>
> This is causing errors:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/72/builds/869/steps/8/logs/errors
>
> step7b: ERROR: libical-3.0.5-r0 do_package_qa: QA Issue:
> /usr/lib/libicalss.so.3.0.5 contained in package libical requires
> libdb-5.3.so()(64bit), but no providers found in RDEPENDS_libical?
> [file-rdeps]
> step7b: ERROR: libical-3.0.5-r0 do_package_qa: QA run found fatal
> errors. Please consider fixing them.
> step7b: ERROR: libical-3.0.5-r0 do_package_qa:
> step7b: ERROR: libical-3.0.5-r0 do_package_qa: Function failed:
> do_package_qa
> step7b: ERROR: Logfile of failure stored in: /home/pokybuild/yocto-
> worker/qa-extras2/build/build/tmp/work/core2-64-poky-
> linux/libical/3.0.5-r0/temp/log.do_package_qa.40458
>
> Thanks,
>
> Anuj
>
> On Wed, 2019-07-24 at 10:54 +0100, Ross Burton wrote:
> > Note that this upgrade includes some API breakage.
> >
> > Signed-off-by: Ross Burton <ross.burton at intel.com>
> > ---
> >  ...ibical.pc.in-fix-iculibs-remove-full.patch | 44 ---------------
> > ----
> >  .../{libical_2.0.0.bb => libical_3.0.5.bb}    | 20 +++++----
> >  2 files changed, 12 insertions(+), 52 deletions(-)
> >  delete mode 100644 meta/recipes-support/libical/libical/0001-
> > CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch
> >  rename meta/recipes-support/libical/{libical_2.0.0.bb =>
> > libical_3.0.5.bb} (53%)
> >
> > diff --git a/meta/recipes-support/libical/libical/0001-
> > CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch
> > b/meta/recipes-support/libical/libical/0001-CMakeLists.txt-
> > libical.pc.in-fix-iculibs-remove-full.patch
> > deleted file mode 100644
> > index 6db75f5086c..00000000000
> > --- a/meta/recipes-support/libical/libical/0001-CMakeLists.txt-
> > libical.pc.in-fix-iculibs-remove-full.patch
> > +++ /dev/null
> > @@ -1,44 +0,0 @@
> > -From 1a41069c0dc054e59cd76fc3d8cf7cc2a78b5e8d Mon Sep 17 00:00:00
> > 2001
> > -From: Allen Winter <allen.winter at kdab.com>
> > -Date: Sat, 3 Sep 2016 16:56:29 -0400
> > -Subject: [PATCH] CMakeLists.txt, libical.pc.in - fix iculibs (remove
> > full path) ISSUE: 227
> > -
> > -Upstream-Status: Backport
> > -
> > -Signed-off-by: Maxin B. John <maxin.john at intel.com>
> > -----
> > -diff -Naur libical-2.0.0-orig/CMakeLists.txt libical-
> > 2.0.0/CMakeLists.txt
> > ---- libical-2.0.0-orig/CMakeLists.txt        2016-09-08
> > 18:05:06.166049345 +0300
> > -+++ libical-2.0.0/CMakeLists.txt     2016-09-08 18:05:45.201561334
> > +0300
> > -@@ -128,6 +128,7 @@
> > - #  RSCALE info at http://tools.ietf.org/html/rfc7529
> > - find_package(ICU)
> > - if(ICU_FOUND)
> > -+  set(ICUUC_LIBS "-licuuc") #for libical.pc
> > -   set(HAVE_LIBICU 1)
> > -   if(ICU_MAJOR_VERSION VERSION_GREATER 50)
> > -     set(HAVE_ICU_DANGI TRUE)
> > -@@ -137,6 +138,7 @@
> > - endif()
> > - if(ICU_I18N_FOUND)
> > -   set(HAVE_LIBICU_I18N 1)
> > -+  set(ICUI18N_LIBS "-licui18n") #for libical.pc
> > - endif()
> > -
> > - # MSVC specific definitions
> > -diff -Naur libical-2.0.0-orig/libical.pc.in libical-
> > 2.0.0/libical.pc.in
> > ---- libical-2.0.0-orig/libical.pc.in 2015-12-28 23:44:53.000000000
> > +0200
> > -+++ libical-2.0.0/libical.pc.in      2016-09-08 18:09:12.991963597
> > +0300
> > -@@ -3,10 +3,10 @@
> > - libdir=@libdir@
> > - includedir=@includedir@
> > - threadslib=@PTHREAD_LIBS@
> > --iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@
> > -+iculibs=@ICUUC_LIBS@ @ICUI18N_LIBS@
> > -
> > - Name: libical
> > - Description: An implementation of basic iCAL protocols
> > - Version: @VERSION@
> > --Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib}
> > ${iculib}
> > -+Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib}
> > ${iculibs}
> > - Cflags: -I${includedir}
> > diff --git a/meta/recipes-support/libical/libical_2.0.0.bb
> > b/meta/recipes-support/libical/libical_3.0.5.bb
> > similarity index 53%
> > rename from meta/recipes-support/libical/libical_2.0.0.bb
> > rename to meta/recipes-support/libical/libical_3.0.5.bb
> > index 7dffdcfb013..a4238f22633 100644
> > --- a/meta/recipes-support/libical/libical_2.0.0.bb
> > +++ b/meta/recipes-support/libical/libical_3.0.5.bb
> > @@ -1,18 +1,18 @@
> >  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-1.0"
> > -LIC_FILES_CHKSUM =
> > "file://COPYING;md5=d4fc58309d8ed46587ac63bb449d82f8 \
> > -                    file://LICENSE;md5=d1a0891cd3e582b3e2ec8fe63badb
> > bb6"
> > +LICENSE = "LGPLv2.1 | MPL-2.0"
> > +LIC_FILES_CHKSUM =
> > "file://LICENSE;md5=1910a2a76ddf6a9ba369182494170d87 \
> > +                    file://LICENSE.LGPL21.txt;md5=933adb561f159e7c3d
> > a079536f0ed871 \
> > +                    file://LICENSE.MPL2.txt;md5=9741c346eef56131163e
> > 13b9db1241b3"
> >  SECTION = "libs"
> >
> > -SRC_URI = "
> > https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz
> > \
> > -           file://0001-CMakeLists.txt-libical.pc.in-fix-iculibs-
> > remove-full.patch \
> > -           "
> > +SRC_URI = "
> > https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz
> > "
> > +
> >  DEPENDS = "icu"
> >
> > -SRC_URI[md5sum] = "6bf8e5f5a3ba88baf390d0134e05d76e"
> > -SRC_URI[sha256sum] =
> > "654c11f759c19237be39f6ad401d917e5a05f36f1736385ed958e60cf21456da"
> > +SRC_URI[md5sum] = "9be4e8a1739a9c27e06aa8ce66b8cb34"
> > +SRC_URI[sha256sum] =
> > "7ad550c8c49c9b9983658e3ab3e68b1eee2439ec17b169a6b1e6ecb5274e78e6"
> >  UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases"
> >
> >  inherit cmake pkgconfig
> > @@ -20,6 +20,10 @@ inherit cmake pkgconfig
> >  # No need to use perl-native, the host perl is sufficient.
> >  EXTRA_OECMAKE += "-DPERL_EXECUTABLE=${HOSTTOOLS_DIR}/perl"
> >
> > +# The glib library can't be cross-compiled, disable for now.
> > +# https://github.com/libical/libical/issues/394
> > +EXTRA_OECMAKE += "-DICAL_GLIB=false"
> > +
> >  do_install_append_class-target () {
> >      # Remove build host references
> >      sed -i \
> > --
> > 2.20.1
> >