rpms/gtk2/devel gtk+-2.8.6-mimecache.patch, NONE, 1.1 Makefile, 1.1, 1.2 gtk2.spec, 1.95, 1.96

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12209

Modified Files:
	Makefile gtk2.spec 
Added Files:
	gtk+-2.8.6-mimecache.patch 
Log Message:
Fix mime cache handling


gtk+-2.8.6-mimecache.patch:
 xdgmimecache.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE gtk+-2.8.6-mimecache.patch ---
--- gtk+-2.8.6/gtk/xdgmime/xdgmimecache.c.mimecache	2005-10-19 08:01:25.000000000 -0400
+++ gtk+-2.8.6/gtk/xdgmime/xdgmimecache.c	2005-10-19 08:03:17.000000000 -0400
@@ -176,8 +176,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;
@@ -188,7 +188,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;
@@ -296,7 +296,7 @@
   for (i = 0; _caches[i]; i++)
     {
       XdgMimeCache *cache = _caches[i];
-      xdg_uint32_t list_offset = GET_UINT32 (cache->buffer, 4 );
+      xdg_uint32_t list_offset = GET_UINT32 (cache->buffer, 4);
       xdg_uint32_t n_entries = GET_UINT32 (cache->buffer, list_offset);
       xdg_uint32_t offset;
 




Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- gtk2.spec	5 Oct 2005 14:19:16 -0000	1.95
+++ gtk2.spec	19 Oct 2005 12:08:00 -0000	1.96
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
 Name: gtk2
 Version: %{base_version}
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -24,6 +24,8 @@
 
 # Biarch changes
 Patch0: gtk+-2.4.1-lib64.patch
+# Fixed in 2.8.7
+Patch1: gtk+-2.8.6-mimecache.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -83,6 +85,7 @@
 (cd .. && tar xzf %{SOURCE1})
 
 %patch0 -p1 -b .lib64
+%patch1 -p1 -b .mimecache
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -251,6 +254,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Wed Oct 19 2005 Matthias Clasen <mclasen at redhat.com> 2.8.6-2
+- Sync to upstream xdgmime
+
 * Wed Oct  5 2005 Matthias Clasen <mclasen at redhat.com> 2.8.6-1
 - New upstream version