Version bump with bugfixes and translation updates, remove old.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 3f0866f0b4af0539c92b9cceb41b7a715135c498..bc662da0d0e3002b30fac473d3abefd7a0b3843c 100644 (file)
--- 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/Manifest b/gnome-base/gvfs/Manifest
index 1b4e12b03cddbb6b9032a9c7df02d29db4ce9013..59b30e04a93d570a09a0c717611a00e688e37d64 100644 (file)
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -3,20 +3,18 @@ Hash: SHA1
 
 AUX gvfs-1.2.2-expose-archive-backend.patch 1607 RMD160 cd17c501805fb81e560c35deb1d234280fd07f5c SHA1 70b1824a49ba654dda5ae2ef267ca45a31b53dc4 SHA256 a6cd0f6b848e1943f9121cf4ce4105f32573f9cf7cf75bc0d7d61a98babec519
 AUX gvfs-1.2.2-gphoto2-stricter-checks.patch 1127 RMD160 0c6d83f8b38cf41002dbe6f863916cfac66cd231 SHA1 fc4927fc0f3604689d446d4fe47b48384bee70a5 SHA256 146349147b82721551ce717d892068d608b352fdabd40b969ec9c2b97595c062
-AUX gvfs-1.6.2-afc-depend.patch 3175 RMD160 e26e95e68a52e4ce374d8a4cd92a5d026e55fa09 SHA1 8ea2e28ab75734ad86501aa747cc4743e2b2987a SHA256 0973da936ec8c44d7bd6ca5e98aa70c43b49f4440da0d4d56ecc3accc72dbbf7
-AUX gvfs-1.6.2-afc-semicolon.patch 622 RMD160 82ebb960211121f945c173ad7c1f779ca1d2fb51 SHA1 c9a568055859a8cdcdfff6488dd680cf7da7a641 SHA256 c46d0a13d733557b931694428cfb117431e4a045c17a05829c92d45acc1062e4
 DIST gvfs-1.2.3.tar.bz2 1041079 RMD160 ea8469449073b9a0e50fde4301fa5bc4ff5bbe56 SHA1 c94d52b0bf2fe83d7e26c05ce9d65d240cd57be4 SHA256 395d480c1b64504ba75a8deb70ef6790f2ff07538fca73ef1d26a996223e5879
 DIST gvfs-1.4.3.tar.bz2 1263024 RMD160 da1458101257f5496b4469acb7bc7c646fd9c652 SHA1 3c28516893d6829b3bbae1768fb44e8a405c44e7 SHA256 3ca9ccab2efb2699b72a1f346d3533fc727b5ea2692af6c86adfd9532d6ba15d
-DIST gvfs-1.6.2.tar.bz2 1330089 RMD160 779c26d39e7bae51628131805a4734be440d711b SHA1 b4ee3cb560d36d6ac7fe7bb1dded6b595c94fc81 SHA256 3a422a16b6758ec405b79d8021e115fddf6a88a0278a5d35dd6bcd022cea7248
+DIST gvfs-1.6.3.tar.bz2 1347090 RMD160 3ab75851966d1edecb11de42f4a581953c8ffa8f SHA1 152d84a605465fb8065ae6796a6a28112c5e8847 SHA256 4e3fe2dd80e5baaf4c1844560f6a787b144a917de1cb457b41efcb338477e760
 EBUILD gvfs-1.2.3.ebuild 2196 RMD160 3e91f2df2a75b28f528bc907812aad7a43e97d67 SHA1 b38ce67504f22e129fe3c751dc464d20383aab1f SHA256 618733ea882b30cb8e28e33f6d8087e09ddcff700372c7c2832ed0895e1638f6
 EBUILD gvfs-1.4.3-r1.ebuild 3027 RMD160 4ad95be5af219d8860e506ce3a617c122e2c8384 SHA1 1731bba7fdc30405d3b04069e137e3e5e4bf23d0 SHA256 ace2b3f2051f09d32ce5523b07806828e85d76be8db1ecc115150a17d76de060
-EBUILD gvfs-1.6.2-r1.ebuild 3254 RMD160 fbb3d845732f97744fa5b578b3bb4ab8de0495cf SHA1 d4b7428f4d12269ddac8af2177560ff66553193d SHA256 8d6620e55481ac6340c4b6ee6d7e24dcfe249e1ffa15ae7733c6797184aef479
-MISC ChangeLog 14881 RMD160 16ef8153573d121517a5fa0b2355cfbcf01a9054 SHA1 e835c31f6eda594d81d0560b79e32c312c3d2982 SHA256 29eec7ed0d5ac9855afcb48c70918d34fe691a22288f7c558b35a4d742f85463
+EBUILD gvfs-1.6.3.ebuild 3029 RMD160 9409b32e64fb57f11bddf847eda809b890e7ae41 SHA1 d648bb84a50dbe5e6e57b8e128a037a41e07a892 SHA256 775c26f7f9a0fbeff87f5231048bf39c43d9b16233c22a1fc4253edf768ace16
+MISC ChangeLog 15143 RMD160 c4e93a21527f3c40b28c08f5ec2f860341ab8bf4 SHA1 3c971a96caf234bb759f2346c8480d2201548b30 SHA256 7cf34356f021e5973e1e8a19c27eed4a31cea4d45287ccfe95ae5fdf1493a246
 MISC metadata.xml 1100 RMD160 2d3714eb866d2d48d35e2b69fd5f2228b414793c SHA1 79ac2d6f91caecd4be3202ebb71489d7ff7dee98 SHA256 9b2f7554d979873b4a6900725cba341517bab4980cb63625704cbd62e8bbbb37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkw2DJ0ACgkQCaWpQKGI+9SNQACcDGGYuBrOoDDljna3Z1gbqGLh
-UTIAn0m03USsRHTSJ/stzz6404qldZaA
-=FWqW
+iEYEARECAAYFAkw8U4oACgkQCaWpQKGI+9RyBACcDxZFV7Udh2Bv9BXJOgVMqKZ0
+Lk4AnjrG6FASjVPeeRBjES403zobD8iU
+=YFDv
 -----END PGP SIGNATURE-----

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 (file)
index a0b414c..0000000
--- 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 (file)
index 20cb348..0000000
--- 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
similarity index 89%
rename from gnome-base/gvfs/gvfs-1.6.2-r1.ebuild
rename to gnome-base/gvfs/gvfs-1.6.3.ebuild
index a79e54abf9ecb9d5b337ef4e01a08452f491487d..9611f7b1e20577ac58bfdac238cf72eaa52ee7fb 100644 (file)
--- 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"