[oe] [meta-gnome][PATCHv2] gnome-keyring: Fix compatibility with gcr 3 in oe-core

[Martin Jansa]

I've moved this before the removal of blacklisted recipes, but it still
fails to build at least with gold, see:

http://errors.yoctoproject.org/Errors/Details/154233/

On Thu, Aug 24, 2017 at 4:23 PM, Martin Jansa <martin.jansa at gmail.com>
wrote:

> From: Jason Wessel <jason.wessel at windriver.com>
>
> The gnome-keyring is used to configure save certain wifi attributes
> when using xfce or a gnome based UI.
>
> Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> ---
>  meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb | 9
> ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.
> 32.1.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb
> index 4ac75cbef..76c6dad80 100644
> --- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb
> +++ b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb
> @@ -42,4 +42,11 @@ FILES_${PN}-dbg += "${libdir}/${BPN}/standalone/.debug/
> \
>                      ${libdir}/${BPN}/devel/.debug/ \
>                      ${base_libdir}/security/.debug/"
>
> -PNBLACKLIST[gnome-keyring] ?= "This version conflicts with gcr from
> oe-core - the recipe will be removed on 2017-09-01 unless the issue is
> fixed"
> +# Make compatible with gcr version 3 or newer by removing
> +# org.gnome.crypto.pgp.*, which is the provider for this optional
> +# functionality.
> +
> +do_install_append() {
> +       rm ${D}${datadir}/GConf/gsettings/org.gnome.crypto.pgp.convert
> +       rm ${D}${datadir}/glib-2.0/schemas/org.gnome.crypto.pgp.
> gschema.xml
> +}
> --
> 2.14.1
>
>