From 236595c8512a3621fdcc7ae04fc7ea9eae75f171 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 1 Aug 2007 19:43:10 +0000 Subject: [PATCH] Upgrade gnome-vfs to 2.18.1 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2302 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/distro/poky.conf | 2 +- .../gconftool-lossage.patch | 0 .../gnome-vfs-no-kerberos.patch | 0 .../gnome/{gnome-vfs_2.16.3.bb => gnome-vfs_2.18.1.bb} | 4 +--- 4 files changed, 2 insertions(+), 4 deletions(-) rename meta/packages/gnome/{gnome-vfs-2.16.3 => gnome-vfs-2.18.1}/gconftool-lossage.patch (100%) rename meta/packages/gnome/{gnome-vfs-2.16.3 => gnome-vfs-2.18.1}/gnome-vfs-no-kerberos.patch (100%) rename meta/packages/gnome/{gnome-vfs_2.16.3.bb => gnome-vfs_2.18.1.bb} (94%) diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 9a49d778e1..dc534b247a 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -152,7 +152,7 @@ PREFERRED_VERSION_dbus ?= "1.0.2" PREFERRED_VERSION_dbus-native ?= "1.0.2" PREFERRED_VERSION_dbus-glib ?= "0.74" PREFERRED_VERSION_dbus-glib-native ?= "0.74" -PREFERRED_VERSION_gnome-vfs ?= "2.16.3" +PREFERRED_VERSION_gnome-vfs ?= "2.18.1" PREFERRED_VERSION_dillo2 ?= "0.6.6" PREFERRED_VERSION_evince ?= "0.9.0" diff --git a/meta/packages/gnome/gnome-vfs-2.16.3/gconftool-lossage.patch b/meta/packages/gnome/gnome-vfs-2.18.1/gconftool-lossage.patch similarity index 100% rename from meta/packages/gnome/gnome-vfs-2.16.3/gconftool-lossage.patch rename to meta/packages/gnome/gnome-vfs-2.18.1/gconftool-lossage.patch diff --git a/meta/packages/gnome/gnome-vfs-2.16.3/gnome-vfs-no-kerberos.patch b/meta/packages/gnome/gnome-vfs-2.18.1/gnome-vfs-no-kerberos.patch similarity index 100% rename from meta/packages/gnome/gnome-vfs-2.16.3/gnome-vfs-no-kerberos.patch rename to meta/packages/gnome/gnome-vfs-2.18.1/gnome-vfs-no-kerberos.patch diff --git a/meta/packages/gnome/gnome-vfs_2.16.3.bb b/meta/packages/gnome/gnome-vfs_2.18.1.bb similarity index 94% rename from meta/packages/gnome/gnome-vfs_2.16.3.bb rename to meta/packages/gnome/gnome-vfs_2.18.1.bb index d3fd028e01..178a190f15 100644 --- a/meta/packages/gnome/gnome-vfs_2.16.3.bb +++ b/meta/packages/gnome/gnome-vfs_2.18.1.bb @@ -4,8 +4,6 @@ RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info" # Some legacy packages will require gnome-mime-data to be installed, but use of # it is deprecated. -PR = "r5" - inherit gnome # This is to provide compatibility with the gnome-vfs DBus fork @@ -19,7 +17,7 @@ EXTRA_OECONF = " \ --disable-samba \ " -FILES_${PN} += " ${libdir}/vfs" +FILES_${PN} += " ${libdir}/vfs ${datadir}/dbus-1/services" FILES_${PN}-dbg += " ${libdir}/gnome-vfs-2.0/modules/.debug" FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include" FILES_${PN}-doc += " ${datadir}/gtk-doc" -- 2.40.1