rpms/openoffice.org/devel openoffice.org-1.9.104-use-fontconfig-everywhere.patch, 1.17, 1.18
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Sep 12 16:22:39 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6709
Modified Files:
openoffice.org-1.9.104-use-fontconfig-everywhere.patch
Log Message:
fix patch
openoffice.org-1.9.104-use-fontconfig-everywhere.patch:
fontmanager/fontcache.cxx | 2
fontmanager/fontconfig.cxx | 268 ++++++++++++++++++++++-------
fontmanager/fontmanager.cxx | 9 -
inc/psprint/fontmanager.hxx | 0
psprint/fontmanager.hxx | 13 +
source/fontmanager/fontcache.cxx | 0
source/fontmanager/fontconfig.cxx | 0
source/fontmanager/fontmanager.cxx | 0
vcl/inc/outdev.h | 3
vcl/inc/outfont.hxx | 15 +
vcl/source/gdi/outdev3.cxx | 333 +++++++++++++++++++++++++++----------
vcl/source/window/window.cxx | 5
vcl/util/makefile.mk | 2
13 files changed, 487 insertions(+), 163 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- openoffice.org-1.9.104-use-fontconfig-everywhere.patch 12 Sep 2005 16:05:13 -0000 1.17
+++ openoffice.org-1.9.104-use-fontconfig-everywhere.patch 12 Sep 2005 16:22:36 -0000 1.18
@@ -500,9 +500,13 @@
.ENDIF # "$(GUI)"=="UNX"
-diff -ru psprint.preconfig/inc/psprint/fontmanager.hxx psprint/inc/psprint/fontmanager.hxx
---- openoffice.org.orig/psprint/inc/psprint/fontmanager.hxx 2005-09-12 13:41:25.000000000 +0100
-+++ openoffice.org/psprint/inc/psprint/fontmanager.hxx 2005-09-12 15:43:49.000000000 +0100
+Index: inc/psprint/fontmanager.hxx
+===================================================================
+RCS file: /cvs/gsl/psprint/inc/psprint/fontmanager.hxx,v
+retrieving revision 1.24
+diff -u -r1.24 fontmanager.hxx
+--- openoffice.org.orig/psprint/uinc/psprint/fontmanager.hxx 5 Aug 2005 13:21:02 -0000 1.24
++++ openoffice.org/psprint/inc/psprint/fontmanager.hxx 12 Sep 2005 16:21:13 -0000
@@ -75,6 +75,9 @@
#ifndef _PSPRINT_HELPER_HXX_
#include <psprint/helper.hxx>
@@ -513,7 +517,7 @@
#ifndef _COM_SUN_STAR_LANG_LOCALE_HPP_
#include <com/sun/star/lang/Locale.hpp>
-@@ -421,6 +424,7 @@
+@@ -419,6 +422,7 @@
std::hash_multimap< sal_uInt8, sal_Unicode > m_aAdobecodeToUnicode;
mutable FontCache* m_pFontCache;
@@ -521,7 +525,7 @@
rtl::OString getAfmFile( PrintFont* pFont ) const;
rtl::OString getFontFile( PrintFont* pFont ) const;
-@@ -506,10 +510,10 @@
+@@ -504,10 +508,10 @@
const rtl::OUString& getPSName( fontID nFontID ) const;
// get a specific fonts style family
@@ -534,7 +538,7 @@
// get a specific fonts type
fonttype::type getFontType( fontID nFontID ) const
-@@ -731,6 +735,11 @@
+@@ -729,6 +733,11 @@
false else
*/
bool matchFont( FastPrintFontInfo& rInfo, const com::sun::star::lang::Locale& rLocale );
@@ -546,10 +550,14 @@
};
} // namespace
-diff -ru psprint.preconfig/source/fontmanager/fontcache.cxx psprint/source/fontmanager/fontcache.cxx
---- openoffice.org.orig/psprint/source/fontmanager/fontcache.cxx 2005-09-12 13:41:08.000000000 +0100
-+++ openoffice.org/psprint/source/fontmanager/fontcache.cxx 2005-09-12 13:43:06.000000000 +0100
-@@ -672,9 +672,9 @@
+Index: source/fontmanager/fontcache.cxx
+===================================================================
+RCS file: /cvs/gsl/psprint/source/fontmanager/fontcache.cxx,v
+retrieving revision 1.14
+diff -u -r1.14 fontcache.cxx
+--- openoffice.org.orig/psprint/usource/fontmanager/fontcache.cxx 9 Aug 2005 10:59:38 -0000 1.14
++++ openoffice.org/psprint/source/fontmanager/fontcache.cxx 12 Sep 2005 16:21:13 -0000
+@@ -688,9 +688,9 @@
FontDirMap::const_iterator entry = dir->second.m_aEntries.find( rFile );
if( entry != dir->second.m_aEntries.end() )
{
@@ -560,9 +568,13 @@
PrintFontManager::PrintFont* pFont = clonePrintFont( *font );
rNewFonts.push_back( pFont );
}
-diff -ru psprint.preconfig/source/fontmanager/fontconfig.cxx psprint/source/fontmanager/fontconfig.cxx
---- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx 2005-09-12 13:41:08.000000000 +0100
-+++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx 2005-09-12 16:13:09.000000000 +0100
+Index: source/fontmanager/fontconfig.cxx
+===================================================================
+RCS file: /cvs/gsl/psprint/source/fontmanager/fontconfig.cxx,v
+retrieving revision 1.9
+diff -u -r1.9 fontconfig.cxx
+--- openoffice.org.orig/psprint/usource/fontmanager/fontconfig.cxx 9 Aug 2005 10:59:52 -0000 1.9
++++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx 12 Sep 2005 16:21:14 -0000
@@ -70,10 +70,12 @@
typedef void FcObjectSet;
typedef void FcPattern;
@@ -777,10 +789,11 @@
if( m_pLib )
osl_unloadModule( m_pLib );
}
-@@ -346,19 +418,10 @@
+@@ -345,18 +417,7 @@
+ if( ! rWrapper.isValid() )
return false;
- FcConfig* pConfig = rWrapper.getDefConfig();
+- FcConfig* pConfig = rWrapper.getDefConfig();
- FcObjectSet* pOSet = rWrapper.FcObjectSetBuild( FC_FAMILY,
- FC_STYLE,
- FC_SLANT,
@@ -792,14 +805,11 @@
- (void *) NULL );
- FcPattern* pPattern = rWrapper.FcPatternCreate();
- FcFontSet* pFSet = rWrapper.FcFontList( pConfig, pPattern, pOSet );
- rtl_TextEncoding aThreadTextEncoding = osl_getThreadTextEncoding();
-
+ FcFontSet* pFSet = rWrapper.getFontSet();
-+
+
if( pFSet )
{
- #if OSL_DEBUG_LEVEL > 1
-@@ -400,6 +463,8 @@
+@@ -399,6 +460,8 @@
);
#endif
@@ -808,7 +818,7 @@
// only outline fonts are usable to psprint anyway
if( eOutRes == FcResultMatch && ! outline )
continue;
-@@ -542,14 +607,6 @@
+@@ -537,14 +600,6 @@
}
}
@@ -823,7 +833,7 @@
// how does one get rid of the config ?
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "inserted %d fonts from fontconfig\n", nFonts );
-@@ -563,39 +620,14 @@
+@@ -558,39 +613,14 @@
FontCfgWrapper::release();
}
@@ -867,7 +877,7 @@
{
case italic::Italic: nSlant = FC_SLANT_ITALIC;break;
case italic::Oblique: nSlant = FC_SLANT_OBLIQUE;break;
-@@ -604,10 +636,10 @@
+@@ -599,10 +629,10 @@
}
rWrapper.FcPatternAddInteger( pPattern, FC_SLANT, nSlant );
}
@@ -880,7 +890,7 @@
{
case weight::Thin: nWeight = FC_WEIGHT_THIN;break;
case weight::UltraLight: nWeight = FC_WEIGHT_ULTRALIGHT;break;
-@@ -624,10 +656,10 @@
+@@ -619,10 +649,10 @@
}
rWrapper.FcPatternAddInteger( pPattern, FC_WEIGHT, nWeight );
}
@@ -893,7 +903,7 @@
{
case width::UltraCondensed: nWidth = FC_WIDTH_ULTRACONDENSED;break;
case width::ExtraCondensed: nWidth = FC_WIDTH_EXTRACONDENSED;break;
-@@ -643,10 +675,10 @@
+@@ -638,10 +668,10 @@
}
rWrapper.FcPatternAddInteger( pPattern, FC_WIDTH, nWidth );
}
@@ -906,13 +916,13 @@
{
case pitch::Fixed: nSpacing = FC_MONO;break;
case pitch::Variable: nSpacing = FC_PROPORTIONAL;break;
-@@ -654,12 +686,122 @@
+@@ -649,12 +679,122 @@
break;
}
rWrapper.FcPatternAddInteger( pPattern, FC_SPACING, nSpacing );
+ if (nSpacing == FC_MONO)
+ rWrapper.FcPatternAddString( pPattern, FC_FAMILY, (FcChar8*)"monospace");
-+ }
+ }
+#endif
+}
+
@@ -971,8 +981,8 @@
+ // info: destroying the pSet destroys pResult implicitly
+ // since pResult was "added" to pSet
+ rWrapper.FcFontSetAdd( pSet, pResult );
- }
-
++ }
++
+ if( pSet )
+ {
+ if( pSet->nfont > 0 )
@@ -1020,7 +1030,7 @@
+ rWrapper.FcPatternAddString( pPattern, FC_FAMILY, (FcChar8*)aFamily.getStr() );
+
+ addtopattern(rWrapper, pPattern, rInfo.m_eItalic, rInfo.m_eWeight, rInfo.m_eWidth, rInfo.m_ePitch);
-+
+
rWrapper.FcConfigSubstitute( pConfig, pPattern, FcMatchPattern );
rWrapper.FcDefaultSubstitute( pPattern );
FcResult eResult = FcResultNoMatch;
@@ -1030,10 +1040,14 @@
bool bSuccess = false;
if( pResult )
{
-diff -ru psprint.preconfig/source/fontmanager/fontmanager.cxx psprint/source/fontmanager/fontmanager.cxx
---- openoffice.org.orig/psprint/source/fontmanager/fontmanager.cxx 2005-09-12 13:41:08.000000000 +0100
-+++ openoffice.org/psprint/source/fontmanager/fontmanager.cxx 2005-09-12 15:21:47.000000000 +0100
-@@ -1181,7 +1181,8 @@
+Index: source/fontmanager/fontmanager.cxx
+===================================================================
+RCS file: /cvs/gsl/psprint/source/fontmanager/fontmanager.cxx,v
+retrieving revision 1.59
+diff -u -r1.59 fontmanager.cxx
+--- openoffice.org.orig/psprint/usource/fontmanager/fontmanager.cxx 5 Aug 2005 12:53:31 -0000 1.59
++++ openoffice.org/psprint/source/fontmanager/fontmanager.cxx 12 Sep 2005 16:21:14 -0000
+@@ -1177,7 +1177,8 @@
m_nNextFontID( 1 ),
m_pAtoms( new MultiAtomProvider() ),
m_nNextDirAtom( 1 ),
@@ -1043,7 +1057,7 @@
{
for( unsigned int i = 0; i < sizeof( aAdobeCodes )/sizeof( aAdobeCodes[0] ); i++ )
{
-@@ -2135,7 +2136,7 @@
+@@ -2129,7 +2130,7 @@
#endif
// first try fontconfig
@@ -1052,7 +1066,7 @@
// part one - look for downloadable fonts
rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
-@@ -2157,7 +2158,7 @@
+@@ -2151,7 +2152,7 @@
}
// don't search through many directories fontconfig already told us about
@@ -1061,7 +1075,7 @@
{
Display *pDisplay = (Display*)pInitDisplay;
-@@ -2235,7 +2236,7 @@
+@@ -2229,7 +2230,7 @@
}
}
#endif /* SOLARIS */
More information about the fedora-cvs-commits
mailing list