diff --git a/gnome-vfs-2.9.91-fix-gcc4-build.patch b/gnome-vfs-2.9.91-fix-gcc4-build.patch index c1c7cae..ae30cc6 100644 --- a/gnome-vfs-2.9.91-fix-gcc4-build.patch +++ b/gnome-vfs-2.9.91-fix-gcc4-build.patch @@ -9,3 +9,23 @@ INVOKE_AND_RETURN (handle, read, (handle->uri->method, handle->method_handle, buffer, num_bytes, bytes_read, context)); +--- modules/translate-method.c.orig 2005-03-07 21:05:39.000000000 -0500 ++++ modules/translate-method.c 2005-03-07 21:06:25.000000000 -0500 +@@ -572,6 +572,7 @@ + GnomeVFSFileSize * bytes_read_return, GnomeVFSContext * context) + { + TranslateMethod *tm = (TranslateMethod *) method; ++#undef read + return tm->real_method->read(tm->real_method, method_handle, + buffer, num_bytes, bytes_read_return, + context); +--- modules/smb-method.c.orig 2005-03-07 21:11:06.000000000 -0500 ++++ modules/smb-method.c 2005-03-07 21:07:14.000000000 -0500 +@@ -1433,6 +1433,7 @@ + + /* Important: perform_authentication leaves and re-enters the lock! */ + while (perform_authentication (&actx) > 0) { ++#undef read + n = smb_context->read (smb_context, handle->file, buffer, num_bytes); + actx.res = (n >= 0) ? GNOME_VFS_OK : gnome_vfs_result_from_errno (); + } diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec index 41c3b71..adb9bb3 100644 --- a/gnome-vfs2.spec +++ b/gnome-vfs2.spec @@ -9,7 +9,7 @@ Summary: The GNOME virtual file-system libraries. Name: gnome-vfs2 Version: 2.9.91 -Release: 7 +Release: 8 License: LGPL Group: System Environment/Libraries Source0: gnome-vfs-%{version}.tar.bz2 @@ -195,6 +195,9 @@ done %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Mon Mar 7 2005 David Zeuthen - 2.9.91-8 +- More gcc 4.0 build fixes + * Mon Mar 7 2005 David Zeuthen - 2.9.91-7 - Rebuild