Fix mime cache handling

f38
Matthias Clasen 19 years ago
parent 8811a328a3
commit da435e41f4

@ -0,0 +1,22 @@
--- gnome-vfs-2.12.1.1/libgnomevfs/xdgmimecache.c.mimecache 2005-04-17 06:37:34.000000000 -0400
+++ gnome-vfs-2.12.1.1/libgnomevfs/xdgmimecache.c 2005-10-19 08:19:13.000000000 -0400
@@ -175,8 +175,8 @@
{
for (j = 0; j < data_length; j++)
{
- if ((cache->buffer[data_offset + j] & cache->buffer[mask_offset + j]) !=
- ((((unsigned char *) data)[j + i]) & cache->buffer[mask_offset + j]))
+ if ((((unsigned char *)cache->buffer)[data_offset + j] & ((unsigned char *)cache->buffer)[mask_offset + j]) !=
+ ((((unsigned char *) data)[j + i]) & ((unsigned char *)cache->buffer)[mask_offset + j]))
{
valid_matchlet = FALSE;
break;
@@ -187,7 +187,7 @@
{
for (j = 0; j < data_length; j++)
{
- if (cache->buffer[data_offset + j] != ((unsigned char *) data)[j + i])
+ if (((unsigned char *)cache->buffer)[data_offset + j] != ((unsigned char *) data)[j + i])
{
valid_matchlet = FALSE;
break;

@ -9,7 +9,7 @@
Summary: The GNOME virtual file-system libraries. Summary: The GNOME virtual file-system libraries.
Name: gnome-vfs2 Name: gnome-vfs2
Version: 2.12.1.1 Version: 2.12.1.1
Release: 1 Release: 2
License: LGPL License: LGPL
Group: System Environment/Libraries Group: System Environment/Libraries
Source0: gnome-vfs-%{version}.tar.bz2 Source0: gnome-vfs-%{version}.tar.bz2
@ -48,6 +48,9 @@ Patch201: gnome-vfs-2.8.1-console-mount-opt.patch
# Bug 150132 # Bug 150132
Patch400: neon-0.24.7-gssapi.patch Patch400: neon-0.24.7-gssapi.patch
# fixed upstream
Patch500: gnome-vfs-2.12.1.1-mimecache.patch
%description %description
GNOME VFS is the GNOME virtual file system. It is the foundation of GNOME VFS is the GNOME virtual file system. It is the foundation of
the Nautilus file manager. It provides a modular architecture and the Nautilus file manager. It provides a modular architecture and
@ -93,6 +96,7 @@ shares (SMB) to applications using GNOME VFS.
%patch201 -p0 -b .console %patch201 -p0 -b .console
%patch400 -p0 -b .neon-gssapi %patch400 -p0 -b .neon-gssapi
%patch500 -p0 -b .mimecache
%build %build
@ -171,6 +175,9 @@ done
%config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
%changelog %changelog
* Wed Oct 19 2005 Matthias Clasen <mclasen@redhat.com> 2.12.1.1-2
- Fix the cache handling in xdgmime
* Thu Oct 6 2005 Matthias Clasen <mclasen@redhat.com> 2.12.1.1-1 * Thu Oct 6 2005 Matthias Clasen <mclasen@redhat.com> 2.12.1.1-1
- Update to 2.12.1.1 - Update to 2.12.1.1
- Drop upstreamed patches - Drop upstreamed patches

Loading…
Cancel
Save