diff options
| author |   Jason Wessel <jason.wessel@windriver.com> | 2017-08-23 10:45:20 -0700 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-31 15:22:57 +0200 |
| commit | a8b455414d24f3b5254ee449368240dac4fb0489 (patch) | |
| tree | 01daf30683adb465d4da04014965f57865d17235 | |
| parent | c0e63573503904e26a28304f055f175b67b6e5da (diff) | |
| download | meta-openembedded-contrib-a8b455414d24f3b5254ee449368240dac4fb0489.tar.gz | |
gnome-keyring: Fix compatibility with gcr 3 in oe-core
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@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb | 9 |
1 files changed, 8 insertions, 1 deletions
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 4ac75cbef9..76c6dad80e 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 +} |