- Added fix for #437596

- Removed unused patches

thunderbird-pango.patch

@@ -1,50 +0,0 @@
-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 {

thunderbird.sh.in

@@ -40,6 +40,11 @@ MOZ_PROGRAM="$MOZ_DIST_BIN/thunderbird"
 #MOZ_DISABLE_PANGO=1
 #export MOZ_DISABLE_PANGO
 
+##
+## Set MOZ_APP_LAUNCHER for gnome-session
+##
+export MOZ_APP_LAUNCHER="/usr/bin/thunderbird"
+
 ##
 ## Disable the GNOME crash dialog, Moz has it's own
 ## 

thunderbird.spec

@@ -12,7 +12,7 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        3.0
-Release:        3.7.b3%{?dist}
+Release:        3.8.b3%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -36,8 +36,6 @@ 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
@@ -98,8 +96,6 @@ 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
@@ -301,6 +297,10 @@ fi
 #===============================================================================
 
 %changelog
+* Thu Aug  6 2009 Martin Stransky <stransky@redhat.com> - 3.0-3.8.beta3
+- Added fix for #437596
+- Removed unused patches
+
 * Thu Aug  6 2009 Jan Horak <jhorak@redhat.com> - 3.0-3.7.beta3
 - Removed unused build requirements
 

xulrunner-elif.patch

@@ -1,12 +0,0 @@
-diff -up mozilla/toolkit/xre/nsAppRunner.cpp.old mozilla/toolkit/xre/nsAppRunner.cpp
---- mozilla/toolkit/xre/nsAppRunner.cpp.old	2008-12-10 20:07:01.000000000 +0100
-+++ mozilla/toolkit/xre/nsAppRunner.cpp	2009-02-27 17:17:59.000000000 +0100
-@@ -1475,7 +1475,7 @@ XRE_GetBinaryPath(const char* argv0, nsI
-   if (NS_FAILED(rv))
-     return rv;
- 
--#elif
-+#else
- #error Oops, you need platform-specific code here
- #endif
-