rpms/mozilla/devel firefox-nopangoxft.patch, NONE, 1.1 mozilla.spec, 1.74, 1.75

[fedora-cvs-commits at redhat.com]

Author: krh

Update of /cvs/dist/rpms/mozilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18519

Modified Files:
	mozilla.spec 
Added Files:
	firefox-nopangoxft.patch 
Log Message:
Add firefox-nopangoxft.patch so this thing works.

firefox-nopangoxft.patch:
 mozilla-decoder.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE firefox-nopangoxft.patch ---
--- mozilla/gfx/src/gtk/mozilla-decoder.cpp.noxft	2005-08-18 22:41:26.000000000 -0400
+++ mozilla/gfx/src/gtk/mozilla-decoder.cpp	2005-08-18 22:38:01.000000000 -0400
@@ -40,7 +40,7 @@
 #define PANGO_ENABLE_ENGINE
 
 #include "mozilla-decoder.h"
-#include <pango/pangoxft.h>
+#include <pango/pangocairo.h>
 #include <pango/pangofc-fontmap.h>
 #include <pango/pangofc-font.h>
 #include <gdk/gdkx.h>
@@ -208,7 +208,7 @@
         }
     }
 
-    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())),
+    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()),
                                             mozilla_find_decoder,
                                             NULL,
                                             NULL);


Index: mozilla.spec
===================================================================
RCS file: /cvs/dist/rpms/mozilla/devel/mozilla.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- mozilla.spec	15 Aug 2005 22:11:19 -0000	1.74
+++ mozilla.spec	2 Sep 2005 01:47:10 -0000	1.75
@@ -10,7 +10,7 @@
 Name:        mozilla
 Summary:     Web browser and mail reader
 Version:     1.7.11
-Release:     2
+Release:     3
 Epoch:       37
 License:     MPL/NPL/GPL/LGPL
 Source0:     mozilla-%{version}-source.tar.bz2
@@ -799,6 +799,9 @@
 %{mozdir}/xpt_link
 
 %changelog
+* Thu Sep  1 2005 Kristian Høgsberg <krh at redhat.com> 37:1.7.11-3
+- Add firefox-nopangoxft.patch so this thing works.
+
 * Sun Aug 14 2005 Christopher Aillon <caillon at redhat.com> 37:1.7.11-2
 - Build with $RPM_OPT_FLAGS