rpms/openoffice.org/devel openoffice.org.spec, 1.2033, 1.2034 workspace.vcl106.patch, 1.2, 1.3 openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch, 1.2, NONE
Caolan McNamara
caolanm at fedoraproject.org
Tue Oct 13 14:06:01 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11362
Modified Files:
openoffice.org.spec workspace.vcl106.patch
Removed Files:
openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
Log Message:
openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch merged into workspace.vcl106
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2033
retrieving revision 1.2034
diff -u -p -r1.2033 -r1.2034
--- openoffice.org.spec 13 Oct 2009 12:27:55 -0000 1.2033
+++ openoffice.org.spec 13 Oct 2009 14:06:00 -0000 1.2034
@@ -112,12 +112,11 @@ Patch38: openoffice.org-3.1.0.ooo104280.
Patch39: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
Patch40: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
Patch41: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
-Patch42: openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
-Patch43: workspace.vcl106.patch
-Patch44: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
-Patch45: workspace.dba32h.patch
-Patch46: openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch
-Patch47: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
+Patch42: workspace.vcl106.patch
+Patch43: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
+Patch44: workspace.dba32h.patch
+Patch45: openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch
+Patch46: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
%define instdir %{_libdir}
@@ -1619,12 +1618,11 @@ cat %{PATCH10} >> svtools/source/dialogs
%patch39 -p0 -b .ooo104329.dbaccess.primarykeys.patch
%patch40 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
%patch41 -p1 -b .oooXXXXXX.sal.justcoredump.patch
-%patch42 -p0 -b .ooo92671.vcl.coverageformat2.patch
-%patch43 -p0 -b .workspace.vcl106.patch
-%patch44 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
-%patch45 -p0 -b .workspace.dba32h.patch
-%patch46 -p0 -b .officecfg.default-font-for-si-locale.patch
-%patch47 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
+%patch42 -p0 -b .workspace.vcl106.patch
+%patch43 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
+%patch44 -p0 -b .workspace.dba32h.patch
+%patch45 -p0 -b .officecfg.default-font-for-si-locale.patch
+%patch46 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
workspace.vcl106.patch:
unx/gtk/a11y/atkutil.cxx | 13 ++++++++++---
vcl/source/fontsubset/gsub.cxx | 10 ++++++++--
vcl/source/glyphs/gcach_ftyp.cxx | 11 +++++++++--
3 files changed, 27 insertions(+), 7 deletions(-)
Index: workspace.vcl106.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl106.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.vcl106.patch 10 Oct 2009 15:48:48 -0000 1.2
+++ workspace.vcl106.patch 13 Oct 2009 14:06:00 -0000 1.3
@@ -34,3 +34,47 @@
{
g_warning( "Exception caught processing menu highlight events" );
}
+diff -ru vcl.orig/source/glyphs/gcach_ftyp.cxx vcl/source/glyphs/gcach_ftyp.cxx
+--- vcl.orig/source/glyphs/gcach_ftyp.cxx 2009-09-30 09:56:24.000000000 +0100
++++ vcl/source/glyphs/gcach_ftyp.cxx 2009-09-30 14:27:39.000000000 +0100
+@@ -2509,10 +2509,17 @@
+ {
+ const USHORT nGlyph0 = GetUShort( pCoverage+0 );
+ const USHORT nGlyph1 = GetUShort( pCoverage+2 );
+- const USHORT nCovIdx = GetUShort( pCoverage+4 );
++ const USHORT nStartCoverageIndex = GetUShort( pCoverage+4 );
+ pCoverage += 6;
+ for( USHORT j = nGlyph0; j <= nGlyph1; ++j )
+- aSubstVector.push_back( GlyphSubst( j + nCovIdx, 0 ) );
++ {
++ //http://www.microsoft.com/typography/otspec/CHAPTER2.htm
++ //Coverage Index (GlyphID) = StartCoverageIndex + GlyphID - Start GlyphID.
++ //e.g. http://qa.openoffice.org/issues/show_bug.cgi?id=92671
++ DBG_ASSERT(aSubstVector.size() == nStartCoverageIndex + j - nGlyph0, "coverage index mismatch");
++ (void)nStartCoverageIndex;
++ aSubstVector.push_back( GlyphSubst( j, 0 ) );
++ }
+ }
+ }
+ break;
+diff -ru vcl.orig/source/fontsubset/gsub.cxx vcl/source/fontsubset/gsub.cxx
+--- vcl.orig/source/fontsubset/gsub.cxx 2009-09-30 12:46:58.000000000 +0100
++++ vcl/source/fontsubset/gsub.cxx 2009-09-30 14:31:17.000000000 +0100
+@@ -282,9 +282,15 @@
+ {
+ const USHORT nGlyph0 = NEXT_UShort( pCoverage );
+ const USHORT nGlyph1 = NEXT_UShort( pCoverage );
+- const USHORT nCovIdx = NEXT_UShort( pCoverage );
++ const USHORT nStartCoverageIndex = NEXT_UShort( pCoverage );
+ for( USHORT j = nGlyph0; j <= nGlyph1; ++j )
+- aSubstVector.push_back( GlyphSubst( j + nCovIdx, 0 ) );
++ {
++ //http://www.microsoft.com/typography/otspec/CHAPTER2.htm
++ //Coverage Index (GlyphID) = StartCoverageIndex + GlyphID - Start GlyphID.
++ //e.g. #i92671#
++ (void)nStartCoverageIndex;
++ aSubstVector.push_back( GlyphSubst( j, 0 ) );
++ }
+ }
+ }
+ break;
--- openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch DELETED ---
More information about the fedora-extras-commits
mailing list