rpms/firefox/devel firefox-2.0-pango-printing.patch, 1.3, 1.4 firefox.spec, 1.164, 1.165

[fedora-cvs-commits at redhat.com]

Author: caillon

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

Modified Files:
	firefox-2.0-pango-printing.patch firefox.spec 
Log Message:
build fixes


firefox-2.0-pango-printing.patch:
 config/system-headers               |    3 
 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      |  298 ++++-
 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, 3609 insertions(+), 316 deletions(-)

Index: firefox-2.0-pango-printing.patch
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox-2.0-pango-printing.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- firefox-2.0-pango-printing.patch	22 Dec 2006 20:13:05 -0000	1.3
+++ firefox-2.0-pango-printing.patch	22 Dec 2006 22:18:17 -0000	1.4
@@ -4567,7 +4567,7 @@
 ===================================================================
 --- config/system-headers	2006-10-26 12:21:39.000000000 -0400
 +++ config/system-headers	2006-10-26 12:23:29.000000000 -0400
-@@ -180,6 +180,7 @@
+@@ -199,6 +199,7 @@
  freetype/ftoutln.h
  freetype/ttnameid.h
  freetype/tttables.h
@@ -4575,7 +4575,15 @@
  fribidi/fribidi.h
  FSp_fopen.h
  fstream.h
-@@ -484,6 +485,7 @@
+@@ -208,6 +209,7 @@
+ gdk/gdkevents.h
+ gdk/gdk.h
+ gdk/gdkkeysyms.h
++gdk/gdkpango.h
+ gdk/gdkprivate.h
+ gdk/gdkregion.h
+ gdk/gdkwindow.h
+@@ -501,6 +503,7 @@
  pango/pangofc-fontmap.h
  pango/pango-fontmap.h
  pango/pango.h
@@ -4583,3 +4591,4 @@
  pango/pangoxft.h
  pango/pangox.h
  pango-types.h
+


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- firefox.spec	22 Dec 2006 20:17:09 -0000	1.164
+++ firefox.spec	22 Dec 2006 22:18:17 -0000	1.165
@@ -140,19 +140,19 @@
 #%patch5  -p1 -b .visibility
 
 #%patch20 -p0
-%patch21 -p1
-%patch22 -p0
+%patch21 -p1 -b .psfonts
+%patch22 -p0 -b .default-applications
 #%patch23 -p0
 #%patch24 -p0
 #%patch25 -p0
 #%patch26 -p0
 #%patch27 -p1
-%patch40 -p1
-%patch42 -p0
-%patch81 -p1
-#%patch82 -p1
-%patch83 -p1
-%patch84 -p0
+%patch40 -p1 -b .bullet-bill
+%patch42 -p0 -b .uriloader
+%patch81 -p1 -b .nopangoxft
+#%patch82 -p1 -b .pango-mathml
+%patch83 -p1 -b .pango-cursor-position
+%patch84 -p0 -b .pango-printing
 
 #%patch100 -p0 -b .gtk-key-theme-crash
 %patch101 -p0 -b .embedwindow-visibility