- Fix for gcc 4.0 build

f38
David Zeuthen 20 years ago
parent 3a7c20eb60
commit f7e44eb6b4

@ -0,0 +1,11 @@
--- libgnomevfs/gnome-vfs-handle.c.orig 2005-03-07 20:34:58.000000000 -0500
+++ libgnomevfs/gnome-vfs-handle.c 2005-03-07 20:40:01.000000000 -0500
@@ -129,6 +129,8 @@ _gnome_vfs_handle_do_read (GnomeVFSHandl
GnomeVFSFileSize *bytes_read,
GnomeVFSContext *context)
{
+/* workaround to build to build with gcc 4.0 */
+#undef read
INVOKE_AND_RETURN (handle, read, (handle->uri->method, handle->method_handle,
buffer, num_bytes, bytes_read,
context));

@ -9,7 +9,7 @@
Summary: The GNOME virtual file-system libraries.
Name: gnome-vfs2
Version: 2.9.91
Release: 5
Release: 6
License: LGPL
Group: System Environment/Libraries
Source0: gnome-vfs-%{version}.tar.bz2
@ -57,6 +57,9 @@ Patch201: gnome-vfs-2.8.1-console-mount-opt.patch
# send to upstream
Patch202: gnome-vfs-2.9.91-hal-api-2.patch
# possible gcc4 bug
Patch300: gnome-vfs-2.9.91-fix-gcc4-build.patch
%description
GNOME VFS is the GNOME virtual file system. It is the foundation of
the Nautilus file manager. It provides a modular architecture and
@ -110,6 +113,8 @@ cp -f %{SOURCE1} modules
#send to upstream
%patch202 -p0 -b .hal-api2
%patch300 -p0 -b .gcc4-build
%build
# needed for patch6 (changing makefile to old vfolder backend)
@ -190,6 +195,9 @@ done
%config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
%changelog
* Mon Mar 7 2005 David Zeuthen <davidz@redhat.com> - 2.9.91-6
- Fix for gcc 4.0 build
* Mon Mar 7 2005 David Zeuthen <davidz@redhat.com> - 2.9.91-5
- Build with patch for new hal/dbus API's - require hal-devel >= 0.5.0

Loading…
Cancel
Save