From f2135b3372f7c8cfd23f9ccb8dd3672f9cfc3781 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 7 Oct 2014 02:57:28 +0200 Subject: gcr: blacklist because of conflict with gnome-keyring Signed-off-by: Martin Jansa --- meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb b/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb index f30fcf1e32..1a70ac0cf2 100644 --- a/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb +++ b/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb @@ -7,6 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt" +PNBLACKLIST[gcr] = "CONFLICT: 4 files conflict with gnome-keyring" +# e.g. sysroots/qemux86-64/usr/share/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml +# sysroots/qemux86-64/usr/share/GConf/gsettings/org.gnome.crypto.pgp.convert + inherit autotools gnomebase gtk-icon-cache gtk-doc GNOME_COMPRESS_TYPE="xz" -- cgit v1.2.3-54-g00ecf