rpms/thunderbird/FC-5 firefox-1.5-pango-printing.patch,1.2,1.3
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Jan 2 17:01:29 UTC 2007
Author: caillon
Update of /cvs/dist/rpms/thunderbird/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3193
Modified Files:
firefox-1.5-pango-printing.patch
Log Message:
update patch to match fc6's version
firefox-1.5-pango-printing.patch:
config/system-headers | 3
gfx/src/freetype/nsFreeType.cpp | 18
gfx/src/freetype/nsFreeType.h | 7
gfx/src/gtk/mozilla-decoder.cpp | 71 +-
gfx/src/gtk/mozilla-decoder.h | 28
gfx/src/gtk/nsDeviceContextGTK.cpp | 4
gfx/src/gtk/nsFontMetricsPango.cpp | 1226 ++++++++++++++++++++++++------------
gfx/src/gtk/nsFontMetricsPango.h | 160 +++-
gfx/src/gtk/nsFontMetricsUtils.cpp | 21
gfx/src/ps/Makefile.in | 12
gfx/src/ps/nsDeviceContextPS.cpp | 56 +
gfx/src/ps/nsFontMetricsPS.cpp | 309 ++++++++-
gfx/src/ps/nsFontMetricsPS.h | 68 +
gfx/src/ps/nsPostScriptObj.cpp | 124 +++
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
19 files changed, 1789 insertions(+), 831 deletions(-)
Index: firefox-1.5-pango-printing.patch
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/FC-5/firefox-1.5-pango-printing.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- firefox-1.5-pango-printing.patch 20 Dec 2006 23:02:32 -0000 1.2
+++ firefox-1.5-pango-printing.patch 2 Jan 2007 17:01:21 -0000 1.3
@@ -1,5 +1,5 @@
---- mozilla/gfx/src/freetype/nsFreeType.h.pango-printing 2006-12-01 16:23:21.000000000 -0500
-+++ mozilla/gfx/src/freetype/nsFreeType.h 2006-12-01 16:26:46.000000000 -0500
+--- mozilla/gfx/src/freetype/nsFreeType.h.pango-printing 2005-05-01 13:36:19.000000000 -0400
++++ mozilla/gfx/src/freetype/nsFreeType.h 2006-12-19 15:08:21.000000000 -0500
@@ -52,6 +52,7 @@
#include FT_CACHE_H
#include FT_CACHE_IMAGE_H
@@ -32,8 +32,8 @@
// #else
// static FtFuncList FtFuncs[20];
// #endif
---- mozilla/gfx/src/freetype/nsFreeType.cpp.pango-printing 2006-12-01 16:23:21.000000000 -0500
-+++ mozilla/gfx/src/freetype/nsFreeType.cpp 2006-12-01 16:26:46.000000000 -0500
+--- mozilla/gfx/src/freetype/nsFreeType.cpp.pango-printing 2005-07-13 14:21:10.000000000 -0400
++++ mozilla/gfx/src/freetype/nsFreeType.cpp 2006-12-19 15:08:21.000000000 -0500
@@ -123,6 +123,8 @@
// #endif
{"FT_Get_First_Char", NS_FT2_OFFSET(nsFT_Get_First_Char), PR_FALSE},
@@ -66,8 +66,8 @@
nsFreeType2::SupportsExtFunc(PRBool *res)
{
*res = gHasExtFunc;
---- mozilla/gfx/src/gtk/nsDeviceContextGTK.cpp.pango-printing 2006-12-01 16:23:10.000000000 -0500
-+++ mozilla/gfx/src/gtk/nsDeviceContextGTK.cpp 2006-12-01 16:26:35.000000000 -0500
+--- mozilla/gfx/src/gtk/nsDeviceContextGTK.cpp.pango-printing 2004-12-17 15:36:28.000000000 -0500
++++ mozilla/gfx/src/gtk/nsDeviceContextGTK.cpp 2006-12-19 15:08:21.000000000 -0500
@@ -576,8 +576,10 @@
// Create a Postscript device context
nsCOMPtr<nsIDeviceContextPS> dcps(do_CreateInstance(kCDeviceContextPS, &rv));
@@ -80,8 +80,8 @@
rv = dcps->SetSpec(aDevice);
if (NS_FAILED(rv))
---- mozilla/gfx/src/gtk/mozilla-decoder.h.pango-printing 2006-12-01 16:23:10.000000000 -0500
-+++ mozilla/gfx/src/gtk/mozilla-decoder.h 2006-12-01 16:26:35.000000000 -0500
+--- mozilla/gfx/src/gtk/mozilla-decoder.h.pango-printing 2004-09-22 15:53:45.000000000 -0400
++++ mozilla/gfx/src/gtk/mozilla-decoder.h 2006-12-19 15:08:21.000000000 -0500
@@ -39,33 +39,15 @@
#ifndef _MOZILLA_DECODER_H
#define _MOZILLA_DECODER_H
@@ -121,8 +121,8 @@
G_END_DECLS
---- mozilla/gfx/src/gtk/nsFontMetricsUtils.cpp.pango-printing 2006-12-01 16:23:10.000000000 -0500
-+++ mozilla/gfx/src/gtk/nsFontMetricsUtils.cpp 2006-12-01 16:26:35.000000000 -0500
+--- mozilla/gfx/src/gtk/nsFontMetricsUtils.cpp.pango-printing 2005-03-27 21:14:17.000000000 -0500
++++ mozilla/gfx/src/gtk/nsFontMetricsUtils.cpp 2006-12-19 15:08:21.000000000 -0500
@@ -143,11 +143,24 @@
PRBool
NS_IsPangoEnabled(void)
@@ -152,8 +152,8 @@
}
#endif
---- mozilla/gfx/src/gtk/nsFontMetricsPango.h.pango-printing 2006-12-01 16:23:10.000000000 -0500
-+++ mozilla/gfx/src/gtk/nsFontMetricsPango.h 2006-12-01 16:26:35.000000000 -0500
+--- mozilla/gfx/src/gtk/nsFontMetricsPango.h.pango-printing 2005-05-02 16:48:30.000000000 -0400
++++ mozilla/gfx/src/gtk/nsFontMetricsPango.h 2006-12-19 15:08:21.000000000 -0500
@@ -37,17 +37,53 @@
*
* ***** END LICENSE BLOCK ***** */
@@ -427,8 +427,8 @@
};
class nsFontEnumeratorPango : public nsIFontEnumerator
---- mozilla/gfx/src/gtk/mozilla-decoder.cpp.pango-printing 2006-12-01 16:23:10.000000000 -0500
-+++ mozilla/gfx/src/gtk/mozilla-decoder.cpp 2006-12-01 16:31:12.000000000 -0500
+--- mozilla/gfx/src/gtk/mozilla-decoder.cpp.pango-printing 2006-12-19 15:08:21.000000000 -0500
++++ mozilla/gfx/src/gtk/mozilla-decoder.cpp 2006-12-19 15:08:21.000000000 -0500
@@ -36,14 +36,11 @@
*
* ***** END LICENSE BLOCK ***** */
@@ -586,8 +586,8 @@
mozilla_find_decoder (FcPattern *pattern, gpointer user_data)
{
// Compare the family name of the font that's been opened to see
---- mozilla/gfx/src/gtk/nsFontMetricsPango.cpp.pango-printing 2006-12-01 16:23:10.000000000 -0500
-+++ mozilla/gfx/src/gtk/nsFontMetricsPango.cpp 2006-12-01 16:31:21.000000000 -0500
+--- mozilla/gfx/src/gtk/nsFontMetricsPango.cpp.pango-printing 2006-12-19 15:08:21.000000000 -0500
++++ mozilla/gfx/src/gtk/nsFontMetricsPango.cpp 2006-12-19 15:08:21.000000000 -0500
@@ -21,6 +21,8 @@
* are Copyright (C) 2004 the Initial Developer. All Rights Reserved.
*
@@ -2256,8 +2256,8 @@
/* static */
PangoLanguage *
GetPangoLanguage(nsIAtom *aLangGroup)
---- mozilla/gfx/src/ps/nsFontMetricsPS.h.pango-printing 2006-12-01 16:23:16.000000000 -0500
-+++ mozilla/gfx/src/ps/nsFontMetricsPS.h 2006-12-01 16:26:27.000000000 -0500
+--- mozilla/gfx/src/ps/nsFontMetricsPS.h.pango-printing 2005-06-28 14:29:10.000000000 -0400
++++ mozilla/gfx/src/ps/nsFontMetricsPS.h 2006-12-19 15:08:21.000000000 -0500
@@ -66,6 +66,7 @@
#endif
#include "nsVoidArray.h"
@@ -2352,8 +2352,8 @@
};
---- mozilla/gfx/src/ps/nsRenderingContextPS.h.pango-printing 2006-12-01 16:23:16.000000000 -0500
-+++ mozilla/gfx/src/ps/nsRenderingContextPS.h 2006-12-01 16:26:27.000000000 -0500
+--- mozilla/gfx/src/ps/nsRenderingContextPS.h.pango-printing 2004-09-20 02:46:16.000000000 -0400
++++ mozilla/gfx/src/ps/nsRenderingContextPS.h 2006-12-19 15:08:21.000000000 -0500
@@ -154,6 +154,10 @@
NS_IMETHOD GetWidth(const PRUnichar* aString, PRUint32 aLength,
nscoord& aWidth, PRInt32 *aFontID);
@@ -2379,8 +2379,8 @@
public:
NS_IMETHOD GetTextDimensions(const char* aString, PRUint32 aLength,
---- mozilla/gfx/src/ps/nsPostScriptObj.cpp.pango-printing 2006-12-01 16:23:16.000000000 -0500
-+++ mozilla/gfx/src/ps/nsPostScriptObj.cpp 2006-12-01 16:26:27.000000000 -0500
+--- mozilla/gfx/src/ps/nsPostScriptObj.cpp.pango-printing 2005-07-26 11:54:18.000000000 -0400
++++ mozilla/gfx/src/ps/nsPostScriptObj.cpp 2006-12-19 15:08:21.000000000 -0500
@@ -47,6 +47,10 @@
* 10/09/2000 IPLabs Linux Team True Unicode glyps support added.
*/
@@ -2541,9 +2541,9 @@
* @update 2/1/99 dwc
*/
void
---- mozilla/gfx/src/ps/nsFontMetricsPS.cpp.pango-printing 2006-12-01 16:23:16.000000000 -0500
-+++ mozilla/gfx/src/ps/nsFontMetricsPS.cpp 2006-12-01 16:26:27.000000000 -0500
-@@ -461,6 +461,239 @@
+--- mozilla/gfx/src/ps/nsFontMetricsPS.cpp.pango-printing 2006-10-06 13:26:54.000000000 -0400
++++ mozilla/gfx/src/ps/nsFontMetricsPS.cpp 2006-12-19 15:14:43.000000000 -0500
+@@ -461,6 +461,240 @@
return NS_OK;
}
@@ -2762,6 +2762,7 @@
+ return NS_OK;
+}
+
++#ifdef MOZ_MATHML
+nsresult
+nsFontMetricsPS::GetBoundingMetrics(const char* aString,
+ PRUint32 aLength,
@@ -2778,12 +2779,12 @@
+{
+ return NS_ERROR_NOT_IMPLEMENTED;
+}
-+
++#endif
+
nsFontPS*
nsFontPS::FindFont(char aChar, const nsFont& aFont,
nsFontMetricsPS* aFontMetrics)
-@@ -986,10 +1219,6 @@
+@@ -986,10 +1220,6 @@
result = FcPatternGetCharSet(set->fonts[i], FC_CHARSET, 0, &fc_charset);
if (result != FcResultMatch || fc_charset == nsnull)
continue;
@@ -2794,7 +2795,7 @@
nsXftEntry *xftEntry = new nsXftEntry(set->fonts[i]);
if (!xftEntry)
-@@ -997,7 +1226,7 @@
+@@ -997,7 +1227,7 @@
fontps *fps = new fontps;
fps->entry = xftEntry;
@@ -2803,7 +2804,7 @@
fps->fontps = nsnull;
fpi.fontps->AppendElement(fps);
}
-@@ -1132,23 +1361,38 @@
+@@ -1132,23 +1362,38 @@
PRUint32 start = 0;
PRUint32 i;
@@ -2848,7 +2849,7 @@
return GetWidth(aString, aLength);
}
-@@ -2282,10 +2526,13 @@
+@@ -2282,10 +2527,13 @@
// Implementation of nsPSFontGenerator
nsPSFontGenerator::nsPSFontGenerator()
{
@@ -2862,7 +2863,7 @@
}
void nsPSFontGenerator::GeneratePSFont(FILE* aFile)
-@@ -2293,24 +2540,29 @@
+@@ -2293,24 +2541,29 @@
NS_ERROR("should never call nsPSFontGenerator::GeneratePSFont");
}
@@ -2903,7 +2904,7 @@
}
#ifdef MOZ_ENABLE_XFT
-@@ -2336,8 +2588,8 @@
+@@ -2336,8 +2589,8 @@
nsXftType1Generator::~nsXftType1Generator()
{
@@ -2914,7 +2915,7 @@
if (FT_Done_FreeType(mFreeTypeLibrary))
return;
-@@ -2357,8 +2609,8 @@
+@@ -2357,8 +2610,8 @@
}
int wmode = 0;
@@ -2925,7 +2926,7 @@
}
#else
-@@ -2406,8 +2658,8 @@
+@@ -2406,8 +2659,8 @@
return;
int wmode = 0;
@@ -2936,8 +2937,8 @@
}
#endif //MOZ_ENABLE_FREETYPE2
---- mozilla/gfx/src/ps/nsPostScriptObj.h.pango-printing 2006-12-01 16:23:16.000000000 -0500
-+++ mozilla/gfx/src/ps/nsPostScriptObj.h 2006-12-01 16:26:27.000000000 -0500
+--- mozilla/gfx/src/ps/nsPostScriptObj.h.pango-printing 2005-05-08 11:01:20.000000000 -0400
++++ mozilla/gfx/src/ps/nsPostScriptObj.h 2006-12-19 15:08:21.000000000 -0500
@@ -57,9 +57,15 @@
#include "nsIPersistentProperties2.h"
#include "nsTempfilePS.h"
@@ -2997,8 +2998,8 @@
/** ---------------------------------------------------
* set the clipping path to the current path using the winding rule
* @update 2/1/99 dwc
---- mozilla/gfx/src/ps/nsType1.h.pango-printing 2006-12-01 16:23:16.000000000 -0500
-+++ mozilla/gfx/src/ps/nsType1.h 2006-12-01 16:26:27.000000000 -0500
+--- mozilla/gfx/src/ps/nsType1.h.pango-printing 2005-03-04 02:39:27.000000000 -0500
++++ mozilla/gfx/src/ps/nsType1.h 2006-12-19 15:08:21.000000000 -0500
@@ -122,8 +122,9 @@
class nsString;
@@ -3010,8 +3011,8 @@
int aWmode, FILE *aFile);
nsresult FT2ToType1FontName(FT_Face aFace, int aWmode,
nsCString& aFontName);
---- mozilla/gfx/src/ps/nsRenderingContextPS.cpp.pango-printing 2006-12-01 16:23:16.000000000 -0500
-+++ mozilla/gfx/src/ps/nsRenderingContextPS.cpp 2006-12-01 16:26:27.000000000 -0500
+--- mozilla/gfx/src/ps/nsRenderingContextPS.cpp.pango-printing 2005-03-04 02:39:27.000000000 -0500
++++ mozilla/gfx/src/ps/nsRenderingContextPS.cpp 2006-12-19 15:08:21.000000000 -0500
@@ -251,6 +251,8 @@
NS_IMETHODIMP
nsRenderingContextPS :: GetHints(PRUint32& aResult)
@@ -3279,8 +3280,8 @@
}
#endif /* MOZ_MATHML */
---- mozilla/gfx/src/ps/Makefile.in.pango-printing 2006-12-01 16:25:26.000000000 -0500
-+++ mozilla/gfx/src/ps/Makefile.in 2006-12-01 16:26:27.000000000 -0500
+--- mozilla/gfx/src/ps/Makefile.in.pango-printing 2005-03-04 02:39:27.000000000 -0500
++++ mozilla/gfx/src/ps/Makefile.in 2006-12-19 15:08:21.000000000 -0500
@@ -98,13 +98,23 @@
$(MOZ_UNICHARUTIL_LIBS) \
$(NULL)
@@ -3306,8 +3307,8 @@
CPPSRCS += \
nsType1.cpp \
$(NULL)
---- mozilla/gfx/src/ps/nsType1.cpp.pango-printing 2006-12-01 16:23:16.000000000 -0500
-+++ mozilla/gfx/src/ps/nsType1.cpp 2006-12-01 16:26:27.000000000 -0500
+--- mozilla/gfx/src/ps/nsType1.cpp.pango-printing 2005-10-19 04:16:22.000000000 -0400
++++ mozilla/gfx/src/ps/nsType1.cpp 2006-12-19 15:08:21.000000000 -0500
@@ -73,8 +73,13 @@
#include "nsIFreeType2.h"
#include "nsServiceManagerUtils.h"
@@ -3781,8 +3782,8 @@
if (oLen >= 30) {
NS_WARNING("buffer size exceeded. charstring will be truncated");
---- mozilla/gfx/src/ps/nsDeviceContextPS.cpp.pango-printing 2006-12-01 16:23:16.000000000 -0500
-+++ mozilla/gfx/src/ps/nsDeviceContextPS.cpp 2006-12-01 16:26:27.000000000 -0500
+--- mozilla/gfx/src/ps/nsDeviceContextPS.cpp.pango-printing 2005-05-21 11:33:08.000000000 -0400
++++ mozilla/gfx/src/ps/nsDeviceContextPS.cpp 2006-12-19 15:08:21.000000000 -0500
@@ -58,12 +58,15 @@
#include "nsIPref.h"
#include "nsString.h"
@@ -3876,11 +3877,9 @@
return NS_OK;
}
-Index: mozilla/config/system-headers
-===================================================================
---- mozilla/config/system-headers 2006-10-26 12:21:39.000000000 -0400
-+++ mozilla/config/system-headers 2006-10-26 12:23:29.000000000 -0400
-@@ -180,6 +180,7 @@
+--- mozilla/config/system-headers.pango-printing 2006-11-14 16:04:44.000000000 -0500
++++ mozilla/config/system-headers 2006-12-19 15:48:24.000000000 -0500
+@@ -199,6 +199,7 @@
freetype/ftoutln.h
freetype/ttnameid.h
freetype/tttables.h
@@ -3888,7 +3887,15 @@
fribidi/fribidi.h
FSp_fopen.h
fstream.h
-@@ -484,6 +485,7 @@
+@@ -303,6 +304,7 @@
+ LaunchServices.h
+ LBroadcaster.h
+ LButton.h
++lber.h
+ lcache.h
+ LCaption.h
+ LCheckBox.h
+@@ -501,6 +503,7 @@
pango/pangofc-fontmap.h
pango/pango-fontmap.h
pango/pango.h
More information about the fedora-cvs-commits
mailing list