Version bump.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key C6085806)

3 files changed, 0 insertions, 147 deletions

diff --git a/gnome-base/gvfs/files/gvfs-1.10.1-libimobiledevice-1.1.2.patch b/gnome-base/gvfs/files/gvfs-1.10.1-libimobiledevice-1.1.2.patch
deleted file mode 100644
index ab6b82228b49..000000000000
--- a/gnome-base/gvfs/files/gvfs-1.10.1-libimobiledevice-1.1.2.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 9668b2601e43a7a32471383c63cd3839aa721c51 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 2 Apr 2012 03:15:30 -0400
-Subject: [PATCH] afc: Fix building against libimobiledevice-1.1.2
-
-In 1.1.2, the struct idevice_event_t uuid field was renamed to udid.
-Since libimobiledevice lacks a library version macro, we are forced
-to check for the pkgconfig version in configure.
----
- configure.ac                   |    3 +++
- daemon/gvfsbackendafc.c        |   10 +++++++++-
- monitor/afc/afcvolumemonitor.c |   11 +++++++++--
- 3 files changed, 21 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e31fb50..081cc09 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -327,6 +327,9 @@ if test "x$enable_afc" != "xno" ; then
-   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 ab7094f..a62a197 100644
---- a/daemon/gvfsbackendafc.c
-+++ b/daemon/gvfsbackendafc.c
-@@ -339,11 +339,19 @@ static void
- _idevice_event_cb (const idevice_event_t *event, void *user_data)
- {
-   GVfsBackendAfc *afc_backend = G_VFS_BACKEND_AFC (user_data);
-+  gchar *event_udid;
- 
-   g_return_if_fail (afc_backend->uuid != NULL);
-   if (event->event != IDEVICE_DEVICE_REMOVE)
-     return;
--  if (g_str_equal (event->uuid, afc_backend->uuid) == FALSE)
-+
-+#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;
- 
-   g_print ("Shutting down AFC backend for device uuid %s\n", afc_backend->uuid);
-diff --git a/monitor/afc/afcvolumemonitor.c b/monitor/afc/afcvolumemonitor.c
-index dfc3fa5..9f24753 100644
---- a/monitor/afc/afcvolumemonitor.c
-+++ b/monitor/afc/afcvolumemonitor.c
-@@ -83,15 +83,22 @@ static void
- g_vfs_afc_monitor_idevice_event (const idevice_event_t *event, void *user_data)
- {
-   GVfsAfcVolumeMonitor *self;
-+  gchar *event_udid;
- 
-   g_return_if_fail (event != NULL);
- 
-   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->uuid);
-+    g_vfs_afc_monitor_create_volume (self, event_udid);
-   else
--    g_vfs_afc_monitor_remove_volume (self, event->uuid);
-+    g_vfs_afc_monitor_remove_volume (self, event_udid);
- }
- 
- static GObject *
--- 
-1.7.8.5
-
diff --git a/gnome-base/gvfs/files/gvfs-1.10.1-unneeded-include.patch b/gnome-base/gvfs/files/gvfs-1.10.1-unneeded-include.patch
deleted file mode 100644
index 96663e6b04f8..000000000000
--- a/gnome-base/gvfs/files/gvfs-1.10.1-unneeded-include.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 42d800f377dfa4e7338c516d286aef0b76bb1f72 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Thu, 13 Oct 2011 18:58:57 -0400
-Subject: [PATCH] Drop an unneeded include
-
-GLib recently became less forgiving about single includes
-like this.
----
- client/gvfsfusedaemon.c |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c
-index b41e83b..a4ba32c 100644
---- a/client/gvfsfusedaemon.c
-+++ b/client/gvfsfusedaemon.c
-@@ -41,8 +41,6 @@
- #include <glib/gprintf.h>
- #include <gio/gio.h>
- 
--#include <glib/gurifuncs.h>
--
- /* stuff from common/ */
- #include <gdaemonmount.h>
- #include <gvfsdaemonprotocol.h>
--- 
-1.7.8.4
-
diff --git a/gnome-base/gvfs/files/gvfs-1.12.2-afp-g_clear_object.patch b/gnome-base/gvfs/files/gvfs-1.12.2-afp-g_clear_object.patch
deleted file mode 100644
index 09e11d888545..000000000000
--- a/gnome-base/gvfs/files/gvfs-1.12.2-afp-g_clear_object.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 01161473ed33ee682f340e6f12edcba5334475e0 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Mon, 30 Apr 2012 06:09:30 -0400
-Subject: [PATCH] afp: Use g_clear_object properly
-
-g_clear_object expects the address of a pointer. A recent
-change in its definition makes gcc complain about this.
-(cherry picked from commit 7fe5deeae25f2396027f667d8960d2ec84c64716)
----
- daemon/gvfsafpvolume.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/daemon/gvfsafpvolume.c b/daemon/gvfsafpvolume.c
-index 3fd33f2..5207459 100644
---- a/daemon/gvfsafpvolume.c
-+++ b/daemon/gvfsafpvolume.c
-@@ -1082,7 +1082,7 @@ create_directory_get_filedir_parms_cb (GObject *source_object, GAsyncResult *res
-   return;
- 
- error:
--  g_clear_object (info);
-+  g_clear_object (&info);
-   g_simple_async_result_take_error (simple, err);
-   g_simple_async_result_complete (simple);
-   g_object_unref (simple);
-@@ -3033,4 +3033,4 @@ g_vfs_afp_volume_read_from_fork_finish (GVfsAfpVolume  *volume,
-     *bytes_read = g_simple_async_result_get_op_res_gssize (simple);
-   
-   return TRUE;
--}
-\ No newline at end of file
-+}
--- 
-1.7.8.6
-