summaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-10-07 02:57:28 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-10-10 12:47:35 +0200
commitf2135b3372f7c8cfd23f9ccb8dd3672f9cfc3781 (patch)
tree0c14868fe0e88f44ee617a7614dd69ab0d1ab2c1 /meta-gnome
parent0b78fc05194196eb361da7aa770806c06e11b859 (diff)
downloadmeta-openembedded-f2135b3372f7c8cfd23f9ccb8dd3672f9cfc3781.tar.gz
gcr: blacklist because of conflict with gnome-keyring
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r--meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb4
1 files changed, 4 insertions, 0 deletions
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 f30fcf1e3..1a70ac0cf 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"
7 7
8DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt" 8DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt"
9 9
10PNBLACKLIST[gcr] = "CONFLICT: 4 files conflict with gnome-keyring"
11# e.g. sysroots/qemux86-64/usr/share/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml
12# sysroots/qemux86-64/usr/share/GConf/gsettings/org.gnome.crypto.pgp.convert
13
10inherit autotools gnomebase gtk-icon-cache gtk-doc 14inherit autotools gnomebase gtk-icon-cache gtk-doc
11 15
12GNOME_COMPRESS_TYPE="xz" 16GNOME_COMPRESS_TYPE="xz"