diff options
| -rw-r--r-- | meta/recipes-gnome/gnome/gconf_3.2.3.bb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb index cdc7a3502d..9d327fce85 100644 --- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb +++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb | |||
| @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" | |||
| 6 | DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native polkit" | 6 | DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native polkit" |
| 7 | DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native" | 7 | DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native" |
| 8 | 8 | ||
| 9 | PR = "r2" | 9 | PR = "r3" |
| 10 | 10 | ||
| 11 | inherit gnomebase | 11 | inherit gnomebase |
| 12 | 12 | ||
| @@ -37,7 +37,9 @@ do_install_append() { | |||
| 37 | rm ${D}${libdir}/gio/*/*.*a | 37 | rm ${D}${libdir}/gio/*/*.*a |
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | RDEPENDS_${PN} += "dbus-x11" | 40 | # disable dbus-x11 when x11 isn't in DISTRO_FEATURES |
| 41 | RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)}" | ||
| 42 | |||
| 41 | FILES_${PN} += "${libdir}/GConf/* \ | 43 | FILES_${PN} += "${libdir}/GConf/* \ |
| 42 | ${libdir}/gio/*/*.so \ | 44 | ${libdir}/gio/*/*.so \ |
| 43 | ${datadir}/polkit* \ | 45 | ${datadir}/polkit* \ |
