Skip to contentSkip to conversation

gnome-keyring: Fix compatibility with gcr 3 in oe-core

PATCH New Jason Wessel 2 participants 3 messages Aug 23, 2017 – Aug 28, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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. This patch restores and fixes the recipe removed by commit 9a53ba969ba69c59735fdc56e9f88a3430596590 in meta-openembedded's master-next branch.

---
 .../gnome-keyring/gnome-keyring_2.32.1.bb          | 53 ++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb
meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb new file +53 -0
new file mode 100644
index 000000000..e22a360e3
@@ -0,0 +1,53 @@
+SUMMARY = "Password and keyring managing daemon"
+HOMEPAGE = "http://www.gnome.org/"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://gcr/gcr.h;endline=22;md5=a272df1e633e27ecf35e74fb5576250e \
+                    file://egg/egg-dbus.h;endline=25;md5=eb6f531af37165dc53420c073d774e61 \
+                    file://gp11/gp11.h;endline=24;md5=bd8c7a8a21d6c28d40536d96a35e3469 \
+                    file://pkcs11/pkcs11i.h;endline=24;md5=e72cfbb718389b76a4dae838d1c1f439"
+
+SECTION = "x11/gnome"
+
+PR = "r12"
+
+inherit autotools gnome gtk-doc pkgconfig gsettings
+
+SRC_URI += "file://egg-asn1x.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"
+
+EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)}"
+
+SRC_URI[archive.md5sum] = "9a8aa74e03361676f29d6e73155786fc"
+SRC_URI[archive.sha256sum] = "31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9"
+GNOME_COMPRESS_TYPE="bz2"
+
+FILES_${PN} += "${datadir}/dbus-1/services ${datadir}/gcr \
+                ${base_libdir}/security/*${SOLIBSDEV} \
+               "
+
+FILES_${PN}-dev += "${libdir}/${BPN}/devel/*.la \
+                    ${libdir}/${BPN}/devel/*${SOLIBSDEV} \
+                    ${libdir}/${BPN}/standalone/*.la \
+                    ${base_libdir}/security/*.la \
+                   "
+
+INSANE_SKIP_${PN}-dev += "dev-elf"
+
+FILES_${PN}-dbg += "${libdir}/${BPN}/standalone/.debug/ \
+                    ${libdir}/${BPN}/devel/.debug/ \
+                    ${base_libdir}/security/.debug/"
+
+# 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
+}
+
Signature · 1 line
2.11.0
#1 lore raw

PATCH v2 1/1 gnome-keyring: Fix compatibility with gcr 3 in oe-core

From: Jason Wessel <[email protected]>

The gnome-keyring is used to configure save certain wifi attributes when using xfce or a gnome based UI.

---
 meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb +8 -1
index 4ac75cbef..76c6dad80 100644
@@ -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
+}
Signature · 1 line
2.14.1
#2 lore raw

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/

Quoted 38 lines · Martin Jansa

From: Jason Wessel <[email protected]>

The gnome-keyring is used to configure save certain wifi attributes when using xfce or a gnome based UI.

---
 meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb | 9
++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
(quoted diff) +0 -0

32.1.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb index 4ac75cbef..76c6dad80 100644

meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb +0 -1
@@ -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"

meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb +7 -0
+# 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