rpms/firefox/FC-6 firefox-1.5-pango-printing.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: caillon

Update of /cvs/dist/rpms/firefox/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv3370

Modified Files:
	firefox-1.5-pango-printing.patch 
Log Message:
Tweak behdad's patch; wrap #ifdef MOZ_MATHML around the math specific portions.


firefox-1.5-pango-printing.patch:
 config/system-headers               |    2 
 gfx/src/freetype/nsFreeType.cpp     |   18 
 gfx/src/freetype/nsFreeType.h       |    7 
 gfx/src/ps/Makefile.in              |   11 
 gfx/src/ps/mozilla-ps-decoder.cpp   |  376 ++++++
 gfx/src/ps/mozilla-ps-decoder.h     |   72 +
 gfx/src/ps/nsDeviceContextPS.cpp    |   56 
 gfx/src/ps/nsFontMetricsPS.cpp      |  303 ++++-
 gfx/src/ps/nsFontMetricsPS.h        |   68 +
 gfx/src/ps/nsFontMetricsPSPango.cpp | 2107 ++++++++++++++++++++++++++++++++++++
 gfx/src/ps/nsFontMetricsPSPango.h   |  305 +++++
 gfx/src/ps/nsPostScriptObj.cpp      |   91 +
 gfx/src/ps/nsPostScriptObj.h        |   32 
 gfx/src/ps/nsRenderingContextPS.cpp |  206 ---
 gfx/src/ps/nsRenderingContextPS.h   |   11 
 gfx/src/ps/nsType1.cpp              |  261 +++-
 gfx/src/ps/nsType1.h                |    3 
 17 files changed, 3611 insertions(+), 318 deletions(-)

Index: firefox-1.5-pango-printing.patch
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-6/firefox-1.5-pango-printing.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-1.5-pango-printing.patch	27 Oct 2006 18:06:20 -0000	1.1
+++ firefox-1.5-pango-printing.patch	27 Oct 2006 19:12:11 -0000	1.2
@@ -685,7 +685,7 @@
 diff -u -p -d -r1.57.16.2 nsFontMetricsPS.cpp
 --- gfx/src/ps/nsFontMetricsPS.cpp	7 May 2006 02:01:25 -0000	1.57.16.2
 +++ gfx/src/ps/nsFontMetricsPS.cpp	23 Oct 2006 17:37:11 -0000
-@@ -461,6 +461,239 @@ nsFontMetricsPS :: GetStringWidth(const 
+@@ -461,6 +461,240 @@ nsFontMetricsPS :: GetStringWidth(const 
    return NS_OK;
  }
  
@@ -904,6 +904,7 @@
 +  return NS_OK;
 +}
 +
++#ifdef MOZ_MATHML
 +nsresult
 +nsFontMetricsPS::GetBoundingMetrics(const char*        aString,
 +                                     PRUint32           aLength,
@@ -920,7 +921,7 @@
 +{
 +  return NS_ERROR_NOT_IMPLEMENTED;
 +}
-+
++#endif /* MOZ_MATHML */
 +
  nsFontPS*
  nsFontPS::FindFont(char aChar, const nsFont& aFont,