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:51:40 +0100 |
| commit | 3c04049516fe09969bbb9af501aae260f8ce4c91 (patch) | |
| tree | 2860d68df54493ade69f9cb0e8d52ef70dd01be7 /meta/recipes-gnome | |
| parent | a0a563d0d0febacef3f9080db24fa968e8c5f08b (diff) | |
| download | openembedded-core-3c04049516fe09969bbb9af501aae260f8ce4c91.tar.gz openembedded-core-3c04049516fe09969bbb9af501aae260f8ce4c91.tar.bz2 openembedded-core-3c04049516fe09969bbb9af501aae260f8ce4c91.zip | |
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
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta/recipes-gnome')
| -rw-r--r-- | meta/recipes-gnome/gnome/gnome-desktop.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-gnome/gthumb/gthumb_2.12.2.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-gnome/tasks/task-sdk-gmae.inc | 2 |
3 files changed, 3 insertions, 3 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 @@ DESCRIPTION = "GNOME library for reading .desktop files" SECTION = "x11/gnome" LICENSE = "GPLv2 & LGPLv2" -DEPENDS = "gconf-dbus libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils" +DEPENDS = "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils" EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs" diff --git a/meta/recipes-gnome/gthumb/gthumb_2.12.2.bb b/meta/recipes-gnome/gthumb/gthumb_2.12.2.bb index 0b3bd1a675..258f2d5759 100644 --- a/meta/recipes-gnome/gthumb/gthumb_2.12.2.bb +++ b/meta/recipes-gnome/gthumb/gthumb_2.12.2.bb @@ -2,7 +2,7 @@ DESCRIPTION = "gThumb is an image viewer and browser for the GNOME Desktop" SECTION = "x11/gnome" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -DEPENDS = "glib-2.0 gtk+ libxml2 gnome-doc-utils libunique gconf-dbus libpng gstreamer jpeg tiff gst-plugins-base" +DEPENDS = "glib-2.0 gtk+ libxml2 gnome-doc-utils libunique gconf libpng gstreamer jpeg tiff gst-plugins-base" PR = "r0" EXTRA_OECONF = "--disable-gnome-keyring --disable-libsoup --disable-exiv2 --disable-clutter" diff --git a/meta/recipes-gnome/tasks/task-sdk-gmae.inc b/meta/recipes-gnome/tasks/task-sdk-gmae.inc index 586d76fd73..b24fc9eb91 100644 --- a/meta/recipes-gnome/tasks/task-sdk-gmae.inc +++ b/meta/recipes-gnome/tasks/task-sdk-gmae.inc @@ -4,7 +4,7 @@ SDK-GMAE = " \ gtk+-dev \ gstreamer-dev \ bluez4-dev \ - gconf-dbus-dev \ + gconf-dev \ avahi-dev \ telepathy-glib-dev \ eds-dbus-dev \ |