applying patch to fix bug 53075

4 files changed, 39 insertions, 5 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index e28d37e6bae6..f6620a72d645 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.105 2004/09/15 13:29:48 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.106 2004/09/17 22:13:54 morfic Exp $
+
+  17 Sep 2004; Daniel Goller <morfic@gentoo.org>
+  +files/1.0/gnome-vfs-1.0.5-gcc3.4.patch, gnome-vfs-1.0.5-r3.ebuild:
+  applying patch to close bug #53075
 
 *gnome-vfs-2.8.0 (15 Sep 2004)
 
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index d4b9967e2850..a1d6be75c080 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -2,9 +2,9 @@ MD5 8d2dab77b3ce6081125aca8cd297a3ab gnome-vfs-2.6.0.ebuild 1315
 MD5 38c1c3722f6f3174c951fb9e2f9a23d2 gnome-vfs-2.4.2-r1.ebuild 1049
 MD5 80dad5a0ab8a18445dc7ef2240ca5d1e gnome-vfs-2.6.2.ebuild 1760
 MD5 38f23893e0d8dec0b7f75f477937b84b gnome-vfs-2.6.1.1.ebuild 1759
-MD5 71e8a4ac243ac10eb5cd459595d1737e gnome-vfs-1.0.5-r3.ebuild 1747
+MD5 913e7d93a9752a67076f89b9c1f680e3 gnome-vfs-1.0.5-r3.ebuild 1939
 MD5 65aa64ed9f141da252ab60dc38e940fe gnome-vfs-2.8.0.ebuild 1939
-MD5 0b46bb16abd5d2004664dd805b3040c8 ChangeLog 12434
+MD5 205975bdfaefb0489172797dcebe9106 ChangeLog 12592
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 5decf8bb73287c8ce01500e5cd0ee463 files/digest-gnome-vfs-2.4.2-r1 69
 MD5 6126fab0b179eb680b819593f4bf1412 files/digest-gnome-vfs-2.6.1.1 71
@@ -14,5 +14,6 @@ MD5 b9a8c5cd605a7e483e1b93edee7155c0 files/digest-gnome-vfs-2.6.2 69
 MD5 f683e1d8f1cbe5aa1e53b36e57c857fc files/digest-gnome-vfs-2.8.0 69
 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 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
diff --git a/gnome-base/gnome-vfs/files/1.0/gnome-vfs-1.0.5-gcc3.4.patch b/gnome-base/gnome-vfs/files/1.0/gnome-vfs-1.0.5-gcc3.4.patch
new file mode 100644
index 000000000000..2e4da02c32a8
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/1.0/gnome-vfs-1.0.5-gcc3.4.patch
@@ -0,0 +1,22 @@
+---  gnome-vfs-1.0.5/libgnomevfs/gnome-vfs-private-utils.c	2001-07-16 13:21:07.000000000 -0500
++++  gnome-vfs-1.0.5/libgnomevfs/gnome-vfs-private-utils.c	2004-06-05 12:17:48.810517416 -0500
+@@ -263,7 +263,7 @@
+  * 
+  * Return value: 
+  **/
+-GnomeVFSProcessResult
++GnomeVFSProcessRunResult
+ gnome_vfs_process_run_cancellable (const gchar *file_name,
+ 				   const gchar * const argv[],
+ 				   GnomeVFSProcessOptions options,
+--- gnome-vfs-1.0.5/libgnomevfs/gnome-vfs-process.c	2001-07-16 13:21:07.000000000 -0500
++++ gnome-vfs-1.0.5/libgnomevfs/gnome-vfs-process.c	2004-06-05 12:17:37.643215104 -0500
+@@ -258,7 +258,7 @@
+  * 
+  * Return value: A numeric value reporting the result of the operation.
+  **/
+-GnomeVFSProcessRunResult
++GnomeVFSProcessResult
+ gnome_vfs_process_signal (GnomeVFSProcess *process,
+ 			  guint signal_number)
+ {
diff --git a/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild b/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild
index 2b5de8459f1c..ac00c396f883 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild,v 1.14 2004/06/24 21:58:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild,v 1.15 2004/09/17 22:13:54 morfic Exp $
 
 IUSE="doc ssl nls"
 
-inherit eutils libtool
+inherit eutils libtool gcc
 
 DESCRIPTION="GNOME Virtual File System."
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/${PN}/1.0/${P}.tar.gz"
@@ -45,6 +45,13 @@ src_unpack() {
 	# <azarah@gentoo.org> (2 Jan 2003).
 	epatch ${FILESDIR}/1.0/${P}-fix-segfault.patch
 
+	#apply both patches to compile with gcc-3.4 closing bug #53075
+	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
+	then
+		epatch ${FILESDIR}/1.0/${P}-gcc3.4.patch
+	fi
+
+
 	autoheader
 	aclocal -I /usr/share/aclocal/gnome-macros
 	autoconf