rpms/gvfs/F-12 0001-Ignore-gphoto2-mounts-on-AFC-capable-devices.patch, NONE, 1.1 0002-Fix-compilation-with-libimobiledevice-1.0.0.patch, NONE, 1.1 gvfs.spec, 1.182, 1.183
Bastien Nocera
hadess at fedoraproject.org
Thu Mar 25 15:12:46 UTC 2010
- Previous message: rpms/ArpON/F-12 ArpON.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/ArpON/F-13 ArpON.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: hadess
Update of /cvs/pkgs/rpms/gvfs/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20586
Modified Files:
gvfs.spec
Added Files:
0001-Ignore-gphoto2-mounts-on-AFC-capable-devices.patch
0002-Fix-compilation-with-libimobiledevice-1.0.0.patch
Log Message:
* Thu Mar 25 2010 Bastien Nocera <bnocera at redhat.com> 1.4.3-7
- Add patches to compile with libimobiledevice 1.0.0
0001-Ignore-gphoto2-mounts-on-AFC-capable-devices.patch:
ggphoto2volumemonitor.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
--- NEW FILE 0001-Ignore-gphoto2-mounts-on-AFC-capable-devices.patch ---
>From 870ad88dab23112c2b6e5c592d33e3224fa6cd3b Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Mon, 22 Mar 2010 15:21:31 +0000
Subject: [PATCH 1/2] 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
---
monitor/gphoto2/ggphoto2volumemonitor.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
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));
--
1.7.0.1
0002-Fix-compilation-with-libimobiledevice-1.0.0.patch:
gvfsbackendafc.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--- NEW FILE 0002-Fix-compilation-with-libimobiledevice-1.0.0.patch ---
>From cbecef5aa8678a6564ca3610adc2ff03f8dd75e1 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Mon, 22 Mar 2010 14:31:23 +0000
Subject: [PATCH 2/2] 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
---
daemon/gvfsbackendafc.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/daemon/gvfsbackendafc.c b/daemon/gvfsbackendafc.c
index c056718..be6f0a3 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 },
--
1.7.0.1
Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/F-12/gvfs.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -p -r1.182 -r1.183
--- gvfs.spec 15 Feb 2010 14:38:42 -0000 1.182
+++ gvfs.spec 25 Mar 2010 15:12:45 -0000 1.183
@@ -1,7 +1,7 @@
Summary: Backends for the gio framework in GLib
Name: gvfs
Version: 1.4.3
-Release: 6%{?dist}
+Release: 7%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.gtk.org
@@ -75,6 +75,8 @@ Patch42: gvfs-1.4.1-afc-shadowed-mount.p
Patch43: gvfs-1.4.1-afc-indentation.patch
Patch44: gvfs-1.5.3-afc-new-libiphone.patch
Patch45: gvfs-1.5.3-use-libimobiledevice.patch
+Patch46: 0001-Ignore-gphoto2-mounts-on-AFC-capable-devices.patch
+Patch47: 0002-Fix-compilation-with-libimobiledevice-1.0.0.patch
Obsoletes: gnome-mount <= 0.8
@@ -203,6 +205,8 @@ including phones and music players to ap
%patch43 -p1 -b .afc-indentation.patch
%patch44 -p1 -b .afc-new-libiphone.patch
%patch45 -p1 -b .use-libimobiledevice.patch
+%patch46 -p1 -b .hide-gphoto-on-afc
+%patch47 -p1 -b .libimobiledevice-1.0.0
%build
@@ -368,6 +372,9 @@ killall -USR1 gvfsd >&/dev/null || :
%{_datadir}/gvfs/remote-volume-monitors/afc.monitor
%changelog
+* Thu Mar 25 2010 Bastien Nocera <bnocera at redhat.com> 1.4.3-7
+- Add patches to compile with libimobiledevice 1.0.0
+
* Mon Feb 15 2010 Tomas Bzatek <tbzatek at redhat.com> - 1.4.3-6
- sftp: fix crash on unmount
- Previous message: rpms/ArpON/F-12 ArpON.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/ArpON/F-13 ArpON.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list