rpms/openoffice.org/devel openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch, NONE, 1.1 openoffice.org.spec, 1.959, 1.960

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1209

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch 
Log Message:
Resolves: rhbz#217813 openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch

openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch:
 source/glyphs/gcach_ftyp.cxx |    6 ++++++
 util/makefile.mk             |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch ---
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 );
     }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.959
retrieving revision 1.960
diff -u -r1.959 -r1.960
--- openoffice.org.spec	30 Nov 2006 08:20:51 -0000	1.959
+++ openoffice.org.spec	30 Nov 2006 11:57:08 -0000	1.960
@@ -1,6 +1,6 @@
 %define oootag OOE680
 %define ooomilestone 5
-%define rh_rpm_release 6
+%define rh_rpm_release 7
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -137,6 +137,7 @@
 Patch69: openoffice.org-2.1.0.ooo72058.vcl.dontalwaysaddunderline.patch
 Patch70: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch
 Patch71: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch72: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
 
 %define instdir %{_libdir}/openoffice.org2.1
 
@@ -1010,6 +1011,7 @@
 %patch69 -p1 -b .ooo72058.vcl.dontalwaysaddunderline.patch
 %patch70 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch
 %patch71 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch72 -p1 -b .ooo72129.vcl.fontglyphindex.patch
 
 %if %{langpacks}
 tar xzf %{SOURCE1}
@@ -2556,6 +2558,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu Nov 30 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-5.7
+- Resolves: rhbz#217813 openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
+
 * Wed Nov 29 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-5.6
 - relocate dictionaries