Index: util/makefile.mk
===================================================================
RCS file: /cvs/gsl/vcl/util/makefile.mk,v
retrieving revision 1.82
diff -u -r1.82 makefile.mk
--- util/makefile.mk	6 Oct 2006 10:07:49 -0000	1.82
+++ util/makefile.mk	30 Nov 2006 11:27:31 -0000
@@ -181,7 +181,7 @@
 
 .IF "$(USE_BUILTIN_RASTERIZER)"!=""
     LIB1FILES +=    $(SLB)$/glyphs.lib
-    SHL1STDLIBS+=   $(FREETYPELIB)
+    SHL1STDLIBS+=   $(FREETYPELIB) -lfontconfig
 .ENDIF # USE_BUILTIN_RASTERIZER
 
 SHL1LIBS=   $(LIB1TARGET)
Index: source/glyphs/gcach_ftyp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.cxx,v
retrieving revision 1.133.2.3
diff -u -r1.133.2.3 gcach_ftyp.cxx
--- source/glyphs/gcach_ftyp.cxx	13 Nov 2006 09:58:00 -0000	1.133.2.3
+++ source/glyphs/gcach_ftyp.cxx	30 Nov 2006 11:27:54 -0000
@@ -59,6 +60,8 @@
 #include FT_TRUETYPE_TABLES_H
 #include FT_TRUETYPE_TAGS_H
 #include FT_TRUETYPE_IDS_H
+#include <fontconfig/fontconfig.h>
+#include <fontconfig/fcfreetype.h>
 
 #ifndef FT_RENDER_MODE_MONO  // happens in the MACOSX build
     #define FT_RENDER_MODE_MONO ft_render_mode_mono
@@ -1145,6 +1187,10 @@
             // check if symbol aliasing helps
             if( (aChar <= 0x00FF) && mpFontInfo->IsSymbolFont() )
                 nGlyphIndex = FT_Get_Char_Index( maFaceFT, aChar | 0xF000 );
+
+	    // Finally try the postscript name table
+	    if (!nGlyphIndex)
+		nGlyphIndex = FcFreeTypeCharIndex( maFaceFT, aChar );
         }
         mpFontInfo->CacheGlyphIndex( aChar, nGlyphIndex );
     }