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>
This commit is contained in:
parent
e2f1638d9f
commit
630a645ed6
|
@ -1,7 +1,7 @@
|
|||
DESCRIPTION = "GNOME keyboard library"
|
||||
LICENSE = "LGPL"
|
||||
|
||||
DEPENDS = "gconf-dbus dbus libxklavier gtk+"
|
||||
DEPENDS = "gconf dbus libxklavier gtk+"
|
||||
|
||||
inherit gnome
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7d7044444a7b1b116e8783edcdb44ff4 \
|
|||
file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0"
|
||||
|
||||
|
||||
DEPENDS = "virtual/libx11 xmu gconf-dbus"
|
||||
DEPENDS = "virtual/libx11 xmu gconf"
|
||||
|
||||
SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz"
|
||||
|
||||
|
|
Loading…
Reference in New Issue