gnome-vfs: add 2.24.1, share patches with 2.22.0

4 files changed, 53 insertions, 0 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index dd18af3b0b..e9c361d60a 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -8650,6 +8650,10 @@ sha256=cd95ec5a4808799f033dcb9daf37ed38436c594d4014e5804967fa9e5893e91f
 md5=369105fd82cb99e69e63acab8f3b89b7
 sha256=622cf50cefa2c4187e0a23f29d665f010f7a0815864fc35a61caefd5a7d4ebb1
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.24/gnome-vfs-2.24.1.tar.bz2]
+md5=100f9af16dc659e375ee8da45175a28d
+sha256=bc59144e303b152b84b86f209347a3e87a91d5ed7172d8503ee19c232dcabeb6
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.6/gnome-vfs-2.6.0.tar.bz2]
 md5=4d0323cf015dd006210fcacd4bfe7420
 sha256=e2094c83a810319674e9c5ea24ac1325e8ea31e3df2e2efd41c70a07742caa6d
diff --git a/recipes/gnome/gnome-vfs-2.22.0/gconftool-lossage.patch b/recipes/gnome/gnome-vfs/gconftool-lossage.patch
index 3dbc130ddc..3dbc130ddc 100644
--- a/recipes/gnome/gnome-vfs-2.22.0/gconftool-lossage.patch
+++ b/recipes/gnome/gnome-vfs/gconftool-lossage.patch
diff --git a/recipes/gnome/gnome-vfs-2.22.0/gnome-vfs-no-kerberos.patch b/recipes/gnome/gnome-vfs/gnome-vfs-no-kerberos.patch
index e25ecdd66f..e25ecdd66f 100644
--- a/recipes/gnome/gnome-vfs-2.22.0/gnome-vfs-no-kerberos.patch
+++ b/recipes/gnome/gnome-vfs/gnome-vfs-no-kerberos.patch
diff --git a/recipes/gnome/gnome-vfs_2.24.1.bb b/recipes/gnome/gnome-vfs_2.24.1.bb
new file mode 100644
index 0000000000..511aabe5a7
--- /dev/null
+++ b/recipes/gnome/gnome-vfs_2.24.1.bb
@@ -0,0 +1,49 @@
+LICENSE = "GPL"
+DEPENDS = "libxml2 gconf gnutls avahi dbus dbus-glib bzip2 gnome-mime-data zlib gtk-doc-native"
+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 = "r1"
+
+inherit gnome
+
+SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1 \
+	    file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0"
+
+# This is to provide compatibility with the gnome-vfs DBus fork
+PROVIDES = "gnome-vfs-plugin-dbus"
+RREPLACES = "gnome-vfs-dbus"
+
+EXTRA_OECONF = " \
+                 --disable-openssl \
+                 --enable-gnutls \
+                 --enable-avahi \
+                 --with-samba-includes=${STAGING_INCDIR} \
+               "
+
+do_configure_prepend() {
+        sed -i -e 's:	doc	::g' Makefile.am
+}
+
+do_stage () {
+	autotools_stage_all
+}
+
+PACKAGES_DYNAMIC = "gnome-vfs-plugin-*"
+
+python populate_packages_prepend () {
+	print bb.data.getVar('FILES_gnome-vfs', d, 1)
+
+	plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d)
+	do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s')
+}
+
+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 \
+                    ${libdir}/gnome-vfs-2.0/modules/*.a \
+                    ${libdir}/gnome-vfs-2.0/modules/*.la \
+                   "
+FILES_${PN}-doc += "${datadir}/gtk-doc"
+
+