From 7754cecdb109da8d81659ab3e56492368d774518 Mon Sep 17 00:00:00 2001
From: Jan Horak <xhorak@fedoraproject.org>
Date: Mar 03 2009 12:32:17 +0000
Subject: Fix for rawhide build


---

diff --git a/thunderbird-pango.patch b/thunderbird-pango.patch
new file mode 100644
index 0000000..e8029d3
--- /dev/null
+++ b/thunderbird-pango.patch
@@ -0,0 +1,50 @@
+diff -upU8 thunderbird-3.0/mozilla/gfx/thebes/src/gfxPangoFonts.cpp.pango-fix thunderbird-3.0/mozilla/gfx/thebes/src/gfxPangoFonts.cpp
+--- thunderbird-3.0/mozilla/gfx/thebes/src/gfxPangoFonts.cpp.pango-fix	2009-03-03 12:04:16.000000000 +0100
++++ thunderbird-3.0/mozilla/gfx/thebes/src/gfxPangoFonts.cpp	2009-03-03 12:05:37.000000000 +0100
+@@ -1798,22 +1798,21 @@ gfx_pango_font_map_context_substitute(Pa
+     double size = pango_font_description_get_size(desc) / FLOAT_PANGO_SCALE;
+     gfxPangoFontGroup *fontGroup = GetFontGroup(context);
+     PRBool usePrinterFont = fontGroup && fontGroup->GetStyle()->printerFont;
+     PrepareSortPattern(pattern, size, 1.0, usePrinterFont);
+ }
+ 
+ static PangoFcFont *
+ gfx_pango_font_map_create_font(PangoFcFontMap *fontmap,
+-                               PangoContext *context,
+-                               const PangoFontDescription *desc,
+-                               FcPattern *pattern)
++                               PangoFcFontKey *fontkey)
+ {
++    const FcPattern *p_pattern = pango_fc_font_key_get_pattern(fontkey);
+     return PANGO_FC_FONT(g_object_new(GFX_TYPE_PANGO_FC_FONT,
+-                                      "pattern", pattern, NULL));
++                                      "pattern", p_pattern, NULL));
+ }
+ 
+ static void
+ gfx_pango_font_map_class_init(gfxPangoFontMapClass *klass)
+ {
+     // inherit GObjectClass::finalize from parent as this class adds no data.
+ 
+     PangoFontMapClass *fontmap_class = PANGO_FONT_MAP_CLASS (klass);
+@@ -1823,19 +1822,18 @@ gfx_pango_font_map_class_init(gfxPangoFo
+     fontmap_class->load_fontset = gfx_pango_font_map_load_fontset;
+     // inherit fontmap_class->shape_engine_type from PangoFcFontMap
+ 
+     PangoFcFontMapClass *fcfontmap_class = PANGO_FC_FONT_MAP_CLASS (klass);
+     fcfontmap_class->get_resolution = gfx_pango_font_map_get_resolution;
+     // context_key_* virtual functions are only necessary if we want to
+     // dynamically respond to changes in the screen cairo_font_options_t.
+ 
+-    // context_substitute and get_font are not likely to be used but
++    // get_font are not likely to be used but
+     //   implemented because the class makes them available.
+-    fcfontmap_class->context_substitute = gfx_pango_font_map_context_substitute;
+     fcfontmap_class->create_font = gfx_pango_font_map_create_font;
+ }
+ 
+ /**
+  ** gfxPangoFontGroup
+  **/
+ 
+ struct FamilyCallbackData {
diff --git a/thunderbird.spec b/thunderbird.spec
index b239d70..27fb006 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -3,7 +3,6 @@
 %define nss_version 3.10
 %define cairo_version 1.0
 %define dbus_glib_version 0.6
-%define autoconf_version 2.13
 
 %define official_branding 1
 
@@ -33,6 +32,7 @@ Source100:      find-external-requires
 Patch1:         mozilla-jemalloc.patch
 Patch2:         thunderbird-shared-error.patch
 Patch3:         xulrunner-elif.patch
+Patch4:         thunderbird-pango.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -51,7 +51,7 @@ Requires:       nss >= %{nss_version}
 %if 0%{?rhel} >= 5
 Requires:       launchmail
 %endif
-BuildRequires:  autoconf213 >= %{autoconf_version}
+BuildRequires:  autoconf213
 BuildRequires:  alsa-lib-devel
 BuildRequires:  libcurl-devel
 BuildRequires:  cairo-devel >= %{cairo_version}
@@ -86,6 +86,7 @@ Mozilla Thunderbird is a standalone mail and newsgroup client.
 %patch1 -p0 -b .jemalloc
 %patch2 -p1 -b .shared-error
 %patch3 -p0 -b .xulrunner-elif
+%patch4 -p1 -b .pango-fix
 
 %if %{official_branding}
 # Required by Mozilla Corporation