rpms/gvfs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Fix AFC build against new libiphone

Browse Source
This commit is contained in:
Tomas Bzatek 2010-01-26 14:39:23 +00:00
parent 1fb42ab5db
commit f357e339dc
2 changed files with 85 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
gvfs-1.5.3-afc-new-libiphone.patch Normal file
View File

@ -0,0 +1,77 @@
From a496883e99676e30e56280b7a43551c796552d5f Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Tue, 26 Jan 2010 14:30:56 +0000
Subject: Update AFC backend and volume monitor for libiphone 0.9.6
---
diff --git a/configure.ac b/configure.ac
index b3a96f3..b47f091 100644
--- a/configure.ac
+++ b/configure.ac
@@ -331,7 +331,7 @@ AFC_LIBS=
AFC_CFLAGS=
if test "x$enable_afc" != "xno" ; then
- PKG_CHECK_EXISTS(libiphone-1.0 >= 0.9.4, msg_afc=yes)
+ PKG_CHECK_EXISTS(libiphone-1.0 >= 0.9.6, msg_afc=yes)
if test "x$msg_afc" = "xyes"; then
PKG_CHECK_MODULES(AFC, libiphone-1.0)
diff --git a/daemon/gvfsbackendafc.c b/daemon/gvfsbackendafc.c
index 783ed86..2d42d15 100644
--- a/daemon/gvfsbackendafc.c
+++ b/daemon/gvfsbackendafc.c
@@ -249,7 +249,8 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
const char *str;
char *tmp;
char *display_name;
- int port, virtual_port;
+ guint16 port;
+ int virtual_port;
GMountSpec *real_spec;
GVfsBackendAfc *self;
int retries;
@@ -330,8 +331,9 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
if (G_UNLIKELY(g_vfs_backend_iphone_check(err, G_VFS_JOB(job))))
goto out_destroy_service;
- if (G_UNLIKELY(g_vfs_backend_lockdownd_check (lockdownd_client_new (self->dev,
- &lockdown_cli),
+ if (G_UNLIKELY(g_vfs_backend_lockdownd_check (lockdownd_client_new_with_handshake (self->dev,
+ &lockdown_cli,
+ "gvfsd-afc"),
G_VFS_JOB(job))))
{
goto out_destroy_dev;
@@ -1305,7 +1307,6 @@ g_vfs_backend_afc_init (GVfsBackendAfc *self)
{
/* enable full debugging */
iphone_set_debug_level (1);
- iphone_set_debug_mask (DBGMASK_ALL);
}
}
diff --git a/monitor/afc/afcvolume.c b/monitor/afc/afcvolume.c
index 3af4661..a0413ec 100644
--- a/monitor/afc/afcvolume.c
+++ b/monitor/afc/afcvolume.c
@@ -77,7 +77,7 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self)
iphone_error_t err;
guint retries;
char *model, *display_name;
- int port;
+ guint16 port;
retries = 0;
do {
@@ -90,7 +90,7 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self)
if (err != IPHONE_E_SUCCESS)
return 0;
- if (lockdownd_client_new (dev, &lockdown_cli) != LOCKDOWN_E_SUCCESS)
+ if (lockdownd_client_new_with_handshake (dev, &lockdown_cli, "gvfs-afc-volume-monitor") != LOCKDOWN_E_SUCCESS)
{
iphone_device_free (dev);
return 0;
--
cgit v0.8.3.1

13
gvfs.spec
View File

@ -1,7 +1,7 @@
Summary: Backends for the gio framework in GLib
Name: gvfs
Version: 1.5.2
Release: 2%{?dist}
Release: 3%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.gtk.org
@ -34,8 +34,8 @@ BuildRequires: automake autoconf
BuildRequires: libtool
# http://bugzilla.gnome.org/show_bug.cgi?id=567235
Patch0: gvfs-archive-integration.patch
# disable HAL volume monitor, yet still detect hal headers for obexftp
Patch1: disable-hal-monitor.patch
# from upstream
Patch1: gvfs-1.5.3-afc-new-libiphone.patch
# Recognize gphoto2 cameras which don't implement get storageinfo
# https://bugzilla.redhat.com/show_bug.cgi?id=552856
Patch15: gvfs-1.5.1-gphoto2-no-storageinfo-support.patch
@ -136,7 +136,7 @@ and iPod Touches to applications using gvfs.
%prep
%setup -q
%patch0 -p1 -b .archive-integration
# %patch1 -p1 -b .nuke-hal-volume-monitor
%patch1 -p1 -b .afc-buildfix
%patch15 -p1 -b .gphoto2-storageinfo
%build
@ -317,7 +317,10 @@ killall -USR1 gvfsd >&/dev/null || :
%{_datadir}/gvfs/remote-volume-monitors/afc.monitor
%changelog
* Mon Jan 25 2010 MAtthisa Clasen <mclasen@redhat.com> - 1.5.2-2
* Tue Jan 26 2010 Tomas Bzatek <tbzatek@redhat.com> - 1.5.2-3
- Fix AFC build against new libiphone
* Mon Jan 25 2010 Matthias Clasen <mclasen@redhat.com> - 1.5.2-2
- Update the GIO module cache
* Mon Jan 25 2010 Tomas Bzatek <tbzatek@redhat.com> - 1.5.2-1