[arch-commits] Commit in gvfs/repos (12 files)

Jan de Groot jgc at nymeria.archlinux.org
Thu Sep 19 17:42:33 UTC 2013


    Date: Thursday, September 19, 2013 @ 19:42:32
  Author: jgc
Revision: 194606

archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64

Added:
  gvfs/repos/gnome-unstable-i686/
  gvfs/repos/gnome-unstable-i686/PKGBUILD
    (from rev 194605, gvfs/trunk/PKGBUILD)
  gvfs/repos/gnome-unstable-i686/gvfs-module.install
    (from rev 194605, gvfs/trunk/gvfs-module.install)
  gvfs/repos/gnome-unstable-i686/gvfs-smb.install
    (from rev 194605, gvfs/trunk/gvfs-smb.install)
  gvfs/repos/gnome-unstable-i686/gvfs.install
    (from rev 194605, gvfs/trunk/gvfs.install)
  gvfs/repos/gnome-unstable-i686/imobiledevice-1.1.5.patch
    (from rev 194605, gvfs/trunk/imobiledevice-1.1.5.patch)
  gvfs/repos/gnome-unstable-x86_64/
  gvfs/repos/gnome-unstable-x86_64/PKGBUILD
    (from rev 194605, gvfs/trunk/PKGBUILD)
  gvfs/repos/gnome-unstable-x86_64/gvfs-module.install
    (from rev 194605, gvfs/trunk/gvfs-module.install)
  gvfs/repos/gnome-unstable-x86_64/gvfs-smb.install
    (from rev 194605, gvfs/trunk/gvfs-smb.install)
  gvfs/repos/gnome-unstable-x86_64/gvfs.install
    (from rev 194605, gvfs/trunk/gvfs.install)
  gvfs/repos/gnome-unstable-x86_64/imobiledevice-1.1.5.patch
    (from rev 194605, gvfs/trunk/imobiledevice-1.1.5.patch)

-------------------------------------------------+
 gnome-unstable-i686/PKGBUILD                    |  140 +++++++++++++
 gnome-unstable-i686/gvfs-module.install         |    7 
 gnome-unstable-i686/gvfs-smb.install            |   12 +
 gnome-unstable-i686/gvfs.install                |   14 +
 gnome-unstable-i686/imobiledevice-1.1.5.patch   |  221 ++++++++++++++++++++++
 gnome-unstable-x86_64/PKGBUILD                  |  140 +++++++++++++
 gnome-unstable-x86_64/gvfs-module.install       |    7 
 gnome-unstable-x86_64/gvfs-smb.install          |   12 +
 gnome-unstable-x86_64/gvfs.install              |   14 +
 gnome-unstable-x86_64/imobiledevice-1.1.5.patch |  221 ++++++++++++++++++++++
 10 files changed, 788 insertions(+)

Copied: gvfs/repos/gnome-unstable-i686/PKGBUILD (from rev 194605, gvfs/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-i686/PKGBUILD	                        (rev 0)
+++ gnome-unstable-i686/PKGBUILD	2013-09-19 17:42:32 UTC (rev 194606)
@@ -0,0 +1,140 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=gvfs
+pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp' 'gvfs-goa' 'gvfs-mtp')
+pkgver=1.17.91
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('LGPL')
+makedepends=('avahi' 'bluez-libs' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray')
+url="http://www.gnome.org"
+options=(!libtool)
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
+sha256sums=('ef53ee05ae2f0c80606488b7658886b33aed76b10732555d3a0ab118c630bbab')
+
+build() {
+  cd "$pkgbase-$pkgver"
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static \
+      --libexecdir=/usr/lib/gvfs \
+      --with-bash-completion-dir=/usr/share/bash-completion/completions
+  make
+}
+
+package_gvfs() {
+  pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
+  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio-paranoia' 'libsoup' 'udisks2' 'libsecret' 'libbluray')
+  optdepends=('gvfs-afc: AFC (mobile devices) support'
+              'gvfs-smb: SMB/CIFS (Windows client) support'
+              'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
+              'gvfs-obexftp: ObexFTP (bluetooth) support'
+              'gvfs-afp: Apple Filing Protocol (AFP) support'
+              'gvfs-mtp: MTP device support'
+              'gvfs-goa: gnome-online-accounts support'
+              'gtk3: Recent files support')
+  install=gvfs.install
+
+  cd "$pkgbase-$pkgver"
+  sed -e 's/^am__append_4/#am__append_4/' \
+      -e 's/^am__append_5/#am__append_5/' \
+      -e 's/^am__append_6/#am__append_6/' \
+      -e 's/^am__append_7/#am__append_7/' \
+      -i monitor/Makefile
+  make DESTDIR="$pkgdir" install
+
+  cd "$pkgdir"
+  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp,mtp}
+  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp,mtp}.mount
+  rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
+  rm usr/share/GConf/gsettings/gvfs-smb.convert
+}
+
+package_gvfs-smb() {
+  pkgdesc="SMB/CIFS (Windows client) backend for gvfs"
+  depends=("gvfs=$pkgver" 'smbclient')
+  install=gvfs-smb.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -m755 -d "$pkgdir/usr/lib/gvfs"
+  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
+
+  install -m755 .libs/gvfsd-smb{,-browse} "$pkgdir/usr/lib/gvfs/"
+  install -m644 smb{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
+
+  install -Dm644 org.gnome.system.smb.gschema.xml \
+    "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml"
+  install -Dm644 gvfs-smb.convert \
+    "$pkgdir/usr/share/GConf/gsettings/gvfs-smb.convert"
+}
+
+package_gvfs-afc() {
+  pkgdesc="AFC (mobile devices) backend for gvfs"
+  depends=("gvfs=$pkgver" 'libimobiledevice')
+  install=gvfs-module.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -D .libs/gvfsd-afc "$pkgdir/usr/lib/gvfs/gvfsd-afc"
+  install -Dm644 afc.mount "$pkgdir/usr/share/gvfs/mounts/afc.mount"
+
+  cd "$srcdir/$pkgbase-$pkgver/monitor/afc"
+  make DESTDIR="$pkgdir" install
+}
+
+package_gvfs-gphoto2() {
+  pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs"
+  depends=("gvfs=$pkgver" 'dbus-core' 'libgphoto2' 'udev')
+  install=gvfs-module.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -D .libs/gvfsd-gphoto2 "$pkgdir/usr/lib/gvfs/gvfsd-gphoto2"
+  install -Dm644 gphoto2.mount "$pkgdir/usr/share/gvfs/mounts/gphoto2.mount"
+
+  cd "$srcdir/$pkgbase-$pkgver/monitor/gphoto2"
+  make DESTDIR="$pkgdir" install
+}
+
+package_gvfs-obexftp() {
+  pkgdesc="ObexFTP (bluetooth) backend for gvfs"
+  depends=("gvfs=$pkgver" 'dbus-glib' 'bluez4' 'obex-data-server')
+  install=gvfs-module.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -D .libs/gvfsd-obexftp "$pkgdir/usr/lib/gvfs/gvfsd-obexftp"
+  install -Dm644 obexftp.mount "$pkgdir/usr/share/gvfs/mounts/obexftp.mount"
+}
+
+package_gvfs-afp() {
+  pkgdesc="Apple Filing Protocol (AFP) backend for gvfs"
+  depends=("gvfs=$pkgver")
+  install=gvfs-module.install
+  install -m755 -d "$pkgdir/usr/lib/gvfs"
+  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/"
+  install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
+}
+
+package_gvfs-mtp() {
+  pkgdesc="MTP backend for gvfs"
+  depends=("gvfs=$pkgver" 'libmtp')
+  install=gvfs-module.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -D .libs/gvfsd-mtp "$pkgdir/usr/lib/gvfs/gvfsd-mtp"
+  install -Dm644 mtp.mount "$pkgdir/usr/share/gvfs/mounts/mtp.mount"
+
+  cd "$srcdir/$pkgbase-$pkgver/monitor/mtp"
+  make DESTDIR="$pkgdir" install
+}
+
+package_gvfs-goa() {
+  pkgdesc="Gnome Online Accounts (webservices) backend for gvfs"
+  depends=("gvfs=$pkgver" 'gnome-online-accounts')
+  install=gvfs-module.install
+
+  cd "$srcdir/$pkgbase-$pkgver/monitor/goa"
+  make DESTDIR="$pkgdir" install
+}

Copied: gvfs/repos/gnome-unstable-i686/gvfs-module.install (from rev 194605, gvfs/trunk/gvfs-module.install)
===================================================================
--- gnome-unstable-i686/gvfs-module.install	                        (rev 0)
+++ gnome-unstable-i686/gvfs-module.install	2013-09-19 17:42:32 UTC (rev 194606)
@@ -0,0 +1,7 @@
+post_install() {
+  killall -USR1 gvfsd >&/dev/null || :
+}
+
+post_upgrade() {
+  post_install
+}

Copied: gvfs/repos/gnome-unstable-i686/gvfs-smb.install (from rev 194605, gvfs/trunk/gvfs-smb.install)
===================================================================
--- gnome-unstable-i686/gvfs-smb.install	                        (rev 0)
+++ gnome-unstable-i686/gvfs-smb.install	2013-09-19 17:42:32 UTC (rev 194606)
@@ -0,0 +1,12 @@
+post_install() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  killall -USR1 gvfsd >&/dev/null || :
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+}

Copied: gvfs/repos/gnome-unstable-i686/gvfs.install (from rev 194605, gvfs/trunk/gvfs.install)
===================================================================
--- gnome-unstable-i686/gvfs.install	                        (rev 0)
+++ gnome-unstable-i686/gvfs.install	2013-09-19 17:42:32 UTC (rev 194606)
@@ -0,0 +1,14 @@
+post_install() {
+  gio-querymodules /usr/lib/gio/modules
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  killall -USR1 gvfsd >&/dev/null || :
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  gio-querymodules /usr/lib/gio/modules
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+}

Copied: gvfs/repos/gnome-unstable-i686/imobiledevice-1.1.5.patch (from rev 194605, gvfs/trunk/imobiledevice-1.1.5.patch)
===================================================================
--- gnome-unstable-i686/imobiledevice-1.1.5.patch	                        (rev 0)
+++ gnome-unstable-i686/imobiledevice-1.1.5.patch	2013-09-19 17:42:32 UTC (rev 194606)
@@ -0,0 +1,221 @@
+From d71c6108901460842de25012d5ece727a0c70d27 Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy at redhat.com>
+Date: Tue, 11 Jun 2013 11:33:23 +0000
+Subject: afc: Update to libimobiledevice new api
+
+https://bugzilla.redhat.com/show_bug.cgi?id=951731
+https://bugzilla.gnome.org/show_bug.cgi?id=702577
+---
+diff --git a/configure.ac b/configure.ac
+index 12dbdcd..2846d82 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -372,14 +372,11 @@ AFC_LIBS=
+ AFC_CFLAGS=
+ 
+ if test "x$enable_afc" != "xno" ; then
+-  PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.0 libplist >= 0.15, msg_afc=yes)
++  PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.5 libplist >= 0.15, msg_afc=yes)
+ 
+   if test "x$msg_afc" = "xyes"; then
+     PKG_CHECK_MODULES(AFC, libimobiledevice-1.0 libplist)
+     AC_DEFINE(HAVE_AFC, 1, [Define to 1 if AFC is going to be built])
+-    PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.2,
+-                     [AC_DEFINE(HAVE_LIBIMOBILEDEVICE_1_1_2, 1,
+-                                [Define to 1 if libimobiledevice-1.1.2 found])])
+   fi
+ fi
+ 
+diff --git a/daemon/gvfsbackendafc.c b/daemon/gvfsbackendafc.c
+index ab4a9ce..6b0b64f 100644
+--- a/daemon/gvfsbackendafc.c
++++ b/daemon/gvfsbackendafc.c
+@@ -349,12 +349,7 @@ _idevice_event_cb (const idevice_event_t *event, void *user_data)
+   if (event->event != IDEVICE_DEVICE_REMOVE)
+     return;
+ 
+-#ifdef HAVE_LIBIMOBILEDEVICE_1_1_2
+   event_udid = event->udid;
+-#else
+-  event_udid = event->uuid;
+-#endif
+-
+   if (g_str_equal (event_udid, afc_backend->uuid) == FALSE)
+     return;
+ 
+@@ -401,7 +396,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
+   const char *str;
+   char *tmp;
+   char *display_name = NULL;
+-  guint16 port;
++  lockdownd_service_descriptor_t lockdown_service = NULL;
+   int virtual_port;
+   GMountSpec *real_spec;
+   GVfsBackendAfc *self;
+@@ -414,6 +409,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
+   char **dcim_afcinfo;
+   plist_t value;
+   lockdownd_error_t lerr;
++  afc_error_t aerr;
+   const gchar *choices[] = {_("Try again"), _("Cancel"), NULL}; /* keep in sync with the enum above */
+   gboolean aborted = FALSE;
+   gchar *message = NULL;
+@@ -649,41 +645,38 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
+ 
+   switch (self->mode) {
+     case ACCESS_MODE_AFC:
+-      lerr = lockdownd_start_service (lockdown_cli, self->service, &port);
++      lerr = lockdownd_start_service (lockdown_cli, self->service, &lockdown_service);
+       if (G_UNLIKELY(g_vfs_backend_lockdownd_check (lerr, G_VFS_JOB(job))))
+         {
+           goto out_destroy_lockdown;
+         }
+-      if (G_UNLIKELY(g_vfs_backend_afc_check (afc_client_new (self->dev,
+-                                                              port, &self->afc_cli),
+-                                              G_VFS_JOB(job))))
++      aerr = afc_client_new (self->dev, lockdown_service, &self->afc_cli);
++      if (G_UNLIKELY(g_vfs_backend_afc_check (aerr, G_VFS_JOB(job))))
+         {
+           goto out_destroy_lockdown;
+         }
+       break;
+     case ACCESS_MODE_HOUSE_ARREST:
+-      lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.installation_proxy", &port);
++      lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.installation_proxy", &lockdown_service);
+       if (G_UNLIKELY(g_vfs_backend_lockdownd_check (lerr, G_VFS_JOB(job))))
+         {
+           g_warning ("couldn't start inst proxy");
+           goto out_destroy_lockdown;
+         }
+-      if (G_UNLIKELY(g_vfs_backend_inst_check (instproxy_client_new (self->dev,
+-                                                                     port, &self->inst),
+-                                               G_VFS_JOB(job))))
++      aerr = instproxy_client_new (self->dev, lockdown_service, &self->inst);
++      if (G_UNLIKELY(g_vfs_backend_inst_check (aerr, G_VFS_JOB(job))))
+         {
+           g_warning ("couldn't create inst proxy instance");
+           goto out_destroy_lockdown;
+         }
+-      lerr = lockdownd_start_service (lockdown_cli, "com.apple.springboardservices", &port);
++      lerr = lockdownd_start_service (lockdown_cli, "com.apple.springboardservices", &lockdown_service);
+       if (G_UNLIKELY(g_vfs_backend_lockdownd_check (lerr, G_VFS_JOB(job))))
+         {
+           g_warning ("couldn't start SBServices proxy");
+           goto out_destroy_lockdown;
+         }
+-      if (G_UNLIKELY(g_vfs_backend_sbs_check (sbservices_client_new (self->dev,
+-                                                                     port, &self->sbs),
+-                                              G_VFS_JOB(job))))
++      aerr = sbservices_client_new (self->dev, lockdown_service, &self->sbs);
++      if (G_UNLIKELY(g_vfs_backend_sbs_check (aerr, G_VFS_JOB(job))))
+         {
+           g_warning ("couldn't create SBServices proxy instance");
+           goto out_destroy_lockdown;
+@@ -705,6 +698,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
+ 
+   /* lockdown connection is not needed anymore */
+   lockdownd_client_free (lockdown_cli);
++  lockdownd_service_descriptor_free (lockdown_service);
+ 
+   /* Add camera item if necessary */
+   if (self->mode == ACCESS_MODE_AFC)
+@@ -723,6 +717,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
+ 
+ out_destroy_lockdown:
+   lockdownd_client_free (lockdown_cli);
++  lockdownd_service_descriptor_free (lockdown_service);
+ 
+ out_destroy_dev:
+   idevice_free (self->dev);
+@@ -794,10 +789,11 @@ g_vfs_backend_setup_afc_for_app (GVfsBackendAfc *self,
+ {
+   AppInfo *info;
+   lockdownd_client_t lockdown_cli;
+-  guint16 port;
++  lockdownd_service_descriptor_t lockdown_service = NULL;
+   house_arrest_client_t house_arrest;
+   afc_client_t afc;
+   plist_t dict, error;
++  lockdownd_error_t lerr;
+ 
+   info = g_hash_table_lookup (self->apps, id);
+ 
+@@ -812,7 +808,8 @@ g_vfs_backend_setup_afc_for_app (GVfsBackendAfc *self,
+       g_warning ("Failed to get a lockdown to start house arrest for app %s", info->id);
+       return;
+     }
+-  if (lockdownd_start_service (lockdown_cli, "com.apple.mobile.house_arrest", &port) != LOCKDOWN_E_SUCCESS)
++  lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.house_arrest", &lockdown_service);
++  if (lerr != LOCKDOWN_E_SUCCESS)
+     {
+       lockdownd_client_free (lockdown_cli);
+       g_warning ("Failed to start house arrest for app %s", info->id);
+@@ -820,14 +817,17 @@ g_vfs_backend_setup_afc_for_app (GVfsBackendAfc *self,
+     }
+ 
+   house_arrest = NULL;
+-  house_arrest_client_new (self->dev, port, &house_arrest);
++  house_arrest_client_new (self->dev, lockdown_service, &house_arrest);
+   if (house_arrest == NULL)
+     {
+       g_warning ("Failed to start house arrest for app %s", info->id);
+       lockdownd_client_free (lockdown_cli);
++      lockdownd_service_descriptor_free (lockdown_service);
+       return;
+     }
+ 
++  lockdownd_service_descriptor_free (lockdown_service);
++
+   dict = NULL;
+   if (house_arrest_send_command (house_arrest, "VendContainer", info->id) != HOUSE_ARREST_E_SUCCESS ||
+       house_arrest_get_result (house_arrest, &dict) != HOUSE_ARREST_E_SUCCESS)
+diff --git a/monitor/afc/afcvolume.c b/monitor/afc/afcvolume.c
+index 9829077..b7284b0 100644
+--- a/monitor/afc/afcvolume.c
++++ b/monitor/afc/afcvolume.c
+@@ -80,6 +80,8 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self)
+   guint retries;
+   plist_t value;
+   char *model, *display_name;
++  lockdownd_service_descriptor_t lockdown_service = NULL;
++  lockdownd_error_t lerr;
+ 
+   retries = 0;
+   do {
+@@ -94,14 +96,14 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self)
+ 
+   if (self->service != NULL)
+     {
+-      guint16 port;
+-
+       if (lockdownd_client_new_with_handshake (dev, &lockdown_cli, "gvfs-afc-volume-monitor") != LOCKDOWN_E_SUCCESS)
+         {
+           idevice_free (dev);
+           return 0;
+         }
+-      if (lockdownd_start_service(lockdown_cli, "com.apple.mobile.house_arrest", &port) != LOCKDOWN_E_SUCCESS)
++      lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.house_arrest", &lockdown_service);
++      lockdownd_service_descriptor_free (lockdown_service);
++      if (lerr != LOCKDOWN_E_SUCCESS)
+         {
+           idevice_free (dev);
+           return 0;
+diff --git a/monitor/afc/afcvolumemonitor.c b/monitor/afc/afcvolumemonitor.c
+index 3545bdf..995ef4d 100644
+--- a/monitor/afc/afcvolumemonitor.c
++++ b/monitor/afc/afcvolumemonitor.c
+@@ -89,12 +89,7 @@ g_vfs_afc_monitor_idevice_event (const idevice_event_t *event, void *user_data)
+ 
+   self = G_VFS_AFC_VOLUME_MONITOR(user_data);
+ 
+-#ifdef HAVE_LIBIMOBILEDEVICE_1_1_2
+   event_udid = event->udid;
+-#else
+-  event_udid = event->uuid;
+-#endif
+-
+   if (event->event == IDEVICE_DEVICE_ADD)
+     g_vfs_afc_monitor_create_volume (self, event_udid);
+   else
+--
+cgit v0.9.2

Copied: gvfs/repos/gnome-unstable-x86_64/PKGBUILD (from rev 194605, gvfs/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-x86_64/PKGBUILD	                        (rev 0)
+++ gnome-unstable-x86_64/PKGBUILD	2013-09-19 17:42:32 UTC (rev 194606)
@@ -0,0 +1,140 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=gvfs
+pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp' 'gvfs-goa' 'gvfs-mtp')
+pkgver=1.17.91
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('LGPL')
+makedepends=('avahi' 'bluez-libs' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray')
+url="http://www.gnome.org"
+options=(!libtool)
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
+sha256sums=('ef53ee05ae2f0c80606488b7658886b33aed76b10732555d3a0ab118c630bbab')
+
+build() {
+  cd "$pkgbase-$pkgver"
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static \
+      --libexecdir=/usr/lib/gvfs \
+      --with-bash-completion-dir=/usr/share/bash-completion/completions
+  make
+}
+
+package_gvfs() {
+  pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
+  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio-paranoia' 'libsoup' 'udisks2' 'libsecret' 'libbluray')
+  optdepends=('gvfs-afc: AFC (mobile devices) support'
+              'gvfs-smb: SMB/CIFS (Windows client) support'
+              'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
+              'gvfs-obexftp: ObexFTP (bluetooth) support'
+              'gvfs-afp: Apple Filing Protocol (AFP) support'
+              'gvfs-mtp: MTP device support'
+              'gvfs-goa: gnome-online-accounts support'
+              'gtk3: Recent files support')
+  install=gvfs.install
+
+  cd "$pkgbase-$pkgver"
+  sed -e 's/^am__append_4/#am__append_4/' \
+      -e 's/^am__append_5/#am__append_5/' \
+      -e 's/^am__append_6/#am__append_6/' \
+      -e 's/^am__append_7/#am__append_7/' \
+      -i monitor/Makefile
+  make DESTDIR="$pkgdir" install
+
+  cd "$pkgdir"
+  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp,mtp}
+  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp,mtp}.mount
+  rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
+  rm usr/share/GConf/gsettings/gvfs-smb.convert
+}
+
+package_gvfs-smb() {
+  pkgdesc="SMB/CIFS (Windows client) backend for gvfs"
+  depends=("gvfs=$pkgver" 'smbclient')
+  install=gvfs-smb.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -m755 -d "$pkgdir/usr/lib/gvfs"
+  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
+
+  install -m755 .libs/gvfsd-smb{,-browse} "$pkgdir/usr/lib/gvfs/"
+  install -m644 smb{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
+
+  install -Dm644 org.gnome.system.smb.gschema.xml \
+    "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml"
+  install -Dm644 gvfs-smb.convert \
+    "$pkgdir/usr/share/GConf/gsettings/gvfs-smb.convert"
+}
+
+package_gvfs-afc() {
+  pkgdesc="AFC (mobile devices) backend for gvfs"
+  depends=("gvfs=$pkgver" 'libimobiledevice')
+  install=gvfs-module.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -D .libs/gvfsd-afc "$pkgdir/usr/lib/gvfs/gvfsd-afc"
+  install -Dm644 afc.mount "$pkgdir/usr/share/gvfs/mounts/afc.mount"
+
+  cd "$srcdir/$pkgbase-$pkgver/monitor/afc"
+  make DESTDIR="$pkgdir" install
+}
+
+package_gvfs-gphoto2() {
+  pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs"
+  depends=("gvfs=$pkgver" 'dbus-core' 'libgphoto2' 'udev')
+  install=gvfs-module.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -D .libs/gvfsd-gphoto2 "$pkgdir/usr/lib/gvfs/gvfsd-gphoto2"
+  install -Dm644 gphoto2.mount "$pkgdir/usr/share/gvfs/mounts/gphoto2.mount"
+
+  cd "$srcdir/$pkgbase-$pkgver/monitor/gphoto2"
+  make DESTDIR="$pkgdir" install
+}
+
+package_gvfs-obexftp() {
+  pkgdesc="ObexFTP (bluetooth) backend for gvfs"
+  depends=("gvfs=$pkgver" 'dbus-glib' 'bluez4' 'obex-data-server')
+  install=gvfs-module.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -D .libs/gvfsd-obexftp "$pkgdir/usr/lib/gvfs/gvfsd-obexftp"
+  install -Dm644 obexftp.mount "$pkgdir/usr/share/gvfs/mounts/obexftp.mount"
+}
+
+package_gvfs-afp() {
+  pkgdesc="Apple Filing Protocol (AFP) backend for gvfs"
+  depends=("gvfs=$pkgver")
+  install=gvfs-module.install
+  install -m755 -d "$pkgdir/usr/lib/gvfs"
+  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/"
+  install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
+}
+
+package_gvfs-mtp() {
+  pkgdesc="MTP backend for gvfs"
+  depends=("gvfs=$pkgver" 'libmtp')
+  install=gvfs-module.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -D .libs/gvfsd-mtp "$pkgdir/usr/lib/gvfs/gvfsd-mtp"
+  install -Dm644 mtp.mount "$pkgdir/usr/share/gvfs/mounts/mtp.mount"
+
+  cd "$srcdir/$pkgbase-$pkgver/monitor/mtp"
+  make DESTDIR="$pkgdir" install
+}
+
+package_gvfs-goa() {
+  pkgdesc="Gnome Online Accounts (webservices) backend for gvfs"
+  depends=("gvfs=$pkgver" 'gnome-online-accounts')
+  install=gvfs-module.install
+
+  cd "$srcdir/$pkgbase-$pkgver/monitor/goa"
+  make DESTDIR="$pkgdir" install
+}

Copied: gvfs/repos/gnome-unstable-x86_64/gvfs-module.install (from rev 194605, gvfs/trunk/gvfs-module.install)
===================================================================
--- gnome-unstable-x86_64/gvfs-module.install	                        (rev 0)
+++ gnome-unstable-x86_64/gvfs-module.install	2013-09-19 17:42:32 UTC (rev 194606)
@@ -0,0 +1,7 @@
+post_install() {
+  killall -USR1 gvfsd >&/dev/null || :
+}
+
+post_upgrade() {
+  post_install
+}

Copied: gvfs/repos/gnome-unstable-x86_64/gvfs-smb.install (from rev 194605, gvfs/trunk/gvfs-smb.install)
===================================================================
--- gnome-unstable-x86_64/gvfs-smb.install	                        (rev 0)
+++ gnome-unstable-x86_64/gvfs-smb.install	2013-09-19 17:42:32 UTC (rev 194606)
@@ -0,0 +1,12 @@
+post_install() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  killall -USR1 gvfsd >&/dev/null || :
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+}

Copied: gvfs/repos/gnome-unstable-x86_64/gvfs.install (from rev 194605, gvfs/trunk/gvfs.install)
===================================================================
--- gnome-unstable-x86_64/gvfs.install	                        (rev 0)
+++ gnome-unstable-x86_64/gvfs.install	2013-09-19 17:42:32 UTC (rev 194606)
@@ -0,0 +1,14 @@
+post_install() {
+  gio-querymodules /usr/lib/gio/modules
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  killall -USR1 gvfsd >&/dev/null || :
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  gio-querymodules /usr/lib/gio/modules
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+}

Copied: gvfs/repos/gnome-unstable-x86_64/imobiledevice-1.1.5.patch (from rev 194605, gvfs/trunk/imobiledevice-1.1.5.patch)
===================================================================
--- gnome-unstable-x86_64/imobiledevice-1.1.5.patch	                        (rev 0)
+++ gnome-unstable-x86_64/imobiledevice-1.1.5.patch	2013-09-19 17:42:32 UTC (rev 194606)
@@ -0,0 +1,221 @@
+From d71c6108901460842de25012d5ece727a0c70d27 Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy at redhat.com>
+Date: Tue, 11 Jun 2013 11:33:23 +0000
+Subject: afc: Update to libimobiledevice new api
+
+https://bugzilla.redhat.com/show_bug.cgi?id=951731
+https://bugzilla.gnome.org/show_bug.cgi?id=702577
+---
+diff --git a/configure.ac b/configure.ac
+index 12dbdcd..2846d82 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -372,14 +372,11 @@ AFC_LIBS=
+ AFC_CFLAGS=
+ 
+ if test "x$enable_afc" != "xno" ; then
+-  PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.0 libplist >= 0.15, msg_afc=yes)
++  PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.5 libplist >= 0.15, msg_afc=yes)
+ 
+   if test "x$msg_afc" = "xyes"; then
+     PKG_CHECK_MODULES(AFC, libimobiledevice-1.0 libplist)
+     AC_DEFINE(HAVE_AFC, 1, [Define to 1 if AFC is going to be built])
+-    PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.2,
+-                     [AC_DEFINE(HAVE_LIBIMOBILEDEVICE_1_1_2, 1,
+-                                [Define to 1 if libimobiledevice-1.1.2 found])])
+   fi
+ fi
+ 
+diff --git a/daemon/gvfsbackendafc.c b/daemon/gvfsbackendafc.c
+index ab4a9ce..6b0b64f 100644
+--- a/daemon/gvfsbackendafc.c
++++ b/daemon/gvfsbackendafc.c
+@@ -349,12 +349,7 @@ _idevice_event_cb (const idevice_event_t *event, void *user_data)
+   if (event->event != IDEVICE_DEVICE_REMOVE)
+     return;
+ 
+-#ifdef HAVE_LIBIMOBILEDEVICE_1_1_2
+   event_udid = event->udid;
+-#else
+-  event_udid = event->uuid;
+-#endif
+-
+   if (g_str_equal (event_udid, afc_backend->uuid) == FALSE)
+     return;
+ 
+@@ -401,7 +396,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
+   const char *str;
+   char *tmp;
+   char *display_name = NULL;
+-  guint16 port;
++  lockdownd_service_descriptor_t lockdown_service = NULL;
+   int virtual_port;
+   GMountSpec *real_spec;
+   GVfsBackendAfc *self;
+@@ -414,6 +409,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
+   char **dcim_afcinfo;
+   plist_t value;
+   lockdownd_error_t lerr;
++  afc_error_t aerr;
+   const gchar *choices[] = {_("Try again"), _("Cancel"), NULL}; /* keep in sync with the enum above */
+   gboolean aborted = FALSE;
+   gchar *message = NULL;
+@@ -649,41 +645,38 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
+ 
+   switch (self->mode) {
+     case ACCESS_MODE_AFC:
+-      lerr = lockdownd_start_service (lockdown_cli, self->service, &port);
++      lerr = lockdownd_start_service (lockdown_cli, self->service, &lockdown_service);
+       if (G_UNLIKELY(g_vfs_backend_lockdownd_check (lerr, G_VFS_JOB(job))))
+         {
+           goto out_destroy_lockdown;
+         }
+-      if (G_UNLIKELY(g_vfs_backend_afc_check (afc_client_new (self->dev,
+-                                                              port, &self->afc_cli),
+-                                              G_VFS_JOB(job))))
++      aerr = afc_client_new (self->dev, lockdown_service, &self->afc_cli);
++      if (G_UNLIKELY(g_vfs_backend_afc_check (aerr, G_VFS_JOB(job))))
+         {
+           goto out_destroy_lockdown;
+         }
+       break;
+     case ACCESS_MODE_HOUSE_ARREST:
+-      lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.installation_proxy", &port);
++      lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.installation_proxy", &lockdown_service);
+       if (G_UNLIKELY(g_vfs_backend_lockdownd_check (lerr, G_VFS_JOB(job))))
+         {
+           g_warning ("couldn't start inst proxy");
+           goto out_destroy_lockdown;
+         }
+-      if (G_UNLIKELY(g_vfs_backend_inst_check (instproxy_client_new (self->dev,
+-                                                                     port, &self->inst),
+-                                               G_VFS_JOB(job))))
++      aerr = instproxy_client_new (self->dev, lockdown_service, &self->inst);
++      if (G_UNLIKELY(g_vfs_backend_inst_check (aerr, G_VFS_JOB(job))))
+         {
+           g_warning ("couldn't create inst proxy instance");
+           goto out_destroy_lockdown;
+         }
+-      lerr = lockdownd_start_service (lockdown_cli, "com.apple.springboardservices", &port);
++      lerr = lockdownd_start_service (lockdown_cli, "com.apple.springboardservices", &lockdown_service);
+       if (G_UNLIKELY(g_vfs_backend_lockdownd_check (lerr, G_VFS_JOB(job))))
+         {
+           g_warning ("couldn't start SBServices proxy");
+           goto out_destroy_lockdown;
+         }
+-      if (G_UNLIKELY(g_vfs_backend_sbs_check (sbservices_client_new (self->dev,
+-                                                                     port, &self->sbs),
+-                                              G_VFS_JOB(job))))
++      aerr = sbservices_client_new (self->dev, lockdown_service, &self->sbs);
++      if (G_UNLIKELY(g_vfs_backend_sbs_check (aerr, G_VFS_JOB(job))))
+         {
+           g_warning ("couldn't create SBServices proxy instance");
+           goto out_destroy_lockdown;
+@@ -705,6 +698,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
+ 
+   /* lockdown connection is not needed anymore */
+   lockdownd_client_free (lockdown_cli);
++  lockdownd_service_descriptor_free (lockdown_service);
+ 
+   /* Add camera item if necessary */
+   if (self->mode == ACCESS_MODE_AFC)
+@@ -723,6 +717,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
+ 
+ out_destroy_lockdown:
+   lockdownd_client_free (lockdown_cli);
++  lockdownd_service_descriptor_free (lockdown_service);
+ 
+ out_destroy_dev:
+   idevice_free (self->dev);
+@@ -794,10 +789,11 @@ g_vfs_backend_setup_afc_for_app (GVfsBackendAfc *self,
+ {
+   AppInfo *info;
+   lockdownd_client_t lockdown_cli;
+-  guint16 port;
++  lockdownd_service_descriptor_t lockdown_service = NULL;
+   house_arrest_client_t house_arrest;
+   afc_client_t afc;
+   plist_t dict, error;
++  lockdownd_error_t lerr;
+ 
+   info = g_hash_table_lookup (self->apps, id);
+ 
+@@ -812,7 +808,8 @@ g_vfs_backend_setup_afc_for_app (GVfsBackendAfc *self,
+       g_warning ("Failed to get a lockdown to start house arrest for app %s", info->id);
+       return;
+     }
+-  if (lockdownd_start_service (lockdown_cli, "com.apple.mobile.house_arrest", &port) != LOCKDOWN_E_SUCCESS)
++  lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.house_arrest", &lockdown_service);
++  if (lerr != LOCKDOWN_E_SUCCESS)
+     {
+       lockdownd_client_free (lockdown_cli);
+       g_warning ("Failed to start house arrest for app %s", info->id);
+@@ -820,14 +817,17 @@ g_vfs_backend_setup_afc_for_app (GVfsBackendAfc *self,
+     }
+ 
+   house_arrest = NULL;
+-  house_arrest_client_new (self->dev, port, &house_arrest);
++  house_arrest_client_new (self->dev, lockdown_service, &house_arrest);
+   if (house_arrest == NULL)
+     {
+       g_warning ("Failed to start house arrest for app %s", info->id);
+       lockdownd_client_free (lockdown_cli);
++      lockdownd_service_descriptor_free (lockdown_service);
+       return;
+     }
+ 
++  lockdownd_service_descriptor_free (lockdown_service);
++
+   dict = NULL;
+   if (house_arrest_send_command (house_arrest, "VendContainer", info->id) != HOUSE_ARREST_E_SUCCESS ||
+       house_arrest_get_result (house_arrest, &dict) != HOUSE_ARREST_E_SUCCESS)
+diff --git a/monitor/afc/afcvolume.c b/monitor/afc/afcvolume.c
+index 9829077..b7284b0 100644
+--- a/monitor/afc/afcvolume.c
++++ b/monitor/afc/afcvolume.c
+@@ -80,6 +80,8 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self)
+   guint retries;
+   plist_t value;
+   char *model, *display_name;
++  lockdownd_service_descriptor_t lockdown_service = NULL;
++  lockdownd_error_t lerr;
+ 
+   retries = 0;
+   do {
+@@ -94,14 +96,14 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self)
+ 
+   if (self->service != NULL)
+     {
+-      guint16 port;
+-
+       if (lockdownd_client_new_with_handshake (dev, &lockdown_cli, "gvfs-afc-volume-monitor") != LOCKDOWN_E_SUCCESS)
+         {
+           idevice_free (dev);
+           return 0;
+         }
+-      if (lockdownd_start_service(lockdown_cli, "com.apple.mobile.house_arrest", &port) != LOCKDOWN_E_SUCCESS)
++      lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.house_arrest", &lockdown_service);
++      lockdownd_service_descriptor_free (lockdown_service);
++      if (lerr != LOCKDOWN_E_SUCCESS)
+         {
+           idevice_free (dev);
+           return 0;
+diff --git a/monitor/afc/afcvolumemonitor.c b/monitor/afc/afcvolumemonitor.c
+index 3545bdf..995ef4d 100644
+--- a/monitor/afc/afcvolumemonitor.c
++++ b/monitor/afc/afcvolumemonitor.c
+@@ -89,12 +89,7 @@ g_vfs_afc_monitor_idevice_event (const idevice_event_t *event, void *user_data)
+ 
+   self = G_VFS_AFC_VOLUME_MONITOR(user_data);
+ 
+-#ifdef HAVE_LIBIMOBILEDEVICE_1_1_2
+   event_udid = event->udid;
+-#else
+-  event_udid = event->uuid;
+-#endif
+-
+   if (event->event == IDEVICE_DEVICE_ADD)
+     g_vfs_afc_monitor_create_volume (self, event_udid);
+   else
+--
+cgit v0.9.2




More information about the arch-commits mailing list