diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb')
| -rw-r--r-- | import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb index 4ac75cbef..fd6ca73a4 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb @@ -15,11 +15,15 @@ PR = "r12" inherit autotools gnome gtk-doc pkgconfig gsettings -SRC_URI += "file://egg-asn1x.patch" +SRC_URI += "file://egg-asn1x.patch \ + file://musl.patch \ +" DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} intltool-native" RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils" +LDFLAGS += "-lgmodule-2.0" + EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)}" SRC_URI[archive.md5sum] = "9a8aa74e03361676f29d6e73155786fc" @@ -42,4 +46,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 +} |
