[oe-commits] Koen Kooi : gvfs: add 1.5.5

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: 2f416738566f3009a66aadc32a064100534c10b9
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=2f416738566f3009a66aadc32a064100534c10b9

Author: Koen Kooi <koen at openembedded.org>
Date:   Thu Mar 25 14:22:55 2010 +0100

gvfs: add 1.5.5

---

 recipes/gnome/gvfs-1.5.5/imobile-fix.patch  |   37 +++++++++++++++++++++++++++
 recipes/gnome/gvfs-1.5.5/imobile-fix2.patch |   33 ++++++++++++++++++++++++
 recipes/gnome/gvfs_1.5.5.bb                 |   26 +++++++++++++++++++
 3 files changed, 96 insertions(+), 0 deletions(-)

diff --git a/recipes/gnome/gvfs-1.5.5/imobile-fix.patch b/recipes/gnome/gvfs-1.5.5/imobile-fix.patch
new file mode 100644
index 0000000..4a0f3b1
--- /dev/null
+++ b/recipes/gnome/gvfs-1.5.5/imobile-fix.patch
@@ -0,0 +1,37 @@
+From 1d1ce86222b0a34451b7fc798824e69dd0ebf93b Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Mon, 22 Mar 2010 14:31:23 +0000
+Subject: Fix compilation with libimobiledevice 1.0.0
+
+AFC_E_INVALID_ARGUMENT was renamed to AFC_E_INVALID_ARG
+in http://github.com/MattColyer/libiphone/commit/36048ded8efda588a20b5cf284670a984f7cc650
+
+https://bugzilla.gnome.org/show_bug.cgi?id=613588
+---
+diff --git a/daemon/gvfsbackendafc.c b/daemon/gvfsbackendafc.c
+index ae41a04..a2ca298 100644
+--- a/daemon/gvfsbackendafc.c
++++ b/daemon/gvfsbackendafc.c
+@@ -38,6 +38,11 @@
+ #define G_VFS_BACKEND_AFC_MAX_FILE_SIZE G_MAXINT64
+ int g_blocksize = 4096; /* assume this is the default block size */
+ 
++/* AFC_E_INVALID_ARGUMENT was renamed between 0.9.7 and 1.0.0 */
++#ifndef AFC_E_INVALID_ARG
++#define AFC_E_INVALID_ARG AFC_E_INVALID_ARGUMENT
++#endif /* !AFC_E_INVALID_ARG */
++
+ struct _GVfsBackendAfc {
+   GVfsBackend backend;
+ 
+@@ -62,7 +67,7 @@ static struct afc_error_mapping afc_error_to_g_io_error[] = {
+       { AFC_E_READ_ERROR               , G_IO_ERROR_NOT_DIRECTORY },
+       { AFC_E_WRITE_ERROR              , G_IO_ERROR_FAILED },
+       { AFC_E_UNKNOWN_PACKET_TYPE      , G_IO_ERROR_FAILED },
+-      { AFC_E_INVALID_ARGUMENT         , G_IO_ERROR_INVALID_ARGUMENT },
++      { AFC_E_INVALID_ARG              , G_IO_ERROR_INVALID_ARGUMENT },
+       { AFC_E_OBJECT_NOT_FOUND         , G_IO_ERROR_NOT_FOUND },
+       { AFC_E_OBJECT_IS_DIR            , G_IO_ERROR_IS_DIRECTORY },
+       { AFC_E_DIR_NOT_EMPTY            , G_IO_ERROR_NOT_EMPTY },
+--
+cgit v0.8.3.1
diff --git a/recipes/gnome/gvfs-1.5.5/imobile-fix2.patch b/recipes/gnome/gvfs-1.5.5/imobile-fix2.patch
new file mode 100644
index 0000000..51f3c23
--- /dev/null
+++ b/recipes/gnome/gvfs-1.5.5/imobile-fix2.patch
@@ -0,0 +1,33 @@
+From b6202b86025fb7d363477a4a29620fa0198e4c56 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Mon, 22 Mar 2010 15:21:31 +0000
+Subject: Ignore gphoto2 mounts on AFC capable devices
+
+Requires a small usbmuxd udev rules change, to mark devices
+with the USBMUXD_AFC_DEVICE property.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=591009
+---
+diff --git a/monitor/gphoto2/ggphoto2volumemonitor.c b/monitor/gphoto2/ggphoto2volumemonitor.c
+index 8b87074..9fefc5d 100644
+--- a/monitor/gphoto2/ggphoto2volumemonitor.c
++++ b/monitor/gphoto2/ggphoto2volumemonitor.c
+@@ -199,6 +199,16 @@ gudev_add_camera (GGPhoto2VolumeMonitor *monitor, GUdevDevice *device, gboolean
+     int usb_bus_num;
+     int usb_device_num;
+ 
++  /* For iPhones and iPod Touches, don't mount gphoto mounts,
++   * we already have access through AFC */
++#ifdef HAVE_AFC
++    if (g_udev_device_get_property_as_boolean (device, "USBMUX_SUPPORTED"))
++      {
++	/* g_debug ("ignoring device, is AFC"); */
++	return;
++      }
++#endif /* HAVE_AFC */
++
+     property = g_udev_device_get_property (device, "BUSNUM");
+     if (property == NULL) {
+ 	g_warning("device %s has no BUSNUM property, ignoring", g_udev_device_get_device_file (device));
+--
+cgit v0.8.3.1
diff --git a/recipes/gnome/gvfs_1.5.5.bb b/recipes/gnome/gvfs_1.5.5.bb
new file mode 100644
index 0000000..1e1106d
--- /dev/null
+++ b/recipes/gnome/gvfs_1.5.5.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "gvfs is a userspace virtual filesystem"
+LICENSE = "LGPL"
+DEPENDS = "gawk-native libimobiledevice gnome-keyring glib-2.0 obexftp fuse avahi fuse hal gconf samba gphoto2"
+
+inherit gnome
+
+SRC_URI += " \
+            file://imobile-fix.patch;patch=1 \
+            file://imobile-fix2.patch;patch=1 \
+"
+
+SRC_URI[archive.md5sum] = "d4ae94acdea317d8a8bf88a793b8df3f"
+SRC_URI[archive.sha256sum] = "e6c3c54ddbf5be75836e69c6d847500201b1b95b54d9bea8f9f51d2bc9617c8a"
+
+EXTRA_OECONF = "--enable-samba  --with-archive-includes=${STAGING_INCDIR} --with-samba-includes=${STAGING_INCDIR}"
+
+PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash"
+
+FILES_${PN} += "${datadir}/dbus-1/services/* ${libdir}/gio/modules/*.so"
+FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*"
+FILES_${PN}-dev += "${libdir}/gio/modules/*.la"
+
+FILES_gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${sysconfdir}/gvfs/mounts/ftp.mount"
+FILES_gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${sysconfdir}/gvfs/mounts/sftp.mount"
+FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${sysconfdir}/gvfs/mounts/trash.mount"
+