summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/gconf.bbclass1
-rw-r--r--meta/recipes-gnome/gnome/gconf_3.2.3.bb7
2 files changed, 6 insertions, 2 deletions
diff --git a/meta/classes/gconf.bbclass b/meta/classes/gconf.bbclass
index 38097bc37a..cc01bcad2a 100644
--- a/meta/classes/gconf.bbclass
+++ b/meta/classes/gconf.bbclass
@@ -15,7 +15,6 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL = "1"
15 15
16gconf_postinst() { 16gconf_postinst() {
17if [ "x$D" != "x" ]; then 17if [ "x$D" != "x" ]; then
18 export GCONF_BACKEND_DIR=${STAGING_LIBDIR_NATIVE}/GConf/2
19 export GCONF_CONFIG_SOURCE="xml::$D${sysconfdir}/gconf/gconf.xml.defaults" 18 export GCONF_CONFIG_SOURCE="xml::$D${sysconfdir}/gconf/gconf.xml.defaults"
20else 19else
21 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` 20 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
index f80c9104ed..ef21624de1 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
@@ -9,7 +9,7 @@ POLKIT_libc-uclibc = ""
9DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT} gobject-introspection-stub" 9DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT} gobject-introspection-stub"
10DEPENDS_class-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native" 10DEPENDS_class-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native"
11 11
12PR = "r12" 12PR = "r13"
13 13
14inherit gnomebase gtk-doc 14inherit gnomebase gtk-doc
15 15
@@ -37,6 +37,11 @@ do_install_append() {
37 rm -f ${D}${libdir}/gio/*/*.*a 37 rm -f ${D}${libdir}/gio/*/*.*a
38} 38}
39 39
40do_install_append_class-native() {
41 create_wrapper ${D}/${bindir}/gconftool-2 \
42 GCONF_BACKEND_DIR=${STAGING_LIBDIR_NATIVE}/GConf/2
43}
44
40# disable dbus-x11 when x11 isn't in DISTRO_FEATURES 45# disable dbus-x11 when x11 isn't in DISTRO_FEATURES
41RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)}" 46RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)}"
42RDEPENDS_${PN}_class-native = "" 47RDEPENDS_${PN}_class-native = ""