Added a patch to enable the Trash on afs, see bug #106118 and the linked upstream bug for more.

Package-Manager: portage-2.0.52-r1

4 files changed, 30 insertions, 10 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index c3580019d974..f075f73d19d5 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.172 2005/09/11 14:09:40 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.173 2005/09/18 04:45:38 obz Exp $
+
+  18 Sep 2005; Mike Gardiner <obz@gentoo.org>
+  +files/gnome-vfs-2.12.0-afs.patch, gnome-vfs-2.12.0.ebuild:
+  Added a patch to enable the Trash on afs, see bug #106118 and the linked
+  upstream bug for more.
 
   11 Sep 2005; Stefan Jones <cretin@gentoo.org> gnome-vfs-2.12.0.ebuild:
   gnome-vfs-2.12.0 requires orbit-2.12.4 for ORBIT2_MAYBE_CONST
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index e1071ad6719d..2a49bd41772f 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -1,24 +1,25 @@
-MD5 3b52eb6a822239a936ef34dd6378304e ChangeLog 20887
-MD5 612df39031e5ec477378d939a230b65d gnome-vfs-2.12.0.ebuild 2173
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 80bcbaf31457e69c4cd082b8d8901a01 ChangeLog 21093
 MD5 ed7cf04e9deeacff0d7c7848a5985556 gnome-vfs-1.0.5-r4.ebuild 2122
 MD5 5132b08cb3537e4dafe6ba71089bd860 gnome-vfs-2.10.0-r2.ebuild 2045
 MD5 3c45ff88a98f07a31775b98dfdfd088b gnome-vfs-2.10.1-r1.ebuild 2050
 MD5 797c3f2f37f7affb981d0d312d1ef77a gnome-vfs-2.10.1-r2.ebuild 2245
+MD5 c6bae904b47c3a71e8f240ec045cf9d3 gnome-vfs-2.12.0.ebuild 2253
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 a88e201c8f2ec5444db0bea2e8c302b4 files/digest-gnome-vfs-1.0.5-r4 68
 MD5 2bebfc7d172b325dc37efef679cbf545 files/digest-gnome-vfs-2.10.0-r2 70
 MD5 d20a2ead9fd45768a182fe24423b0842 files/digest-gnome-vfs-2.10.1-r1 70
 MD5 d20a2ead9fd45768a182fe24423b0842 files/digest-gnome-vfs-2.10.1-r2 70
+MD5 dbec1dde5ae7ceff453e73af55af1d2c files/digest-gnome-vfs-2.12.0 70
 MD5 ba8ad5c040af8bd498c9ec71ac1df40e files/gnome-vfs-2-CAN-2005-0706.patch 490
-MD5 c599d081cb908d1fe6851ab69d80a7fa files/gnome-vfs-2.10.1-fbsd.patch 1505
 MD5 c4482dd33a470e671d27a00eb8fbe044 files/gnome-vfs-2.10.1-date_time_stamp.patch 2297
+MD5 c599d081cb908d1fe6851ab69d80a7fa files/gnome-vfs-2.10.1-fbsd.patch 1505
 MD5 75d0133c9ee4ef3355b25dad13c6cd9a files/gnome-vfs-2.10.1-samba-close_fn.patch 1895
 MD5 6aa77e036ebb110dad9bc8244c3a7081 files/gnome-vfs-2.11.92-fbsd.patch 1036
 MD5 aa105582688e7798d87c46739348cfad files/gnome-vfs-2.11.92-samba-close_fn.patch 1901
 MD5 09f0fab6d414a859d0f979bef3e10dfb files/gnome-vfs-2.8.3-reiser4_support.patch 710
-MD5 dbec1dde5ae7ceff453e73af55af1d2c files/digest-gnome-vfs-2.12.0 70
-MD5 7320d4ac9d4f99766075061daa53ea63 files/1.0/gnome-vfs-1.0.5-gtkdoc_fixes.patch 4892
-MD5 25d42b1a4cf935fbedd3465bc4a8dd7c files/1.0/gnome-vfs-1.0.5-proxy.patch 2863
-MD5 2ae3110a6e6fb30cfa593e4210535dc2 files/1.0/gnome-vfs-1.0.5-gcc3.4.patch 837
+MD5 59ad154c6254211757fde7973afffc14 files/gnome-vfs-2.12.0-afs.patch 663
 MD5 4072a11c3c98c493cbc0bb851176fb44 files/1.0/gnome-vfs-1.0.5-codeset.patch 1762
 MD5 071edd844b13f596a2f7d986b4512521 files/1.0/gnome-vfs-1.0.5-fix-segfault.patch 430
+MD5 2ae3110a6e6fb30cfa593e4210535dc2 files/1.0/gnome-vfs-1.0.5-gcc3.4.patch 837
+MD5 7320d4ac9d4f99766075061daa53ea63 files/1.0/gnome-vfs-1.0.5-gtkdoc_fixes.patch 4892
+MD5 25d42b1a4cf935fbedd3465bc4a8dd7c files/1.0/gnome-vfs-1.0.5-proxy.patch 2863
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch
new file mode 100644
index 000000000000..cdc88c24b6a3
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch
@@ -0,0 +1,12 @@
+diff -ur gnome-vfs-2.12.0/libgnomevfs/gnome-vfs-filesystem-type.c gnome-vfs-2.12.0-patched/libgnomevfs/gnome-vfs-filesystem-type.c
+--- gnome-vfs-2.12.0/libgnomevfs/gnome-vfs-filesystem-type.c	2005-08-23 01:34:36.000000000 +0800
++++ gnome-vfs-2.12.0-patched/libgnomevfs/gnome-vfs-filesystem-type.c	2005-09-18 20:30:47.000000000 +0800
+@@ -35,7 +35,7 @@
+ 
+ static struct FSInfo fs_data[] = {
+ 	{ "affs"     , N_("AFFS Volume"), 0},
+-	{ "afs"      , N_("AFS Network Volume"), 0 },
++	{ "afs"      , N_("AFS Network Volume"), 1 },
+ 	{ "auto"     , N_("Auto-detected Volume"), 0 },
+ 	{ "cd9660"   , N_("CD-ROM Drive"), 0 },
+ 	{ "cdda"     , N_("CD Digital Audio"), 0 },
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.12.0.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.12.0.ebuild
index 894739f94202..cab273977648 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.12.0.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.12.0.ebuild,v 1.3 2005/09/11 14:09:40 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.12.0.ebuild,v 1.4 2005/09/18 04:45:38 obz Exp $
 
 inherit gnome2 eutils
 
@@ -72,6 +72,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.11.92-fbsd.patch
 	# Fix for API breakage in samba 3.0.20 (#104531)
 	epatch ${FILESDIR}/${PN}-2.11.92-samba-close_fn.patch
+	# Allow the Trash on afs filesystems (#106118)
+	epatch ${FILESDIR}/${P}-afs.patch
 
 	autoconf || die "autoconf failed"
 }