rpms/openoffice.org/devel openoffice.org-1.9.129.ooo54603.fontconfig.patch, 1.10, 1.11 openoffice.org.spec, 1.980, 1.981 openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch, 1.4, NONE openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch, 1.8, NONE openoffice.org-1.9.129.ooo54603.fontconfig.part4.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Dec 19 09:58:56 UTC 2006
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org.spec, 1.979, 1.980 openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch, 1.1, NONE openoffice.org-2.0.4.gccXXXXX.svtools.fsstorage.patch, 1.1, NONE openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch, 1.2, NONE
- Next message (by thread): rpms/openoffice.org/devel openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch, 1.6, 1.7 openoffice.org.spec, 1.981, 1.982 visibility.warning.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1458
Modified Files:
openoffice.org-1.9.129.ooo54603.fontconfig.patch
openoffice.org.spec
Removed Files:
openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch
openoffice.org-1.9.129.ooo54603.fontconfig.part4.patch
Log Message:
merge fontconfig patches
openoffice.org-1.9.129.ooo54603.fontconfig.patch:
psprint/inc/psprint/fontmanager.hxx | 11
psprint/source/fontmanager/fontcache.cxx | 2
psprint/source/fontmanager/fontconfig.cxx | 400 ++++++++++++++++++++++++-----
psprint/source/fontmanager/fontmanager.cxx | 9
vcl/inc/outdev.h | 2
vcl/inc/outfont.hxx | 15 +
vcl/inc/sallayout.hxx | 1
vcl/source/gdi/outdev3.cxx | 345 ++++++++++++++++++-------
vcl/source/gdi/sallayout.cxx | 46 +++
vcl/source/glyphs/gcach_layout.cxx | 14 -
vcl/source/window/window.cxx | 5
vcl/util/makefile.mk | 2
12 files changed, 680 insertions(+), 172 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.10 -r 1.11 openoffice.org-1.9.129.ooo54603.fontconfig.patch
Index: openoffice.org-1.9.129.ooo54603.fontconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.129.ooo54603.fontconfig.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openoffice.org-1.9.129.ooo54603.fontconfig.patch 19 Sep 2006 10:53:19 -0000 1.10
+++ openoffice.org-1.9.129.ooo54603.fontconfig.patch 19 Dec 2006 09:58:54 -0000 1.11
@@ -1,1069 +1,1350 @@
-diff -ru SRC680_m167.orig/psprint/inc/psprint/fontmanager.hxx SRC680_m167/psprint/inc/psprint/fontmanager.hxx
---- SRC680_m167.orig/psprint/inc/psprint/fontmanager.hxx 2006-05-08 14:01:16.000000000 -0400
-+++ SRC680_m167/psprint/inc/psprint/fontmanager.hxx 2006-05-08 14:13:34.000000000 -0400
-@@ -49,6 +49,9 @@
- #ifndef _PSPRINT_HELPER_HXX_
- #include <psprint/helper.hxx>
- #endif
-+#ifndef _STRING_HXX
-+#include <tools/string.hxx>
-+#endif
+diff -ru OOE680_m6.fontconfig/vcl/inc/outdev.h OOE680_m6/vcl/inc/outdev.h
+--- OOE680_m6.fontconfig/vcl/inc/outdev.h 2006-12-18 13:00:23.000000000 -0500
++++ OOE680_m6/vcl/inc/outdev.h 2006-12-19 04:28:08.000000000 -0500
+@@ -213,7 +213,7 @@
+ const Font& rFont, const Size& rSize, ImplFontSubstEntry* pDevSpecific );
+ ImplFontEntry* GetFallback( ImplDevFontList* pFontList,
+ const Font& rFont, const Size& rSize,
+- int nFallbackLevel );
++ int nFallbackLevel, std::vector<sal_Unicode> &rMissingGlyphs );
+ void Release( ImplFontEntry* );
+ void Invalidate();
+ };
+diff -ru OOE680_m6.fontconfig/vcl/inc/outfont.hxx OOE680_m6/vcl/inc/outfont.hxx
+--- OOE680_m6.fontconfig/vcl/inc/outfont.hxx 2006-12-18 13:00:23.000000000 -0500
++++ OOE680_m6/vcl/inc/outfont.hxx 2006-12-19 04:27:48.000000000 -0500
+@@ -230,6 +230,7 @@
+ ImplDevFontListData* FindFontFamily( const String& rFontName ) const;
+ ImplDevFontListData* ImplFindByFont( ImplFontSelectData&, bool bPrinter, ImplFontSubstEntry* pDevSpecificSubst ) const;
+ ImplDevFontListData* ImplFindBySearchName( const String& ) const;
++ ImplDevFontListData* ImplGetFontconfigSubstitute( ImplFontSelectData &rFontSelData, ImplFontSubstEntry* pDevSpecific );
- #ifndef _COM_SUN_STAR_LANG_LOCALE_HPP_
- #include <com/sun/star/lang/Locale.hpp>
-@@ -412,6 +415,7 @@
- std::hash_multimap< sal_uInt8, sal_Unicode > m_aAdobecodeToUnicode;
+ bool HasFallbacks() const;
+ void SetFallbacks( ImplDevFontListData**, int nCount );
+@@ -333,6 +334,10 @@
+ ImplFontEntry( const ImplFontSelectData& );
+ virtual ~ImplFontEntry() {}
- mutable FontCache* m_pFontCache;
-+ bool m_bFontconfigSuccess;
-
- rtl::OString getAfmFile( PrintFont* pFont ) const;
- rtl::OString getFontFile( PrintFont* pFont ) const;
-@@ -722,6 +726,11 @@
- false else
- */
- bool matchFont( FastPrintFontInfo& rInfo, const com::sun::star::lang::Locale& rLocale );
++ // cache of Unicode characters and replacement font names
++ typedef ::std::hash_map<sal_Unicode,String> UnicodeFallbackList;
++ UnicodeFallbackList maUnicodeFallbackList;
+
-+ String Substitute(const std::vector<String> &rNames, const std::vector<sal_Unicode> &rGlyphs,
-+ const ByteString &rLangAttrib, italic::type eItalic, weight::type eWeight,
-+ width::type eWidth, pitch::type ePitch) const;
-+ bool hasFontconfig() const { return m_bFontconfigSuccess; }
+ public: // TODO: make data members private
+ ImplFontSelectData maFontSelData; // FontSelectionData
+ ImplFontMetricData maMetric; // Font Metric
+@@ -343,6 +348,16 @@
+ short mnOwnOrientation; // text angle if lower layers don't rotate text themselves
+ short mnOrientation; // text angle in 3600 system
+ bool mbInit; // true if maMetric member is valid
++
++ void AddFallbackForUnicode( sal_Unicode ch, String fallback )
++ { maUnicodeFallbackList[ch] = fallback; }
++ String GetFallbackForUnicode( sal_Unicode ch )
++ {
++ UnicodeFallbackList::const_iterator it = maUnicodeFallbackList.find( ch );
++ if ( it != maUnicodeFallbackList.end() )
++ return (*it).second;
++ return String();
++ }
};
- } // namespace
-diff -ru SRC680_m167.orig/psprint/source/fontmanager/fontcache.cxx SRC680_m167/psprint/source/fontmanager/fontcache.cxx
---- SRC680_m167.orig/psprint/source/fontmanager/fontcache.cxx 2006-05-08 14:01:16.000000000 -0400
-+++ SRC680_m167/psprint/source/fontmanager/fontcache.cxx 2006-05-08 14:13:34.000000000 -0400
-@@ -679,9 +679,9 @@
- FontDirMap::const_iterator entry = dir->second.m_aEntries.find( rFile );
- if( entry != dir->second.m_aEntries.end() )
- {
-- bSuccess = true;
- for( FontCacheEntry::const_iterator font = entry->second.m_aEntry.begin(); font != entry->second.m_aEntry.end(); ++font )
- {
-+ bSuccess = true;
- PrintFontManager::PrintFont* pFont = clonePrintFont( *font );
- rNewFonts.push_back( pFont );
- }
-diff -ru SRC680_m167.orig/psprint/source/fontmanager/fontconfig.cxx SRC680_m167/psprint/source/fontmanager/fontconfig.cxx
---- SRC680_m167.orig/psprint/source/fontmanager/fontconfig.cxx 2006-05-08 14:01:16.000000000 -0400
-+++ SRC680_m167/psprint/source/fontmanager/fontconfig.cxx 2006-05-08 14:54:06.000000000 -0400
-@@ -44,10 +44,12 @@
- typedef void FcObjectSet;
- typedef void FcPattern;
- typedef void FcFontSet;
-+typedef void FcCharSet;
- typedef int FcResult;
- typedef int FcBool;
- typedef int FcMatchKind;
- typedef char FcChar8;
-+typedef sal_Int32 FcChar32;
- #endif
- #include <cstdio>
-@@ -80,6 +82,7 @@
- {
- void* m_pLib;
- FcConfig* m_pDefConfig;
-+ FcFontSet* m_pOutlineSet;
+diff -ru OOE680_m6.fontconfig/vcl/inc/sallayout.hxx OOE680_m6/vcl/inc/sallayout.hxx
+--- OOE680_m6.fontconfig/vcl/inc/sallayout.hxx 2006-12-18 13:00:23.000000000 -0500
++++ OOE680_m6/vcl/inc/sallayout.hxx 2006-12-19 04:28:08.000000000 -0500
+@@ -101,6 +101,7 @@
+ bool GetRun( int* nMinRunPos, int* nEndRunPos, bool* bRTL ) const;
+ bool GetNextPos( int* nCharPos, bool* bRTL );
+ bool PosIsInRun( int nCharPos ) const;
++ bool PosIsInAnyRun( int nCharPos ) const;
+ };
- FcBool (*m_pFcInit)();
- FcConfig* (*m_pFcConfigGetCurrent)();
-@@ -88,18 +91,23 @@
- FcPattern* (*m_pFcPatternCreate)();
- void (*m_pFcPatternDestroy)(FcPattern*);
- FcFontSet* (*m_pFcFontList)(FcConfig*,FcPattern*,FcObjectSet*);
-+ FcFontSet* (*m_pFcConfigGetFonts)(FcConfig*,FcSetName);
- FcFontSet* (*m_pFcFontSetCreate)();
-+ FcCharSet* (*m_pFcCharSetCreate)();
-+ FcBool (*m_pFcCharSetAddChar)(FcCharSet *, FcChar32);
- void (*m_pFcFontSetDestroy)(FcFontSet*);
- FcBool (*m_pFcFontSetAdd)(FcFontSet*,FcPattern*);
-+ void (*m_pFcPatternReference)(FcPattern*);
- FcResult (*m_pFcPatternGetString)(const FcPattern*,const char*,int,FcChar8**);
- FcResult (*m_pFcPatternGetInteger)(const FcPattern*,const char*,int,int*);
- FcResult (*m_pFcPatternGetDouble)(const FcPattern*,const char*,int,double*);
- FcResult (*m_pFcPatternGetBool)(const FcPattern*,const char*,int,FcBool*);
- void (*m_pFcDefaultSubstitute)(FcPattern *);
-- FcPattern* (*m_pFcFontMatch)(FcConfig*,FcPattern*,FcResult*);
- FcPattern* (*m_pFcFontSetMatch)(FcConfig*,FcFontSet**, int, FcPattern*,FcResult*);
- FcBool (*m_pFcConfigSubstitute)(FcConfig*,FcPattern*,FcMatchKind);
- FcBool (*m_pFcPatternAddInteger)(FcPattern*,const char*,int);
-+ FcBool (*m_pFcPatternAddBool)(FcPattern*,const char*,FcBool);
-+ FcBool (*m_pFcPatternAddCharSet)(FcPattern*,const char*,const FcCharSet*);
- FcBool (*m_pFcPatternAddString)(FcPattern*,const char*,const FcChar8*);
+ // -----------------
+diff -ru OOE680_m6.fontconfig/vcl/source/gdi/outdev3.cxx OOE680_m6/vcl/source/gdi/outdev3.cxx
+--- OOE680_m6.fontconfig/vcl/source/gdi/outdev3.cxx 2006-12-18 13:00:25.000000000 -0500
++++ OOE680_m6/vcl/source/gdi/outdev3.cxx 2006-12-19 04:28:08.000000000 -0500
+@@ -168,6 +168,9 @@
+ #include <memory>
+ #include <algorithm>
- void* loadSymbol( const char* );
-@@ -115,6 +123,7 @@
- { return m_pLib != NULL;}
++#include <psprint/fontmanager.hxx>
++#include <i18npool/mslangid.hxx>
++
+ // =======================================================================
- FcConfig* getDefConfig() { return m_pDefConfig; }
-+ FcFontSet* getFontSet() { return m_pOutlineSet; }
+ DBG_NAMEEX( OutputDevice )
+@@ -2659,6 +2662,121 @@
+ }
+ }
- FcBool FcInit()
- { return m_pFcInit(); }
-@@ -144,14 +153,28 @@
-
- FcFontSet* FcFontList( FcConfig* pConfig, FcPattern* pPattern, FcObjectSet* pSet )
- { return m_pFcFontList( pConfig, pPattern, pSet ); }
--
+
-+ FcFontSet* FcConfigGetFonts( FcConfig* pConfig, FcSetName eSet)
-+ { return m_pFcConfigGetFonts( pConfig, eSet ); }
++// -----------------------------------------------------------------------
+
- FcFontSet* FcFontSetCreate()
- { return m_pFcFontSetCreate(); }
++String GetFcSubstitute(const ImplFontSelectData &rFontSelData, std::vector<sal_Unicode> &rGlyphs)
++{
++ std::vector<String> aNames;
++ if( rFontSelData.GetFamilyName().Len() )
++ {
++ sal_uInt16 nIndex = 0;
[...1905 lines suppressed...]
++ // info: destroying the pSet destroys pResult implicitly
++ // since pResult was "added" to pSet
++ rWrapper.FcFontSetAdd( pSet, pResult );
++ }
++
++ if( pSet )
++ {
++ if( pSet->nfont > 0 )
++ {
++ //extract the closest match
++ FcChar8* family = NULL;
++ FcResult eFileRes = rWrapper.FcPatternGetString( pSet->fonts[0], FC_FAMILY, 0, &family );
++
++ if( eFileRes == FcResultMatch )
++ {
++ OString sFamily((sal_Char*)family);
++ std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash >::const_iterator aI = m_aFontconfigNameToLocalized.find(sFamily);
++ if (aI != m_aFontconfigNameToLocalized.end())
++ sFamily = aI->second;
++ aName = String( sFamily.getStr(), RTL_TEXTENCODING_UTF8 );
++ }
++
++ if (!rGlyphs.empty() )
++ {
++ std::vector<sal_Unicode> aGlyphs;
++ FcCharSet *unicodes;
++ if (rWrapper.FcPatternGetCharSet(pSet->fonts[0], FC_CHARSET, 0, &unicodes) == FcResultMatch)
++ {
++ std::vector<sal_Unicode>::iterator aGlyphEnd = rGlyphs.end();
++ for (std::vector<sal_Unicode>::iterator aGlyphIter = rGlyphs.begin();
++ aGlyphIter != aGlyphEnd; ++aGlyphIter)
++ {
++ if (rWrapper.FcCharSetHasChar( unicodes, (FcChar32)*aGlyphIter ))
++ aGlyphs.push_back(*aGlyphIter);
++ }
++ }
++ rGlyphs.swap(aGlyphs);
++ }
++
++ }
++ }
++ rWrapper.FcFontSetDestroy( pSet );
+#endif
++ return aName;
++}
+
- return pFallbackFont;
- }
-
-@@ -6092,7 +6223,7 @@
- // do glyph fallback if needed
- // #105768# avoid fallback for very small font sizes
- if( aLayoutArgs.NeedFallback() )
-- if( mpFontEntry && (mpFontEntry->maFontSelData.mnHeight >= 6) )
-+ if( mpFontEntry && (mpFontEntry->maFontSelData.mnHeight >= 3) )
- pSalLayout = ImplGlyphFallbackLayout( pSalLayout, aLayoutArgs );
-
- // position, justify, etc. the layout
-@@ -6136,6 +6267,17 @@
- rLayoutArgs.ResetPos();
- }
- #endif
-+ int nCharPos = -1;
-+ bool bRTL = false;
-+ sal_Unicode *pMissingUnicodes = new sal_Unicode[8];
-+ int nMissingUnicodes = 0;
++bool PrintFontManager::matchFont( FastPrintFontInfo& rInfo, const com::sun::star::lang::Locale& rLocale )
++{
++#ifdef ENABLE_FONTCONFIG
++ FontCfgWrapper& rWrapper = FontCfgWrapper::get();
++ if( ! rWrapper.isValid() )
++ return false;
+
-+ for( int i=0; i<8 && rLayoutArgs.GetNextPos( &nCharPos, &bRTL); ++i )
++ FcConfig* pConfig = rWrapper.getDefConfig();
++ FcPattern* pPattern = rWrapper.FcPatternCreate();
++
++ OString aLangAttrib;
++ // populate pattern with font characteristics
++ if( rLocale.Language.getLength() )
+ {
-+ pMissingUnicodes[i] = rLayoutArgs.mpStr[ nCharPos ];
-+ nMissingUnicodes++;
++ OUStringBuffer aLang(6);
++ aLang.append( rLocale.Language );
++ if( rLocale.Country.getLength() )
++ {
++ aLang.append( sal_Unicode('-') );
++ aLang.append( rLocale.Country );
++ }
++ aLangAttrib = OUStringToOString( aLang.makeStringAndClear(), RTL_TEXTENCODING_UTF8 );
+ }
-+ rLayoutArgs.ResetPos();
-
- ImplFontSelectData aFontSelData = mpFontEntry->maFontSelData;
- Size aFontSize( aFontSelData.mnWidth, aFontSelData.mnHeight );
-@@ -6152,7 +6294,8 @@
- {
- // find a font family suited for glyph fallback
- ImplFontEntry* pFallbackFont = mpFontCache->GetFallback( mpFontList,
-- maFont, aFontSize, nFallbackLevel-nDevSpecificFallback );
-+ maFont, aFontSize, nFallbackLevel-nDevSpecificFallback,
-+ (nMissingUnicodes ? pMissingUnicodes : NULL), nMissingUnicodes );
- if( !pFallbackFont )
- break;
-
-@@ -6204,6 +6347,8 @@
- break;
- }
-
-+ delete[] pMissingUnicodes;
++ 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() );
+
- if( pMultiSalLayout && pMultiSalLayout->LayoutText( rLayoutArgs ) )
- pSalLayout = pMultiSalLayout;
++ addtopattern(rWrapper, pPattern, rInfo.m_eItalic, rInfo.m_eWeight, rInfo.m_eWidth, rInfo.m_ePitch);
-diff -ru SRC680_m167.orig/vcl/source/window/window.cxx SRC680_m167/vcl/source/window/window.cxx
---- SRC680_m167.orig/vcl/source/window/window.cxx 2006-05-08 13:56:26.000000000 -0400
-+++ SRC680_m167/vcl/source/window/window.cxx 2006-05-08 14:52:24.000000000 -0400
-@@ -194,6 +194,7 @@
+ rWrapper.FcConfigSubstitute( pConfig, pPattern, FcMatchPattern );
+ rWrapper.FcDefaultSubstitute( pPattern );
+ FcResult eResult = FcResultNoMatch;
+- FcPattern* pResult = rWrapper.FcFontMatch( pConfig, pPattern, &eResult );
++ FcFontSet *pFontSet = rWrapper.getFontSet();
++ FcPattern* pResult = rWrapper.FcFontSetMatch( pConfig, &pFontSet, 1, pPattern, &eResult );
+ bool bSuccess = false;
+ if( pResult )
+ {
+diff -ru OOE680_m6.fontconfig/psprint/source/fontmanager/fontmanager.cxx OOE680_m6/psprint/source/fontmanager/fontmanager.cxx
+--- OOE680_m6.fontconfig/psprint/source/fontmanager/fontmanager.cxx 2006-12-18 12:57:27.000000000 -0500
++++ OOE680_m6/psprint/source/fontmanager/fontmanager.cxx 2006-12-19 04:27:48.000000000 -0500
+@@ -1165,7 +1165,8 @@
+ m_nNextFontID( 1 ),
+ m_pAtoms( new MultiAtomProvider() ),
+ m_nNextDirAtom( 1 ),
+- m_pFontCache( NULL )
++ m_pFontCache( NULL ),
++ m_bFontconfigSuccess(false)
+ {
+ for( unsigned int i = 0; i < sizeof( aAdobeCodes )/sizeof( aAdobeCodes[0] ); i++ )
+ {
+@@ -2124,7 +2125,7 @@
#endif
- #include <pdfextoutdevdata.hxx>
-+#include <psprint/fontmanager.hxx>
-
- using namespace rtl;
- using namespace ::com::sun::star::uno;
-@@ -339,6 +340,10 @@
+ // first try fontconfig
+- bool bFontconfigSuccess = initFontconfig();
++ m_bFontconfigSuccess = initFontconfig();
- bool Window::ImplCheckUIFont( const Font& rFont )
- {
-+ const psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
-+ if (rMgr.hasFontconfig())
-+ return true;
-+
- String aTestText;
- aTestText.Append( Button::GetStandardText( BUTTON_OK ) );
- aTestText.Append( Button::GetStandardText( BUTTON_CANCEL ) );
-diff -ru SRC680_m167.orig/vcl/util/makefile.mk SRC680_m167/vcl/util/makefile.mk
---- SRC680_m167.orig/vcl/util/makefile.mk 2006-05-08 13:56:29.000000000 -0400
-+++ SRC680_m167/vcl/util/makefile.mk 2006-05-08 14:13:33.000000000 -0400
-@@ -239,7 +239,7 @@
- SHL1STDLIBS += -framework Cocoa
- .ENDIF
+ // part one - look for downloadable fonts
+ rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
+@@ -2146,7 +2147,7 @@
+ }
--SHL1STDLIBS += -lX11
-+SHL1STDLIBS += -lX11 -lpsp$(VERSION)$(DLLPOSTFIX)
+ // don't search through many directories fontconfig already told us about
+- if( ! bFontconfigSuccess )
++ if( ! m_bFontconfigSuccess )
+ {
+ Display *pDisplay = (Display*)pInitDisplay;
+
+@@ -2239,7 +2240,7 @@
+ }
+ }
+ #endif /* SOLARIS */
+- } // ! bFontconfigSuccess
++ } // ! m_bFontconfigSuccess
- .IF "$(OS)"=="MACOSX"
- SHL1STDLIBS += -framework Foundation -framework CoreFoundation
+ // fill XLFD aliases from fonts.alias files
+ initFontsAlias();
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.980
retrieving revision 1.981
diff -u -r1.980 -r1.981
--- openoffice.org.spec 19 Dec 2006 09:24:44 -0000 1.980
+++ openoffice.org.spec 19 Dec 2006 09:58:54 -0000 1.981
@@ -98,37 +98,34 @@
Patch30: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
Patch31: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
Patch32: workspace.os89.patch
-Patch33: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
-Patch34: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch35: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
-Patch36: openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch
-Patch37: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-Patch38: pseudoworkspace.valgrind1.patch
-Patch39: workspace.thbpp6.patch
-Patch40: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch41: openoffice.org-2.0.4.rh217065.syncbackspace.patch
-Patch42: openoffice.org-2.0.4.ooo70779.vcl.setprgname.patch
-Patch43: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
-Patch44: workspace.aw024.patch
-Patch45: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
-Patch46: workspace.dr51.patch
-Patch47: openoffice.org-1.9.129.ooo54603.fontconfig.part4.patch
-Patch48: openoffice.org-2.0.4.rh213710.vba.patch
-Patch49: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch50: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
-Patch51: workspace.sixtyfour09.patch
-Patch52: workspace.vcl69.patch
-Patch53: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch54: workspace.dba22b.patch
-Patch55: workspace.sixtyfour10.patch
-Patch56: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
-Patch57: visibility.warning.patch
-Patch58: workspace.vcl70.patch
-Patch59: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch
-Patch60: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch61: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
-Patch62: openoffice.org-2.1.0.oooXXXXX.vcl.filterzwatrender.patch
-Patch63: workspace.vcl71.patch
+Patch33: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch34: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
+Patch35: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+Patch36: pseudoworkspace.valgrind1.patch
+Patch37: workspace.thbpp6.patch
+Patch38: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch39: openoffice.org-2.0.4.rh217065.syncbackspace.patch
+Patch40: openoffice.org-2.0.4.ooo70779.vcl.setprgname.patch
+Patch41: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
+Patch42: workspace.aw024.patch
+Patch43: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
+Patch44: workspace.dr51.patch
+Patch45: openoffice.org-2.0.4.rh213710.vba.patch
+Patch46: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch47: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
+Patch48: workspace.sixtyfour09.patch
+Patch49: workspace.vcl69.patch
+Patch50: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch51: workspace.dba22b.patch
+Patch52: workspace.sixtyfour10.patch
+Patch53: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
+Patch54: visibility.warning.patch
+Patch55: workspace.vcl70.patch
+Patch56: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch
+Patch57: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch58: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
+Patch59: openoffice.org-2.1.0.oooXXXXX.vcl.filterzwatrender.patch
+Patch60: workspace.vcl71.patch
%define instdir %{_libdir}/openoffice.org2.1
@@ -964,37 +961,34 @@
%patch30 -p1 -b .ooo67658.sfx2.reloadcrash.patch
%patch31 -p1 -b .ooo67740.xmlhelp.doublefree.patch
%patch32 -p1 -b .workspace.os89.patch
-%patch33 -p1 -b .ooo54603.fontconfig.part2.patch
-%patch34 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch35 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
-%patch36 -p1 -b .ooo54603.fontconfig.part3.patch
-%patch37 -p1 -b .ooo69051.vcl.singlekeypress.patch
-%patch38 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch39 -p1 -b .workspace.thbpp6.patch
-%patch40 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch41 -p1 -b .rh217065.syncbackspace.patch
-%patch42 -p1 -b .ooo70779.vcl.setprgname.patch
-%patch43 -p1 -b .ooo70155.fasterhelplinking.patch
-%patch44 -p1 -b .workspace.aw024.patch
-%patch45 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch
-%patch46 -p1 -b .workspace.dr51.patch
-%patch47 -p1 -b .ooo54603.fontconfig.part4.patch
-%patch48 -p1 -b .rh213710.vba.patch
-%patch49 -p1 -b .ooo65491.psprint.enablenups.patch
-%patch50 -p1 -b .ooo61812.svx.a11ycrash.patch
-%patch51 -p1 -b .workspace.sixtyfour09.patch
-%patch52 -p1 -b .workspace.vcl69.patch
-cat %{PATCH53} >> svtools/source/dialogs/localize.sdf
-%patch54 -p1 -b .workspace.dba22b.patch
-%patch55 -p1 -b .workspace.sixtyfour10.patch
-%patch56 -p1 -b .ooo72014.officecfg.malayammenu.patch
-%patch57 -p1 -b .visibility.warning.patch
-%patch58 -p1 -b .workspace.vcl70.patch
-%patch59 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch
-%patch60 -p1 -b .rh217269.officecfg.nosequencecheck.patch
-%patch61 -p1 -b .ooo72129.vcl.fontglyphindex.patch
-%patch62 -p1 -b .oooXXXXX.vcl.filterzwatrender.patch
-%patch63 -p1 -b .workspace.vcl71.patch
+%patch33 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch34 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
+%patch35 -p1 -b .ooo69051.vcl.singlekeypress.patch
+%patch36 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch37 -p1 -b .workspace.thbpp6.patch
+%patch38 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch39 -p1 -b .rh217065.syncbackspace.patch
+%patch40 -p1 -b .ooo70779.vcl.setprgname.patch
+%patch41 -p1 -b .ooo70155.fasterhelplinking.patch
+%patch42 -p1 -b .workspace.aw024.patch
+%patch43 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch
+%patch44 -p1 -b .workspace.dr51.patch
+%patch45 -p1 -b .rh213710.vba.patch
+%patch46 -p1 -b .ooo65491.psprint.enablenups.patch
+%patch47 -p1 -b .ooo61812.svx.a11ycrash.patch
+%patch48 -p1 -b .workspace.sixtyfour09.patch
+%patch49 -p1 -b .workspace.vcl69.patch
+cat %{PATCH50} >> svtools/source/dialogs/localize.sdf
+%patch51 -p1 -b .workspace.dba22b.patch
+%patch52 -p1 -b .workspace.sixtyfour10.patch
+%patch53 -p1 -b .ooo72014.officecfg.malayammenu.patch
+%patch54 -p1 -b .visibility.warning.patch
+%patch55 -p1 -b .workspace.vcl70.patch
+%patch56 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch
+%patch57 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch58 -p1 -b .ooo72129.vcl.fontglyphindex.patch
+%patch59 -p1 -b .oooXXXXX.vcl.filterzwatrender.patch
+%patch60 -p1 -b .workspace.vcl71.patch
%if %{langpacks}
tar xzf %{SOURCE1}
--- openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch DELETED ---
--- openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch DELETED ---
--- openoffice.org-1.9.129.ooo54603.fontconfig.part4.patch DELETED ---
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org.spec, 1.979, 1.980 openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch, 1.1, NONE openoffice.org-2.0.4.gccXXXXX.svtools.fsstorage.patch, 1.1, NONE openoffice.org.2.0.3.gccXXXXX.linguistic.vorcrash.patch, 1.2, NONE
- Next message (by thread): rpms/openoffice.org/devel openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch, 1.6, 1.7 openoffice.org.spec, 1.981, 1.982 visibility.warning.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list