Version bump with bugfixes and translation updates, remove old.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 9 insertions, 129 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 3f0866f0b4af..bc662da0d0e3 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.104 2010/07/08 17:36:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.105 2010/07/13 11:52:33 pacho Exp $
+
+*gvfs-1.6.3 (13 Jul 2010)
+
+  13 Jul 2010; Pacho Ramos <pacho@gentoo.org> -gvfs-1.6.2-r1.ebuild,
+  -files/gvfs-1.6.2-afc-depend.patch, -files/gvfs-1.6.2-afc-semicolon.patch,
+  +gvfs-1.6.3.ebuild:
+  Version bump with bugfixes and translation updates, remove old.
 
 *gvfs-1.6.2-r1 (08 Jul 2010)
 
diff --git a/gnome-base/gvfs/files/gvfs-1.6.2-afc-depend.patch b/gnome-base/gvfs/files/gvfs-1.6.2-afc-depend.patch
deleted file mode 100644
index a0b414cbc763..000000000000
--- a/gnome-base/gvfs/files/gvfs-1.6.2-afc-depend.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From fefbd88952ad9336d93143556b2349a833a1eb2d Mon Sep 17 00:00:00 2001
-From: Nikias Bassen <nikias@gmx.li>
-Date: Sat, 29 May 2010 13:51:58 +0000
-Subject: AFC: remove com.apple.afc dependency from afc volume monitor
-
-We can get the required information via lockdown even if we are
-not a trusted host, e.g. when a passcode is set and the device has not
-been paired before.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=618019
----
-diff --git a/monitor/afc/afcvolume.c b/monitor/afc/afcvolume.c
-index 10598cd..0adce77 100644
---- a/monitor/afc/afcvolume.c
-+++ b/monitor/afc/afcvolume.c
-@@ -11,12 +11,9 @@
- 
- #include <libimobiledevice/libimobiledevice.h>
- #include <libimobiledevice/lockdown.h>
--#include <libimobiledevice/afc.h>
- 
- #include "afcvolume.h"
- 
--#define DEFAULT_SERVICE "com.apple.afc"
--
- struct _GVfsAfcVolume {
-   GObject parent;
- 
-@@ -72,12 +69,11 @@ static int
- _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self)
- {
-   idevice_t dev;
--  afc_client_t afc_cli;
-   lockdownd_client_t lockdown_cli = NULL;
-   idevice_error_t err;
--  guint retries;
-+  guint retries
-+  plist_t value;
-   char *model, *display_name;
--  guint16 port;
- 
-   retries = 0;
-   do {
-@@ -90,7 +86,7 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self)
-   if (err != IDEVICE_E_SUCCESS)
-     return 0;
- 
--  if (lockdownd_client_new_with_handshake (dev, &lockdown_cli, "gvfs-afc-volume-monitor") != LOCKDOWN_E_SUCCESS)
-+  if (lockdownd_client_new (dev, &lockdown_cli, "gvfs-afc-volume-monitor") != LOCKDOWN_E_SUCCESS)
-     {
-       idevice_free (dev);
-       return 0;
-@@ -103,32 +99,24 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self)
-       self->name = display_name;
-     }
- 
--  if (lockdownd_start_service (lockdown_cli, DEFAULT_SERVICE, &port) != LOCKDOWN_E_SUCCESS)
--    {
--      lockdownd_client_free (lockdown_cli);
--      idevice_free (dev);
--      return 0;
--    }
--
--  if (afc_client_new (dev, port, &afc_cli) == AFC_E_SUCCESS)
-+  value = NULL;
-+  if (lockdownd_get_value (lockdown_cli, NULL, "DeviceClass", &value) == LOCKDOWN_E_SUCCESS)
-     {
-       /* set correct fd icon spec name depending on device model */
-       model = NULL;
--      if (afc_get_device_info_key (afc_cli, "Model", &model) == AFC_E_SUCCESS)
-+      plist_get_string_val(value, &model);
-+      if (g_str_equal(model, "iPod") != FALSE)
-+        {
-+          g_free (self->icon);
-+          self->icon = g_strdup ("multimedia-player-apple-ipod-touch");
-+        }
-+      else if (g_str_equal(model, "iPad") != FALSE)
-         {
--          if (g_str_has_prefix(model, "iPod") != FALSE)
--            {
--              g_free (self->icon);
--              self->icon = g_strdup ("multimedia-player-apple-ipod-touch");
--            }
--          else if (g_str_has_prefix(model, "iPad") != FALSE)
--            {
--              g_free (self->icon);
--              self->icon = g_strdup ("computer-apple-ipad");
--            }
--          g_free (model);
-+          g_free (self->icon);
-+          self->icon = g_strdup ("computer-apple-ipad");
-         }
--      afc_client_free(afc_cli);
-+      g_free (model);
-+      plist_free (value);
-     }
- 
-   lockdownd_client_free (lockdown_cli);
---
-cgit v0.8.3.1
diff --git a/gnome-base/gvfs/files/gvfs-1.6.2-afc-semicolon.patch b/gnome-base/gvfs/files/gvfs-1.6.2-afc-semicolon.patch
deleted file mode 100644
index 20cb3481488a..000000000000
--- a/gnome-base/gvfs/files/gvfs-1.6.2-afc-semicolon.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From b9badc5d0f570bbb8353f939146163bdf0bc65c1 Mon Sep 17 00:00:00 2001
-From: Alexander Larsson <alexl@redhat.com>
-Date: Mon, 31 May 2010 10:08:07 +0000
-Subject: Fix build error due to missing semicolon
-
----
-diff --git a/monitor/afc/afcvolume.c b/monitor/afc/afcvolume.c
-index 0adce77..0784716 100644
---- a/monitor/afc/afcvolume.c
-+++ b/monitor/afc/afcvolume.c
-@@ -71,7 +71,7 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self)
-   idevice_t dev;
-   lockdownd_client_t lockdown_cli = NULL;
-   idevice_error_t err;
--  guint retries
-+  guint retries;
-   plist_t value;
-   char *model, *display_name;
- 
---
-cgit v0.8.3.1
diff --git a/gnome-base/gvfs/gvfs-1.6.2-r1.ebuild b/gnome-base/gvfs/gvfs-1.6.3.ebuild
index a79e54abf9ec..9611f7b1e205 100644
--- a/gnome-base/gvfs/gvfs-1.6.2-r1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.6.2-r1.ebuild,v 1.1 2010/07/08 17:36:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.6.3.ebuild,v 1.1 2010/07/13 11:52:33 pacho Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -80,12 +80,6 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
-	# AFC: remove com.apple.afc dependency from afc volume monitor; upstream bug 618019
-	epatch "${FILESDIR}/${P}-afc-depend.patch"
-
-	# Fix build error due to missing semicolon
-	epatch "${FILESDIR}/${P}-afc-semicolon.patch"
-
 	# Conditional patching purely to avoid eautoreconf
 	use gphoto2 && epatch "${FILESDIR}/${PN}-1.2.2-gphoto2-stricter-checks.patch"