rpms/openoffice.org/devel openoffice.org-1.9.104-use-fontconfig-everywhere.patch, 1.3, 1.4 openoffice.org.spec, 1.237, 1.238 openoffice.org-1.9.103.oooXXXXX.installation.disable-epm.fix.patch, 1.3, NONE

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.104-use-fontconfig-everywhere.patch 
	openoffice.org.spec 
Removed Files:
	openoffice.org-1.9.103.oooXXXXX.installation.disable-epm.fix.patch 
Log Message:
rh#160302# skip fontconfig for symbol fonts

openoffice.org-1.9.104-use-fontconfig-everywhere.patch:
 psprint/source/fontmanager/fontcache.cxx |    2 
 vcl/inc/outdev.h                         |    3 
 vcl/inc/outfont.hxx                      |   15 +
 vcl/source/gdi/outdev3.cxx               |  401 ++++++++++++++++++++++++-------
 vcl/util/makefile.mk                     |    2 
 5 files changed, 333 insertions(+), 90 deletions(-)

Index: openoffice.org-1.9.104-use-fontconfig-everywhere.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.104-use-fontconfig-everywhere.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-1.9.104-use-fontconfig-everywhere.patch	27 May 2005 14:37:24 -0000	1.3
+++ openoffice.org-1.9.104-use-fontconfig-everywhere.patch	15 Jun 2005 13:33:23 -0000	1.4
@@ -60,7 +60,7 @@
  // =======================================================================
  
  DBG_NAMEEX( OutputDevice );
-@@ -2668,6 +2671,175 @@
+@@ -2668,6 +2671,178 @@
      }
  }
  
@@ -207,6 +207,9 @@
 +
 +ImplDevFontListData *ImplDevFontList::ImplGetFontconfigSubstitute( ImplFontSelectData *pFontSelData, ImplFontSubstEntry* pDevSpecific )
 +{
++    // We dont' actually want to talk to Fontconfig at all for symbol fonts
++    if (pFontSelData->IsSymbolFont())
++        return NULL;
 +    ImplDevFontListData *pFontFamily = NULL;
 +    FcFontSet* pSet = NULL;
 +


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- openoffice.org.spec	14 Jun 2005 23:41:08 -0000	1.237
+++ openoffice.org.spec	15 Jun 2005 13:33:23 -0000	1.238
@@ -1,5 +1,5 @@
 %define ooo2ver 109
-%define ooo_rpm_release 5
+%define ooo_rpm_release 6
 %define build_fc4 0
 %define build_fc5 1
 
@@ -2573,6 +2573,7 @@
 %changelog
 * Wed Jun 14 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.109-6
 - drop unnecessary Require
+- rh#160302# skip fontconfig for symbol font processing
 
 * Tue Jun 14 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.109-5
 - drop unnecessary openoffice.org-1.9.103.oooXXXXX.installation.disable-epm.fix.patch


--- openoffice.org-1.9.103.oooXXXXX.installation.disable-epm.fix.patch DELETED ---