rpms/openoffice.org/devel openoffice.org.spec, 1.1757, 1.1758 workspace.vcl98.patch, 1.3, 1.4 openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13017

Modified Files:
	openoffice.org.spec workspace.vcl98.patch 
Removed Files:
	openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch 
Log Message:
consolidate patch into upstream workspace


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1757
retrieving revision 1.1758
diff -u -r1.1757 -r1.1758
--- openoffice.org.spec	15 Jan 2009 23:05:18 -0000	1.1757
+++ openoffice.org.spec	16 Jan 2009 10:05:16 -0000	1.1758
@@ -134,9 +134,8 @@
 Patch61: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
 Patch62: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
 Patch63: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
-Patch64: openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
-Patch65: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
-Patch66: workspace.fwk99.patch
+Patch64: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
+Patch65: workspace.fwk99.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1418,9 +1417,8 @@
 %patch61 -p1 -b .oooXXXXX.extensions.npapi.patch
 %patch62 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
 %patch63 -p1 -b .ooo97488.sw.ww8toc.patch
-%patch64 -p1 -b .ooo98024.vcl.emboldenoverlap.patch
-%patch65 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
-%patch66 -p1 -b .workspace.fwk99.patch
+%patch64 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
+%patch65 -p1 -b .workspace.fwk99.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3830,7 +3828,7 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue Jan 15 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
+* Fri Jan 16 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
 - Resolves: rhbz#479624 add
   openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
 - add hyphen-uk, hyphen-pt dependency

workspace.vcl98.patch:

Index: workspace.vcl98.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl98.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- workspace.vcl98.patch	7 Jan 2009 12:23:10 -0000	1.3
+++ workspace.vcl98.patch	16 Jan 2009 10:05:16 -0000	1.4
@@ -124,3 +124,61 @@
      }
      static const char* pEnv = getenv( "SAL_GTK_USE_PIXMAPPAINT" );
      if( pEnv && *pEnv )
+Index: source/glyphs/gcach_ftyp.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.cxx,v
+retrieving revision 1.150.2.1
+diff -u -r1.150.2.1 gcach_ftyp.cxx
+--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx	26 Aug 2008 12:26:31 -0000	1.150.2.1
++++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx	13 Jan 2009 10:05:32 -0000
+@@ -1241,6 +1269,22 @@
+     return nGlyphIndex;
+ }
+ 
++static int lcl_GetCharWidth(FT_FaceRec_* pFaceFT, double fStretch, int nGlyphFlags)
++{
++    int nCharWidth = pFaceFT->glyph->metrics.horiAdvance;
++
++    if( nGlyphFlags & GF_ROTMASK ) {  // for bVertical rotated glyphs
++        const FT_Size_Metrics& rMetrics = pFaceFT->size->metrics;
++#if (FTVERSION < 2000)
++        nCharWidth = (int)((rMetrics.height - rMetrics.descender) * fStretch);
++#else
++        nCharWidth = (int)((rMetrics.height + rMetrics.descender) * fStretch);
++#endif
++    }
++
++    return (nCharWidth + 32) >> 6;
++}
++
+ // -----------------------------------------------------------------------
+ 
+ void FreetypeServerFont::InitGlyphData( int nGlyphIndex, GlyphData& rGD ) const
+@@ -1282,20 +1327,17 @@
+         return;
+     }
+ 
++    bool bOriginallyZeroWidth = false;
+     if( mbArtBold && pFTEmbolden )
++    {
++        if (lcl_GetCharWidth(maFaceFT, mfStretch, nGlyphFlags) == 0)
++            bOriginallyZeroWidth = true;
+         (*pFTEmbolden)( maFaceFT->glyph );
++    }
+ 
+-    int nCharWidth = maFaceFT->glyph->metrics.horiAdvance;
++    int nCharWidth = !bOriginallyZeroWidth ? lcl_GetCharWidth(maFaceFT, mfStretch, nGlyphFlags) : 0;
+ 
+-    if( nGlyphFlags & GF_ROTMASK ) {  // for bVertical rotated glyphs
+-        const FT_Size_Metrics& rMetrics = maFaceFT->size->metrics;
+-#if (FTVERSION < 2000)
+-        nCharWidth = (int)((rMetrics.height - rMetrics.descender) * mfStretch);
+-#else
+-        nCharWidth = (int)((rMetrics.height + rMetrics.descender) * mfStretch);
+-#endif
+-    }
+-    rGD.SetCharWidth( (nCharWidth + 32) >> 6 );
++    rGD.SetCharWidth( nCharWidth );
+ 
+     FT_Glyph pGlyphFT;
+     rc = FT_Get_Glyph( maFaceFT->glyph, &pGlyphFT );


--- openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch DELETED ---