diff options
| -rw-r--r-- | meta/conf/distro/poky-bleeding.conf | 1 | ||||
| -rw-r--r-- | meta/conf/distro/poky.conf | 1 | ||||
| -rw-r--r-- | meta/packages/gnome/gnome-vfs_2.16.3.bb | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf index 0f63d3a05..cf83f10c5 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 909a66225..f3cbd3159 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 40f806327..327f7cfff 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" |