diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-04-27 09:22:05 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-10 09:56:18 +0100 |
commit | 630a645ed6fa1716e33c5f4e3d9499dcaf7b3707 (patch) | |
tree | cf4e62dde7cba948331676ec80338d7a86436d52 /meta/recipes-gnome/gnome/gnome-desktop.inc | |
parent | e2f1638d9f1447064e56dcee84ad8f241ca2efa7 (diff) | |
download | poky-630a645ed6fa1716e33c5f4e3d9499dcaf7b3707.tar.gz |
recipes: Replace gconf-dbus with gconf
Some distributions e.g. angstrom do not support gconf-dbus
anymore since its now provided by gconf and in oe-core we
have PREFERRED_PROVIDER_gconf tunable, here we replace all
dependencies on gconf-dbus with gconf, which should work
in both cases where poky defines
PREFERRED_PROVIDER-gconf = "gconf-dbus" and for angstrom
it is simply gconf
Without this meta-toolchain-sdk ends up with conflicts in
runqueue and does not build
(From OE-Core rev: 3c04049516fe09969bbb9af501aae260f8ce4c91)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gnome/gnome-desktop.inc')
-rw-r--r-- | meta/recipes-gnome/gnome/gnome-desktop.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-gnome/gnome/gnome-desktop.inc b/meta/recipes-gnome/gnome/gnome-desktop.inc index 123f82da73..336b87f248 100644 --- a/meta/recipes-gnome/gnome/gnome-desktop.inc +++ b/meta/recipes-gnome/gnome/gnome-desktop.inc | |||
@@ -1,7 +1,7 @@ | |||
1 | DESCRIPTION = "GNOME library for reading .desktop files" | 1 | DESCRIPTION = "GNOME library for reading .desktop files" |
2 | SECTION = "x11/gnome" | 2 | SECTION = "x11/gnome" |
3 | LICENSE = "GPLv2 & LGPLv2" | 3 | LICENSE = "GPLv2 & LGPLv2" |
4 | DEPENDS = "gconf-dbus libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils" | 4 | DEPENDS = "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils" |
5 | 5 | ||
6 | EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs" | 6 | EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs" |
7 | 7 | ||