rpms/openoffice.org/F-9 openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch, 1.18, 1.19 openoffice.org.spec, 1.1472, 1.1473
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Wed Apr 23 07:23:28 UTC 2008
- Previous message (by thread): rpms/xorg-x11-server/F-9 xserver-1.5.0-glcore-swap-no-crashy.patch, NONE, 1.1 xorg-x11-server.spec, 1.327, 1.328
- Next message (by thread): rpms/claws-mail/F-7 .cvsignore, 1.17, 1.18 claws-mail.spec, 1.29, 1.30 sources, 1.17, 1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2745
Modified Files:
openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
openoffice.org.spec
Log Message:
Resolves: rhbz#443356 fontconfig gives different results for canonical font name vs localized font name
openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch:
Index: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 8 Jan 2008 14:51:50 -0000 1.18
+++ openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 23 Apr 2008 07:22:46 -0000 1.19
@@ -578,15 +578,24 @@
diff -ru psprint/source/fontmanager/fontconfig.cxx psprint/source/fontmanager/fontconfig.cxx
--- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx 2006-05-08 16:00:10.000000000 -0400
+++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx 2006-05-08 16:03:34.000000000 -0400
-@@ -106,6 +106,7 @@
- FcPattern* (*m_pFcFontSetMatch)(FcConfig*,FcFontSet**, int, FcPattern*,FcResult*);
+@@ -136,6 +136,7 @@
+ FcBool (*m_pFcConfigAppFontAddDir)(FcConfig*, const FcChar8*);
FcBool (*m_pFcConfigSubstitute)(FcConfig*,FcPattern*,FcMatchKind);
FcBool (*m_pFcPatternAddInteger)(FcPattern*,const char*,int);
+ FcBool (*m_pFcPatternAddDouble)(FcPattern*,const char*,double);
FcBool (*m_pFcPatternAddBool)(FcPattern*,const char*,FcBool);
FcBool (*m_pFcPatternAddCharSet)(FcPattern*,const char*,const FcCharSet*);
FcBool (*m_pFcPatternAddString)(FcPattern*,const char*,const FcChar8*);
-@@ -194,6 +195,8 @@
+@@ -183,7 +184,7 @@
+
+ void FcPatternDestroy( FcPattern* pPattern )
+ { m_pFcPatternDestroy( pPattern ); }
+-
++
+ FcFontSet* FcFontList( FcConfig* pConfig, FcPattern* pPattern, FcObjectSet* pSet )
+ { return m_pFcFontList( pConfig, pPattern, pSet ); }
+
+@@ -240,6 +241,8 @@
{ return m_pFcConfigSubstitute( pConfig, pPattern, eKind ); }
FcBool FcPatternAddInteger( FcPattern* pPattern, const char* pObject, int nValue )
{ return m_pFcPatternAddInteger( pPattern, pObject, nValue ); }
@@ -595,7 +604,18 @@
FcBool FcPatternAddString( FcPattern* pPattern, const char* pObject, const FcChar8* pString )
{ return m_pFcPatternAddString( pPattern, pObject, pString ); }
FcBool FcPatternAddBool( FcPattern* pPattern, const char* pObject, bool nValue )
-@@ -279,6 +282,8 @@
+@@ -251,7 +254,9 @@
+ { return m_pFcFreeTypeCharIndex ? m_pFcFreeTypeCharIndex( face, ucs4 ) : 0; }
+
+ public: // TODO: cleanup
+- std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aFontconfigNameToLocalized;
++ FcResult FamilyFromPattern(FcPattern* pPattern, FcChar8 **family);
++ std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aCanonicalToLocalized;
++ std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aLocalizedToCanonical;
+ };
+
+ oslGenericFunction FontCfgWrapper::loadSymbol( const char* pSymbol )
+@@ -341,6 +346,8 @@
loadSymbol( "FcConfigSubstitute" );
m_pFcPatternAddInteger = (FcBool(*)(FcPattern*,const char*,int))
loadSymbol( "FcPatternAddInteger" );
@@ -604,7 +624,7 @@
m_pFcPatternAddBool = (FcBool(*)(FcPattern*,const char*,FcBool))
loadSymbol( "FcPatternAddBool" );
m_pFcPatternAddCharSet = (FcBool(*)(FcPattern*,const char*,const FcCharSet *))
-@@ -308,6 +313,7 @@
+@@ -378,6 +385,7 @@
m_pFcDefaultSubstitute &&
m_pFcConfigSubstitute &&
m_pFcPatternAddInteger &&
@@ -612,7 +632,99 @@
m_pFcPatternAddCharSet &&
m_pFcPatternAddBool &&
m_pFcPatternAddString
-@@ -410,7 +416,7 @@
+@@ -512,54 +520,54 @@
+
+ return candidate;
+ }
++}
+
+-
+- FcResult lcl_FamilyFromPattern(FontCfgWrapper& rWrapper, FcPattern* pPattern, FcChar8 **family,
+- std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash > &aFontconfigNameToLocalized)
++FcResult FontCfgWrapper::FamilyFromPattern(FcPattern* pPattern, FcChar8 **family)
++{
++ FcChar8 *origfamily;
++ FcResult eFamilyRes = FcPatternGetString( pPattern, FC_FAMILY, 0, &origfamily );
++ *family = origfamily;
++
++ if( eFamilyRes == FcResultMatch)
+ {
+- FcChar8 *origfamily;
+- FcResult eFamilyRes = rWrapper.FcPatternGetString( pPattern, FC_FAMILY, 0, &origfamily );
+- *family = origfamily;
+-
+- if( eFamilyRes == FcResultMatch)
++ FcChar8* familylang = NULL;
++ if (FcPatternGetString( pPattern, FC_FAMILYLANG, 0, &familylang ) == FcResultMatch)
+ {
+- FcChar8* familylang = NULL;
+- if (rWrapper.FcPatternGetString( pPattern, FC_FAMILYLANG, 0, &familylang ) == FcResultMatch)
++ std::vector< lang_and_family > lang_and_families;
++ lang_and_families.push_back(lang_and_family(familylang, *family));
++ int k = 1;
++ while (1)
+ {
+- std::vector< lang_and_family > lang_and_families;
++ if (FcPatternGetString( pPattern, FC_FAMILYLANG, k, &familylang ) != FcResultMatch)
++ break;
++ if (FcPatternGetString( pPattern, FC_FAMILY, k, family ) != FcResultMatch)
++ break;
+ lang_and_families.push_back(lang_and_family(familylang, *family));
+- int k = 1;
+- while (1)
+- {
+- if (rWrapper.FcPatternGetString( pPattern, FC_FAMILYLANG, k, &familylang ) != FcResultMatch)
+- break;
+- if (rWrapper.FcPatternGetString( pPattern, FC_FAMILY, k, family ) != FcResultMatch)
+- break;
+- lang_and_families.push_back(lang_and_family(familylang, *family));
+- ++k;
+- }
+-
+- //possible to-do, sort by UILocale instead of process locale
+- rtl_Locale* pLoc;
+- osl_getProcessLocale(&pLoc);
+- localizedsorter aSorter(pLoc);
+- *family = aSorter.bestname(lang_and_families);
+-
+- std::vector<lang_and_family>::const_iterator aEnd = lang_and_families.end();
+- for (std::vector<lang_and_family>::const_iterator aIter = lang_and_families.begin(); aIter != aEnd; ++aIter)
+- {
+- const char *candidate = (const char*)(aIter->second);
+- if (rtl_str_compare(candidate, (const char*)(*family)) != 0)
+- aFontconfigNameToLocalized[OString(candidate)] = OString((const char*)(*family));
++ ++k;
++ }
++
++ //possible to-do, sort by UILocale instead of process locale
++ rtl_Locale* pLoc;
++ osl_getProcessLocale(&pLoc);
++ localizedsorter aSorter(pLoc);
++ *family = aSorter.bestname(lang_and_families);
++
++ std::vector<lang_and_family>::const_iterator aEnd = lang_and_families.end();
++ for (std::vector<lang_and_family>::const_iterator aIter = lang_and_families.begin(); aIter != aEnd; ++aIter)
++ {
++ const char *candidate = (const char*)(aIter->second);
++ if (rtl_str_compare(candidate, (const char*)(*family)) != 0)
++ {
++ m_aCanonicalToLocalized[OString(candidate)] = OString((const char*)(*family));
++ m_aLocalizedToCanonical[OString((const char*)(*family))] = OString(candidate);
+ }
+ }
+ }
+-
+- return eFamilyRes;
+ }
++
++ return eFamilyRes;
+ }
+
+-
+ /*
+ * PrintFontManager::initFontconfig
+ */
+@@ -594,18 +602,16 @@
int weight = 0;
int spacing = 0;
int nCollectionEntry = -1;
@@ -620,8 +732,11 @@
+ FcBool outline = false;
FcResult eFileRes = rWrapper.FcPatternGetString( pFSet->fonts[i], FC_FILE, 0, &file );
- FcResult eFamilyRes = rWrapper.FcPatternGetString( pFSet->fonts[i], FC_FAMILY, 0, &family );
-@@ -420,8 +426,6 @@
+- FcResult eFamilyRes = lcl_FamilyFromPattern(rWrapper, pFSet->fonts[i], &family, rWrapper.m_aFontconfigNameToLocalized );
++ FcResult eFamilyRes = rWrapper.FamilyFromPattern( pFSet->fonts[i], &family );
+ FcResult eStyleRes = rWrapper.FcPatternGetString( pFSet->fonts[i], FC_STYLE, 0, &style );
+ FcResult eSlantRes = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_SLANT, 0, &slant );
+ FcResult eWeightRes = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_WEIGHT, 0, &weight );
FcResult eSpacRes = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_SPACING, 0, &spacing );
FcResult eOutRes = rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_OUTLINE, 0, &outline );
FcResult eIndexRes = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_INDEX, 0, &nCollectionEntry );
@@ -630,7 +745,7 @@
if( eFileRes != FcResultMatch || eFamilyRes != FcResultMatch || eOutRes != FcResultMatch )
continue;
-@@ -559,15 +563,6 @@
+@@ -745,15 +751,6 @@
{
pUpdate->m_aStyleName = OStringToOUString( OString( (sal_Char*)style ), RTL_TEXTENCODING_UTF8 );
}
@@ -646,23 +761,21 @@
// update font cache
m_pFontCache->updateFontCacheEntry( pUpdate, false );
-@@ -751,6 +746,78 @@
+@@ -957,8 +954,8 @@
+ if( eFileRes == FcResultMatch )
+ {
+ OString sFamily((sal_Char*)family);
+- std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash >::const_iterator aI = rWrapper.m_aFontconfigNameToLocalized.find(sFamily);
+- if (aI != rWrapper.m_aFontconfigNameToLocalized.end())
++ std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash >::const_iterator aI = rWrapper.m_aCanonicalToLocalized.find(sFamily);
++ if (aI != rWrapper.m_aCanonicalToLocalized.end())
+ sFamily = aI->second;
+ aName = rtl::OStringToOUString( sFamily, RTL_TEXTENCODING_UTF8 );
+ }
+@@ -989,6 +986,106 @@
return aName;
}
-+#ifdef ENABLE_FONTCONFIG
-+static void lcl_InfoToPattern( const FastPrintFontInfo& rInfo, FontCfgWrapper& rWrapper, FcPattern* pPattern )
-+{
-+ OString aFamily = OUStringToOString( rInfo.m_aFamilyName, RTL_TEXTENCODING_UTF8 );
-+ if( aFamily.getLength() )
-+ rWrapper.FcPatternAddString( pPattern, FC_FAMILY, (FcChar8*)aFamily.getStr() );
-+
-+ addtopattern(rWrapper, pPattern, rInfo.m_eItalic, rInfo.m_eWeight, rInfo.m_eWidth, rInfo.m_ePitch);
-+
-+}
-+#endif
-+
-+
+FontConfigHints PrintFontManager::getFontConfigHints( const FastPrintFontInfo& rInfo, int nSize)
+{
+ FontConfigHints aHints;
@@ -674,18 +787,32 @@
+ FcConfig* pConfig = rWrapper.getDefConfig();
+ FcPattern* pPattern = rWrapper.FcPatternCreate();
+
-+ lcl_InfoToPattern( rInfo, rWrapper, pPattern );
++ OString sFamily = OUStringToOString( rInfo.m_aFamilyName, RTL_TEXTENCODING_UTF8 );
++
++ std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash >::const_iterator aI = rWrapper.m_aLocalizedToCanonical.find(sFamily);
++ if (aI != rWrapper.m_aLocalizedToCanonical.end())
++ sFamily = aI->second;
++ if( sFamily.getLength() )
++ rWrapper.FcPatternAddString( pPattern, FC_FAMILY, (FcChar8*)sFamily.getStr() );
++
++ addtopattern(rWrapper, pPattern, rInfo.m_eItalic, rInfo.m_eWeight, rInfo.m_eWidth, rInfo.m_ePitch);
++
+ rWrapper.FcPatternAddDouble( pPattern, FC_PIXEL_SIZE, nSize);
+
++ OString aFamily = OUStringToOString( rInfo.m_aFamilyName, RTL_TEXTENCODING_UTF8 );
++
+ FcBool embitmap = true, antialias = true, autohint = true, hinting = true;
-+ int hintstyle = FC_HINT_FULL;
++ int hintstyle = FC_HINT_FULL, rgba = FC_RGBA_UNKNOWN;
+
+ rWrapper.FcConfigSubstitute( pConfig, pPattern, FcMatchFont );
++
+ rWrapper.FcDefaultSubstitute( pPattern );
+ FcResult eEmbeddedBitmap = rWrapper.FcPatternGetBool( pPattern, FC_EMBEDDED_BITMAP, 0, &embitmap );
+ FcResult eAntialias = rWrapper.FcPatternGetBool( pPattern, FC_ANTIALIAS, 0, &antialias );
+ FcResult eAutoHint = rWrapper.FcPatternGetBool( pPattern, FC_AUTOHINT, 0, &autohint );
++ FcResult eSubPixel = rWrapper.FcPatternGetInteger( pPattern, FC_RGBA, 0, &rgba);
+ FcResult eHinting = rWrapper.FcPatternGetBool( pPattern, FC_HINTING, 0, &hinting );
++
+ FcResult eHintStyle = rWrapper.FcPatternGetInteger( pPattern, FC_HINT_STYLE, 0, &hintstyle );
+ rWrapper.FcPatternDestroy(pPattern);
+
@@ -718,26 +845,54 @@
+ break;
+ }
+ }
++ if (eSubPixel != FcResultMatch)
++ aHints.m_eSubPixel = fcsubpixel::Unknown;
++ else
++ {
++ switch (rgba)
++ {
++ default:
++ case FC_RGBA_UNKNOWN:
++ aHints.m_eSubPixel = fcsubpixel::Unknown;
++ break;
++ case FC_RGBA_RGB:
++ aHints.m_eSubPixel = fcsubpixel::RGB;
++ break;
++ case FC_RGBA_BGR:
++ aHints.m_eSubPixel = fcsubpixel::BGR;
++ break;
++ case FC_RGBA_VRGB:
++ aHints.m_eSubPixel = fcsubpixel::VRGB;
++ break;
++ case FC_RGBA_VBGR:
++ aHints.m_eSubPixel = fcsubpixel::VBGR;
++ break;
++ case FC_RGBA_NONE:
++ aHints.m_eSubPixel = fcsubpixel::NONE;
++ break;
++ }
++ }
+#endif
+ return aHints;
+}
+
bool PrintFontManager::matchFont( FastPrintFontInfo& rInfo, const com::sun::star::lang::Locale& rLocale )
{
- #ifdef ENABLE_FONTCONFIG
-@@ -777,11 +843,7 @@
+ FontCfgWrapper& rWrapper = FontCfgWrapper::get();
+@@ -1014,9 +1111,10 @@
if( aLangAttrib.getLength() )
rWrapper.FcPatternAddString( pPattern, FC_LANG, (FcChar8*)aLangAttrib.getStr() );
- OString aFamily = OUStringToOString( rInfo.m_aFamilyName, RTL_TEXTENCODING_UTF8 );
- if( aFamily.getLength() )
- rWrapper.FcPatternAddString( pPattern, FC_FAMILY, (FcChar8*)aFamily.getStr() );
--
-- addtopattern(rWrapper, pPattern, rInfo.m_eItalic, rInfo.m_eWeight, rInfo.m_eWidth, rInfo.m_ePitch);
-+ lcl_InfoToPattern( rInfo, rWrapper, pPattern );
++ OString sFamily = OUStringToOString( rInfo.m_aFamilyName, RTL_TEXTENCODING_UTF8 );
++
++ if( sFamily.getLength() )
++ rWrapper.FcPatternAddString( pPattern, FC_FAMILY, (FcChar8*)sFamily.getStr() );
+
+ addtopattern(rWrapper, pPattern, rInfo.m_eItalic, rInfo.m_eWeight, rInfo.m_eWidth, rInfo.m_ePitch);
- rWrapper.FcConfigSubstitute( pConfig, pPattern, FcMatchPattern );
- rWrapper.FcDefaultSubstitute( pPattern );
diff -ru psprint/source/fontmanager/fontmanager.cxx psprint/source/fontmanager/fontmanager.cxx
--- openoffice.org.orig/psprint/source/fontmanager/fontmanager.cxx 2006-05-08 16:00:10.000000000 -0400
+++ openoffice.org/psprint/source/fontmanager/fontmanager.cxx 2006-05-08 16:00:32.000000000 -0400
@@ -1078,109 +1233,6 @@
{}
};
-diff -ru psprint/source/fontmanager/fontconfig.cxx psprint/source/fontmanager/fontconfig.cxx
---- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx 2006-05-22 13:59:49.000000000 +0100
-+++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx 2006-05-23 12:23:55.000000000 +0100
-@@ -36,6 +36,8 @@
- #ifdef ENABLE_FONTCONFIG
- #include <fontconfig/fontconfig.h>
- // be compatible with fontconfig 2.2.0 release
-+#include <cairo-ft.h>
-+#include <gdk/gdkscreen.h>
- #ifndef FC_WEIGHT_BOOK
- #define FC_WEIGHT_BOOK 75
- #endif
-@@ -151,7 +153,7 @@
-
- void FcPatternDestroy( FcPattern* pPattern )
- { m_pFcPatternDestroy( pPattern ); }
--
-+
- FcFontSet* FcFontList( FcConfig* pConfig, FcPattern* pPattern, FcObjectSet* pSet )
- { return m_pFcFontList( pConfig, pPattern, pSet ); }
-
-@@ -774,14 +777,19 @@
- rWrapper.FcPatternAddDouble( pPattern, FC_PIXEL_SIZE, nSize);
-
- FcBool embitmap = true, antialias = true, autohint = true, hinting = true;
-- int hintstyle = FC_HINT_FULL;
-+ int hintstyle = FC_HINT_FULL, rgba = FC_RGBA_UNKNOWN;
-
- rWrapper.FcConfigSubstitute( pConfig, pPattern, FcMatchFont );
-+ GdkScreen *pScreen = gdk_screen_get_default();
-+ if (const cairo_font_options_t *pOptions = pScreen ? gdk_screen_get_font_options(pScreen) : 0)
-+ cairo_ft_font_options_substitute(pOptions, pPattern);
- rWrapper.FcDefaultSubstitute( pPattern );
- FcResult eEmbeddedBitmap = rWrapper.FcPatternGetBool( pPattern, FC_EMBEDDED_BITMAP, 0, &embitmap );
- FcResult eAntialias = rWrapper.FcPatternGetBool( pPattern, FC_ANTIALIAS, 0, &antialias );
- FcResult eAutoHint = rWrapper.FcPatternGetBool( pPattern, FC_AUTOHINT, 0, &autohint );
-+ FcResult eSubPixel = rWrapper.FcPatternGetInteger( pPattern, FC_RGBA, 0, &rgba);
- FcResult eHinting = rWrapper.FcPatternGetBool( pPattern, FC_HINTING, 0, &hinting );
-+
- FcResult eHintStyle = rWrapper.FcPatternGetInteger( pPattern, FC_HINT_STYLE, 0, &hintstyle );
-
- if( eEmbeddedBitmap == FcResultMatch )
-@@ -813,6 +820,33 @@
- break;
- }
- }
-+ if (eSubPixel != FcResultMatch)
-+ aHints.m_eSubPixel = fcsubpixel::Unknown;
-+ else
-+ {
-+ switch (rgba)
-+ {
-+ default:
-+ case FC_RGBA_UNKNOWN:
-+ aHints.m_eSubPixel = fcsubpixel::Unknown;
-+ break;
-+ case FC_RGBA_RGB:
-+ aHints.m_eSubPixel = fcsubpixel::RGB;
-+ break;
-+ case FC_RGBA_BGR:
-+ aHints.m_eSubPixel = fcsubpixel::BGR;
-+ break;
-+ case FC_RGBA_VRGB:
-+ aHints.m_eSubPixel = fcsubpixel::VRGB;
-+ break;
-+ case FC_RGBA_VBGR:
-+ aHints.m_eSubPixel = fcsubpixel::VBGR;
-+ break;
-+ case FC_RGBA_NONE:
-+ aHints.m_eSubPixel = fcsubpixel::NONE;
-+ break;
-+ }
-+ }
- #endif
- return aHints;
- }
-diff -ru psprint/source/fontmanager/makefile.mk psprint/source/fontmanager/makefile.mk
---- openoffice.org.orig/psprint/source/fontmanager/makefile.mk 2006-05-22 13:59:49.000000000 +0100
-+++ openoffice.org/psprint/source/fontmanager/makefile.mk 2006-05-23 09:59:14.000000000 +0100
-@@ -49,6 +49,9 @@
- CDEFS += -DENABLE_FONTCONFIG
- .ENDIF
-
-+PKGCONFIG_MODULES=gdk-2.0 freetype2
-+.INCLUDE: pkg_config.mk
-+
- # --- Files --------------------------------------------------------
-
- SLOFILES=\
-diff -ru psprint/util/makefile.mk psprint/util/makefile.mk
---- openoffice.org.orig/psprint/util/makefile.mk 2006-05-22 13:59:49.000000000 +0100
-+++ openoffice.org/psprint/util/makefile.mk 2006-05-23 10:00:18.000000000 +0100
-@@ -90,5 +90,10 @@
-
- # --- Targets ------------------------------------------------------------
-
-+PKGCONFIG_MODULES=gdk-2.0 freetype2
-+.INCLUDE: pkg_config.mk
-+SHL1STDLIBS+=$(PKGCONFIG_LIBS)
-+
-+
-
- .INCLUDE : target.mk
Index: svppspgraphics.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/headless/svppspgraphics.cxx,v
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v
retrieving revision 1.1472
retrieving revision 1.1473
diff -u -r1.1472 -r1.1473
--- openoffice.org.spec 18 Apr 2008 10:17:37 -0000 1.1472
+++ openoffice.org.spec 23 Apr 2008 07:22:46 -0000 1.1473
@@ -1,6 +1,6 @@
%define oootag OOH680
%define ooomilestone 12
-%define rh_rpm_release 6
+%define rh_rpm_release 7
# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
@@ -2904,6 +2904,10 @@
%changelog
+* Wed Apr 23 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.7
+- Resolves: rhbz#443356 fontconfig gives different results for "canonical"
+ font name vs localized font name
+
* Fri Apr 18 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.6
- Resolves: rhbz#439727 find another crasher
- Resolves: rhbz#441112 openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
- Previous message (by thread): rpms/xorg-x11-server/F-9 xserver-1.5.0-glcore-swap-no-crashy.patch, NONE, 1.1 xorg-x11-server.spec, 1.327, 1.328
- Next message (by thread): rpms/claws-mail/F-7 .cvsignore, 1.17, 1.18 claws-mail.spec, 1.29, 1.30 sources, 1.17, 1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list