summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2011-12-27 02:57:29 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:14:29 (GMT)
commit2d8a747801412db1d11e46cd26338d0545f468f2 (patch)
tree9f9f21dd4a1a6d0bf272006644861736295df70b /meta/recipes-gnome
parenta770fe0d075a67bcfa2e55c041025b9a3a3679fe (diff)
downloadpoky-2d8a747801412db1d11e46cd26338d0545f468f2.tar.gz
gnome-keyring: fix gsettings_data_convert seg fault
gsttings_data_convert cause seg fault as gnome-keyring's schema is not installed properly. As a fix, running glib-compile-schemas from glib-utils to made "gschemas.compiled". [YOCTO #1779] got fixed. (From OE-Core rev: 0343ccd64ae03245ae8ab36e7f2da95d4ee28c18) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb12
1 files changed, 10 insertions, 2 deletions
diff --git a/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb b/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb
index cc97225..c40044f 100644
--- a/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb
+++ b/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb
@@ -11,12 +11,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
11 11
12SECTION = "x11/gnome" 12SECTION = "x11/gnome"
13 13
14PR = "r3" 14PR = "r4"
15 15
16inherit autotools gnome pkgconfig 16inherit autotools gnome pkgconfig
17 17
18DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 18DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
19RDEPENDS_${PN} = "libgnome-keyring" 19RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils"
20 20
21EXTRA_OECONF = "--disable-gtk-doc ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)}" 21EXTRA_OECONF = "--disable-gtk-doc ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)}"
22 22
@@ -30,6 +30,14 @@ do_install_append () {
30 install -m 0644 ${WORKDIR}/org.gnome.keyring.service ${D}${datadir}/dbus-1/services 30 install -m 0644 ${WORKDIR}/org.gnome.keyring.service ${D}${datadir}/dbus-1/services
31} 31}
32 32
33pkg_postinst_${PN} () {
34 if [ "x$D" != "x" ]; then
35 exit 1
36 fi
37
38 test -x ${bindir}/glib-compile-schemas && glib-compile-schemas ${datadir}/glib-2.0/schemas
39}
40
33FILES_${PN} += "${datadir}/dbus-1/services ${datadir}/gcr ${base_libdir}/security/*.so" 41FILES_${PN} += "${datadir}/dbus-1/services ${datadir}/gcr ${base_libdir}/security/*.so"
34FILES_${PN}-dbg += "${libdir}/gnome-keyring/standalone/.debug/ ${base_libdir}/security/*.la" 42FILES_${PN}-dbg += "${libdir}/gnome-keyring/standalone/.debug/ ${base_libdir}/security/*.la"
35FILES_${PN}-dbg += "${libdir}/gnome-keyring/devel/.debug/ ${base_libdir}/security/.debug" 43FILES_${PN}-dbg += "${libdir}/gnome-keyring/devel/.debug/ ${base_libdir}/security/.debug"