Add gnome-vfs-plugin-dbus provider/provides to let the task build

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1099 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index 0f63d3a05ce64195389bcae5a690be5dc93adc29..cf83f10c55b767f2e5bc0e7aff2ea7ff876583c6 100644 (file)
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -14,5 +14,6 @@ SRCDATE_gconf-dbus ?= "20061219"
 
 PREFERRED_PROVIDER_gnome-vfs = "gnome-vfs"
 PREFERRED_VERSION_gnome-vfs = "2.16.3"
+PREFERRED_PROVIDER_gnome-vfs-plugin-dbus = "gnome-vfs"
 
 require conf/distro/poky.conf

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 909a66225d60a3859d28d3f74e6be5de97fb2729..f3cbd315954780cfe250b85f2aca047615888da8 100644 (file)
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -61,6 +61,7 @@ PREFERRED_PROVIDER_virtual/update-alternatives-native ?= update-alternatives-cwo
 PREFERRED_PROVIDER_libx11 ?= "diet-x11"
 PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
 PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs-dbus"
+PREFERRED_PROVIDER_gnome-vfs-plugin-dbus = "gnome-vfs-dbus"
 PREFERRED_PROVIDER_tslib ?= "tslib"
 
 

diff --git a/meta/packages/gnome/gnome-vfs_2.16.3.bb b/meta/packages/gnome/gnome-vfs_2.16.3.bb
index 40f806327307bcfbe9312290dba8baa1846a8d00..327f7cfff738e92cd7e698f2733ca0eeda0e96f2 100644 (file)
--- a/meta/packages/gnome/gnome-vfs_2.16.3.bb
+++ b/meta/packages/gnome/gnome-vfs_2.16.3.bb
@@ -6,6 +6,9 @@ inherit gnome
 DEPENDS = "libxml2 gconf dbus bzip2 gnome-mime-data zlib"
 RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info"
 
+# This is to provide compatibility with the gnome-vfs DBus fork
+PROVIDES = "gnome-vfs-plugin-dbus"
+
 SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1"
 
 EXTRA_OECONF = "--disable-openssl"