Fix building with gcc-4.5 and USE="afp", thanks to Travis Glenn Hansen for reporting.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 42 insertions, 7 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index c8f415f6557c..c893f0496b76 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.172 2012/04/12 09:24:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.173 2012/04/13 04:08:52 tetromino Exp $
+
+  13 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gvfs-1.12.0.ebuild,
+  +files/gvfs-1.12.0-afp-gcc-4.5.patch:
+  Fix building with gcc-4.5 and USE="afp", thanks to Travis Glenn Hansen for
+  reporting.
 
   12 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gvfs-1.10.1.ebuild,
   gvfs-1.12.0.ebuild:
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 6c8257155ffd..b7db9a2f00af 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -3,19 +3,20 @@ Hash: SHA256
 
 AUX gvfs-1.10.1-libimobiledevice-1.1.2.patch 2813 RMD160 84bdfa6b681cb7eb57a0220caecf35491a2cbe42 SHA1 0e9090a65236fa0e49a7927c1839e3bacdc5d646 SHA256 db8bc868fb74f470b4a91ee4eed6e4f327a64b5a666a37c915ef504ace1258e8
 AUX gvfs-1.10.1-unneeded-include.patch 706 RMD160 e6e911fb43aa24201422f3ced7d03d753ce7bc99 SHA1 b180b53b35b8191c0a75795ab40ffec32d4c78ec SHA256 7271536185ad468c39474b8eea387af7038a974c60964b5d8d4f6bac0cc96969
+AUX gvfs-1.12.0-afp-gcc-4.5.patch 885 RMD160 1638d82b847e4d3a913a0314d685e99840271f25 SHA1 f856b429af894074b213904c4aca36d888de11be SHA256 6c58c095f4079a4a119fbec8703eabb58f78326a575f4d805530f590bab3e26a
 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
 DIST gvfs-1.10.1.tar.xz 1295236 RMD160 e50d96fc0b6aa9d2ab50a3cfc5c161be5d6e6e16 SHA1 d564d9934191342e6421cd038fc0674f8dd27eae SHA256 cd30facee5ad6cd0fafc5337bbf7c06a0bff3936f9ff2ae31519b301efcc9288
 DIST gvfs-1.12.0.tar.xz 1342208 RMD160 8a423a8b9eb988946802502299b0194e3a17a52e SHA1 372f5ca24ff419e5d278ba47165f0be760d32e33 SHA256 87ffb27fd884be65570d64530c3121f9e49848070b62a26e39cd363f6a6bd555
 DIST libgcrypt.m4.bz2 1526 RMD160 6149f51c00e1e21d85187136f7682e41271fed40 SHA1 1731ae882cdc7c53efeef2e23e0d2d9791c6d739 SHA256 ce9d04f9cbd5417e4d4ba91095c06cea4852c70d75716311e82dfc243d2f0128
 EBUILD gvfs-1.10.1.ebuild 3566 RMD160 21420049d234d9571f5092b346e4228c55eb3694 SHA1 ab30d749fe2077c2b8e9e3d3afc3e951930246b2 SHA256 9d6ea30adfda4c53c0c36e2e20b4bd3b141b39bf80674b2134132d41debe576c
-EBUILD gvfs-1.12.0.ebuild 3535 RMD160 c4bdd0855be5975c82456fe26a147d11db9e92fe SHA1 5b1c63039833c5f12cd5bcc04cd4f999e3dcb34f SHA256 83da5a9db2164620847e4b3123291ced34f05ca795f1faa5aa3dad74818a981b
-MISC ChangeLog 24123 RMD160 dd34d563f92825390e24bb7be123a6c804864110 SHA1 39246ef13e689b217f2bffcf1a6ee91205eb62c0 SHA256 ee0155c29eb181321df35241b5c199a340f3e9c96069f9bfaa5f018e31788496
+EBUILD gvfs-1.12.0.ebuild 3667 RMD160 c1916b945bc6ed002afd984fb4567e83cc629268 SHA1 5700129fc4d2fee17ea52c12e86373b660425c98 SHA256 f08f7e30d540ebddf4bddb715c2dcaaad800bc6b02bf6cad6a091e2d14142015
+MISC ChangeLog 24333 RMD160 e4d56041ec9fd9b1f2c04178618c9d192bdce07f SHA1 4ba4e690a2bdec474b35d3b1154158510232990f SHA256 8b43f7964ff348d4608d5daa7f27b7034cd2c9096973b15d9cee2d197b6f36a5
 MISC metadata.xml 1315 RMD160 58c1f8a1d25d892346632ae34a9a3b58288cd029 SHA1 2dd23a67b1cfdffcf1729bf2963893d743859e8c SHA256 79981750cbbf2fd42c086917b23562c668ea309acd311ae4c613b9ff29f7d65a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk+Gn3AACgkQdjK8w9WeBnD7OwEAl0MBVaN59aXmtuA1/8Yh0Fmb
-C54wg0xHOr46f6h7EvoA/iBZVPi11yVWP9lnzOJA3JGLezVQNfk6vUEXCFumQhjS
-=OonI
+iF4EAREIAAYFAk+HptkACgkQdjK8w9WeBnCnnQD/ZNEGQfcPnwEHvFlQnGzCB/nc
+zlNQvaVrWr39LH7TjAoA/A8/Ydo9WlX12FNL2uyv1QqsUn7cRTKjyDoTjXe0R+u4
+=QSdT
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/files/gvfs-1.12.0-afp-gcc-4.5.patch b/gnome-base/gvfs/files/gvfs-1.12.0-afp-gcc-4.5.patch
new file mode 100644
index 000000000000..575436ab335a
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.12.0-afp-gcc-4.5.patch
@@ -0,0 +1,26 @@
+From 384e7b838570fce794cea368fcbaa97b9ad72df2 Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Fri, 23 Mar 2012 18:33:40 +0100
+Subject: [PATCH] gvfsafp: Prevent redefinition of GVfsAfpServer.
+
+GVfsAfpServer is already included in gvfsafpvolume.h which gvfsafpserver.h
+includes; so no need to declare GVfsAfpServer here.
+---
+ daemon/gvfsafpserver.h |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/daemon/gvfsafpserver.h b/daemon/gvfsafpserver.h
+index 25753ca..5cf6fc4 100644
+--- a/daemon/gvfsafpserver.h
++++ b/daemon/gvfsafpserver.h
+@@ -48,7 +48,6 @@ typedef enum
+ #define G_VFS_AFP_SERVER_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), G_VFS_TYPE_AFP_SERVER, GVfsAfpServerClass))
+ 
+ typedef struct _GVfsAfpServerClass GVfsAfpServerClass;
+-typedef struct _GVfsAfpServer GVfsAfpServer;
+ 
+ struct _GVfsAfpServerClass
+ {
+-- 
+1.7.6
+
diff --git a/gnome-base/gvfs/gvfs-1.12.0.ebuild b/gnome-base/gvfs/gvfs-1.12.0.ebuild
index 460eeb00068c..7b634fcded28 100644
--- a/gnome-base/gvfs/gvfs-1.12.0.ebuild
+++ b/gnome-base/gvfs/gvfs-1.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.0.ebuild,v 1.3 2012/04/12 09:24:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.0.ebuild,v 1.4 2012/04/13 04:08:52 tetromino Exp $
 
 EAPI=4
 GCONF_DEBUG=no
@@ -110,6 +110,9 @@ src_prepare() {
 	# bug #410411, https://bugzilla.gnome.org/show_bug.cgi?id=672693
 	use ios && epatch "${FILESDIR}/${PN}-1.10.1-libimobiledevice-1.1.2.patch"
 
+	# For gcc-4.5 and USE=afp, https://bugzilla.gnome.org/show_bug.cgi?id=672708
+	epatch "${FILESDIR}/${PN}-1.12.0-afp-gcc-4.5.patch"
+
 	if use gphoto2 || use archive || use prefix || use ios; then
 		# libgcrypt.m4 needed for eautoreconf, bug #399043
 		mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die