rpms/fontconfig/FC-5 fontconfig-2.3.95-ttf-collections.patch, NONE, 1.1 fontconfig-2.4-cmap-parsing.patch, NONE, 1.1 fontconfig.spec, 1.72, 1.73

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/fontconfig/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18987

Modified Files:
	fontconfig.spec 
Added Files:
	fontconfig-2.3.95-ttf-collections.patch 
	fontconfig-2.4-cmap-parsing.patch 
Log Message:
fix ttf font collections


fontconfig-2.3.95-ttf-collections.patch:
 ftglue.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fontconfig-2.3.95-ttf-collections.patch ---
--- fontconfig-2.3.95/src/ftglue.c.ttf-collections	2006-06-02 12:31:02.000000000 -0400
+++ fontconfig-2.3.95/src/ftglue.c	2006-06-02 12:31:38.000000000 -0400
@@ -290,7 +290,7 @@
       if ( tag == the_tag )
       {
         LOG(( "TrueType table (start: %ld) (size: %ld)\n", start, size ));
-        error = ftglue_stream_seek( stream, offset+start );
+        error = ftglue_stream_seek( stream, start );
         goto FoundIt;
       }
     }

fontconfig-2.4-cmap-parsing.patch:
 fcfreetype.c |   38 ++++++++------------------------------
 1 files changed, 8 insertions(+), 30 deletions(-)

--- NEW FILE fontconfig-2.4-cmap-parsing.patch ---
--- fontconfig-2.3.95/src/fcfreetype.c.cmap-parsing	2006-04-25 11:31:41.000000000 -0400
+++ fontconfig-2.3.95/src/fcfreetype.c	2006-05-18 08:14:09.000000000 -0400
@@ -2511,31 +2511,12 @@
 	}
 	else
 	{
-	    FT_UInt gindex;
-	  
-	    /*
-	     * Find the first encoded character in the font
-	     */
-	    if (FT_Get_Char_Index (face, 0))
+            page = ~0;
+            leaf = NULL;
+            ucs4 = FT_Get_First_Char (face, &glyph);
+            while (glyph != 0)
 	    {
-		ucs4 = 0;
-		gindex = 1;
-	    }
-	    else
-	    {
-		ucs4 = FT_Get_Next_Char (face, 0, &gindex);
-		if (!ucs4)
-		    gindex = 0;
-	    }
-
-	    while (gindex)
-	    {
-		page = ucs4 >> 8;
-		leaf = 0;
-		while ((ucs4 >> 8) == page)
-		{
-		    glyph = FT_Get_Char_Index (face, ucs4);
-		    if (glyph && FcFreeTypeCheckGlyph (face, ucs4, 
+                if (FcFreeTypeCheckGlyph (face, ucs4,
 						       glyph, blanks, &advance))
 		    {
 			if (advance)
@@ -2558,8 +2539,9 @@
 			    }
 			}
 
-			if (!leaf)
+                    if ((ucs4 >> 8) != page)
 			{
+                        page = (ucs4 >> 8);
 			    leaf = FcCharSetFindLeafCreate (fcs, ucs4);
 			    if (!leaf)
 				goto bail1;
@@ -2571,11 +2553,7 @@
 			    font_max = ucs4;
 #endif
 		    }
-		    ucs4++;
-		}
-		ucs4 = FT_Get_Next_Char (face, ucs4 - 1, &gindex);
-		if (!ucs4)
-		    gindex = 0;
+                ucs4 = FT_Get_Next_Char (face, ucs4, &glyph);
 	    }
 #ifdef CHECK
 	    for (ucs4 = 0; ucs4 < 0x10000; ucs4++)


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/FC-5/fontconfig.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- fontconfig.spec	24 Feb 2006 20:33:50 -0000	1.72
+++ fontconfig.spec	2 Jun 2006 17:08:39 -0000	1.73
@@ -3,7 +3,7 @@
 Summary: Font configuration and customization library
 Name: fontconfig
 Version: 2.3.94
-Release: 1
+Release: 1.fc5.1
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -14,6 +14,8 @@
 
 Patch1: fontconfig-2.3.93-defaultconfig.patch
 Patch2: fontconfig-2.3.93.cvs20060211-move-user-cache.patch
+Patch3: fontconfig-2.4-cmap-parsing.patch
+Patch4: fontconfig-2.3.95-ttf-collections.patch
 
 BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: expat-devel
@@ -51,6 +53,8 @@
 
 %patch1 -p1 -b .defaultconfig
 %patch2 -p1 -b .move-user-cache
+%patch3 -p1 -b .cmap-parsing
+%patch4 -p1 -b .ttf-collections
 
 %build
 %configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/OTF
@@ -135,6 +139,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Jun  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.94-1.fc5.1
+- Fix the handling of TTF font collections
+- Apply a patch by David Turner to speed up cache generation
+
 * Fri Feb 24 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.94-1
 - Update to 2.3.94