summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2006-12-24 23:13:19 +0000
committerRoss Burton <ross@openedhand.com>2006-12-24 23:13:19 +0000
commit8953e464b6d45449faed4a4275b38ee5646f4945 (patch)
treebb6f1b0cbb19ed9e0c2127cae102f46dc1162bb2 /meta
parent43437febe39493f829291f0b3c0d95d9b042d7af (diff)
downloadpoky-8953e464b6d45449faed4a4275b38ee5646f4945.tar.gz
poky-8953e464b6d45449faed4a4275b38ee5646f4945.tar.bz2
poky-8953e464b6d45449faed4a4275b38ee5646f4945.zip
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
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/poky-bleeding.conf1
-rw-r--r--meta/conf/distro/poky.conf1
-rw-r--r--meta/packages/gnome/gnome-vfs_2.16.3.bb3
3 files changed, 5 insertions, 0 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index 0f63d3a05c..cf83f10c55 100644
--- 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 909a66225d..f3cbd31595 100644
--- 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 40f8063273..327f7cfff7 100644
--- 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"