From 99fa68b91aa0807c7220d28ac45273a9f5c935dc Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sun, 15 Aug 2010 13:30:54 +0200 Subject: gvfs: remove old versions Signed-off-by: Frans Meulenbroeks --- recipes/gnome/gvfs-1.5.5/imobile-fix.patch | 37 ----------------------------- recipes/gnome/gvfs-1.5.5/imobile-fix2.patch | 33 ------------------------- recipes/gnome/gvfs_0.0.2.bb | 21 ---------------- recipes/gnome/gvfs_1.0.1.bb | 21 ---------------- recipes/gnome/gvfs_1.0.3.bb | 21 ---------------- recipes/gnome/gvfs_1.2.1.bb | 20 ---------------- recipes/gnome/gvfs_1.3.3.bb | 20 ---------------- recipes/gnome/gvfs_1.5.5.bb | 26 -------------------- 8 files changed, 199 deletions(-) delete mode 100644 recipes/gnome/gvfs-1.5.5/imobile-fix.patch delete mode 100644 recipes/gnome/gvfs-1.5.5/imobile-fix2.patch delete mode 100644 recipes/gnome/gvfs_0.0.2.bb delete mode 100644 recipes/gnome/gvfs_1.0.1.bb delete mode 100644 recipes/gnome/gvfs_1.0.3.bb delete mode 100644 recipes/gnome/gvfs_1.2.1.bb delete mode 100644 recipes/gnome/gvfs_1.3.3.bb delete mode 100644 recipes/gnome/gvfs_1.5.5.bb diff --git a/recipes/gnome/gvfs-1.5.5/imobile-fix.patch b/recipes/gnome/gvfs-1.5.5/imobile-fix.patch deleted file mode 100644 index 4a0f3b11e3..0000000000 --- a/recipes/gnome/gvfs-1.5.5/imobile-fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 1d1ce86222b0a34451b7fc798824e69dd0ebf93b Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -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 deleted file mode 100644 index 51f3c230d8..0000000000 --- a/recipes/gnome/gvfs-1.5.5/imobile-fix2.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b6202b86025fb7d363477a4a29620fa0198e4c56 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -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_0.0.2.bb b/recipes/gnome/gvfs_0.0.2.bb deleted file mode 100644 index 4a70b94dd3..0000000000 --- a/recipes/gnome/gvfs_0.0.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "gvfs is a userspace virtual filesystem" -LICENSE = "LGPL" -DEPENDS = "glib-2.0 gio-standalone fuse" -PR = "r0" - -inherit gnome - -EXTRA_OECONF = "--disable-samba" - -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" - -SRC_URI[archive.md5sum] = "1267b82b481340eadf212cf47b735b62" -SRC_URI[archive.sha256sum] = "7249197b75a61c36398f7458f12c0318ccf03639ae8404771fb4ff414fa17683" diff --git a/recipes/gnome/gvfs_1.0.1.bb b/recipes/gnome/gvfs_1.0.1.bb deleted file mode 100644 index 0cec17b258..0000000000 --- a/recipes/gnome/gvfs_1.0.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "gvfs is a userspace virtual filesystem" -LICENSE = "LGPL" -DEPENDS = "glib-2.0 fuse" -PR = "r0" - -inherit gnome - -EXTRA_OECONF = "--disable-samba" - -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" - -SRC_URI[archive.md5sum] = "0d123f87e3e660271cd9d11b8c592c5a" -SRC_URI[archive.sha256sum] = "67e7dd1dca32a99eb1102a853d2df1bac782d50a4361511409572cfe8ea51147" diff --git a/recipes/gnome/gvfs_1.0.3.bb b/recipes/gnome/gvfs_1.0.3.bb deleted file mode 100644 index bc34a7605e..0000000000 --- a/recipes/gnome/gvfs_1.0.3.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "gvfs is a userspace virtual filesystem" -LICENSE = "LGPL" -DEPENDS = "glib-2.0 fuse" -PR = "r0" - -inherit gnome - -EXTRA_OECONF = "--disable-samba --with-archive-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" - -SRC_URI[archive.md5sum] = "a41e8b7d99e390cef8312f7ce5f312a5" -SRC_URI[archive.sha256sum] = "17eccded6e096208181e2c7625802526112af23f5b2c7b2a672ab9ccff3a55fd" diff --git a/recipes/gnome/gvfs_1.2.1.bb b/recipes/gnome/gvfs_1.2.1.bb deleted file mode 100644 index 780237f051..0000000000 --- a/recipes/gnome/gvfs_1.2.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "gvfs is a userspace virtual filesystem" -LICENSE = "LGPL" -DEPENDS = "gawk-native gnome-keyring glib-2.0 obexftp fuse avahi fuse hal gconf samba gphoto2" - -inherit gnome - -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" - -SRC_URI[archive.md5sum] = "df8f624587adfabe7009838ce6d8d5fd" -SRC_URI[archive.sha256sum] = "0e3c3469721ff1d4296bf4af7e1f131201d2dc6a36c772d99e1630f8cce31da2" diff --git a/recipes/gnome/gvfs_1.3.3.bb b/recipes/gnome/gvfs_1.3.3.bb deleted file mode 100644 index 70442eeed9..0000000000 --- a/recipes/gnome/gvfs_1.3.3.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "gvfs is a userspace virtual filesystem" -LICENSE = "LGPL" -DEPENDS = "gawk-native gnome-keyring glib-2.0 obexftp fuse avahi fuse hal gconf samba gphoto2" - -inherit gnome - -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" - -SRC_URI[archive.md5sum] = "2f1c65dcde8fc4d0603e11a8ec3fc178" -SRC_URI[archive.sha256sum] = "453476904745e355a69987bcd20c5db1bc9a1757022f8dd8c0f3b7142f3a00fd" diff --git a/recipes/gnome/gvfs_1.5.5.bb b/recipes/gnome/gvfs_1.5.5.bb deleted file mode 100644 index 4968d928ce..0000000000 --- a/recipes/gnome/gvfs_1.5.5.bb +++ /dev/null @@ -1,26 +0,0 @@ -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 \ - file://imobile-fix2.patch \ -" - -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" - -- cgit 1.2.3-korg