summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-08-01 19:43:10 +0000
committerRoss Burton <ross@openedhand.com>2007-08-01 19:43:10 +0000
commit236595c8512a3621fdcc7ae04fc7ea9eae75f171 (patch)
treefe18f74ec9c31a18edab87365dcf7504cb26f6f8 /meta
parent75825af40256d3990bb18a7de9685f249d9f833f (diff)
downloadpoky-236595c8512a3621fdcc7ae04fc7ea9eae75f171.tar.gz
Upgrade gnome-vfs to 2.18.1
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2302 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/poky.conf2
-rw-r--r--meta/packages/gnome/gnome-vfs-2.18.1/gconftool-lossage.patch (renamed from meta/packages/gnome/gnome-vfs-2.16.3/gconftool-lossage.patch)0
-rw-r--r--meta/packages/gnome/gnome-vfs-2.18.1/gnome-vfs-no-kerberos.patch (renamed from meta/packages/gnome/gnome-vfs-2.16.3/gnome-vfs-no-kerberos.patch)0
-rw-r--r--meta/packages/gnome/gnome-vfs_2.18.1.bb (renamed from meta/packages/gnome/gnome-vfs_2.16.3.bb)4
4 files changed, 2 insertions, 4 deletions
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"
152PREFERRED_VERSION_dbus-native ?= "1.0.2" 152PREFERRED_VERSION_dbus-native ?= "1.0.2"
153PREFERRED_VERSION_dbus-glib ?= "0.74" 153PREFERRED_VERSION_dbus-glib ?= "0.74"
154PREFERRED_VERSION_dbus-glib-native ?= "0.74" 154PREFERRED_VERSION_dbus-glib-native ?= "0.74"
155PREFERRED_VERSION_gnome-vfs ?= "2.16.3" 155PREFERRED_VERSION_gnome-vfs ?= "2.18.1"
156 156
157PREFERRED_VERSION_dillo2 ?= "0.6.6" 157PREFERRED_VERSION_dillo2 ?= "0.6.6"
158PREFERRED_VERSION_evince ?= "0.9.0" 158PREFERRED_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
index 3dbc130ddc..3dbc130ddc 100644
--- a/meta/packages/gnome/gnome-vfs-2.16.3/gconftool-lossage.patch
+++ b/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
index e25ecdd66f..e25ecdd66f 100644
--- 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
diff --git a/meta/packages/gnome/gnome-vfs_2.16.3.bb b/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"
4# Some legacy packages will require gnome-mime-data to be installed, but use of 4# Some legacy packages will require gnome-mime-data to be installed, but use of
5# it is deprecated. 5# it is deprecated.
6 6
7PR = "r5"
8
9inherit gnome 7inherit gnome
10 8
11# This is to provide compatibility with the gnome-vfs DBus fork 9# This is to provide compatibility with the gnome-vfs DBus fork
@@ -19,7 +17,7 @@ EXTRA_OECONF = " \
19 --disable-samba \ 17 --disable-samba \
20 " 18 "
21 19
22FILES_${PN} += " ${libdir}/vfs" 20FILES_${PN} += " ${libdir}/vfs ${datadir}/dbus-1/services"
23FILES_${PN}-dbg += " ${libdir}/gnome-vfs-2.0/modules/.debug" 21FILES_${PN}-dbg += " ${libdir}/gnome-vfs-2.0/modules/.debug"
24FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include" 22FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include"
25FILES_${PN}-doc += " ${datadir}/gtk-doc" 23FILES_${PN}-doc += " ${datadir}/gtk-doc"