From 4e32e4a5907e408051915941cb1aefe85f315790 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Nov 15 2007 15:14:09 +0000 Subject: - Update to 2.0.0.9 --- diff --git a/.cvsignore b/.cvsignore index e631b7b..2394c8a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -thunderbird-2.0.0.5-source.tar.bz2 -thunderbird-langpacks-2.0.0.5-20070720.tar.bz2 +thunderbird-2.0.0.9-source.tar.bz2 +thunderbird-langpacks-2.0.0.9-20071115.tar.bz2 diff --git a/firefox-1.5-nopangoxft.patch b/firefox-1.5-nopangoxft.patch deleted file mode 100644 index 009a1fb..0000000 --- a/firefox-1.5-nopangoxft.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- mozilla/gfx/src/gtk/mozilla-decoder.cpp.noxft 2004-11-07 18:59:23.000000000 -0500 -+++ mozilla/gfx/src/gtk/mozilla-decoder.cpp 2006-08-06 18:24:37.000000000 -0400 -@@ -40,10 +40,9 @@ - #define PANGO_ENABLE_ENGINE - - #include "mozilla-decoder.h" --#include - #include - #include --#include -+#include - - #include "nsString.h" - #include "nsIPersistentProperties2.h" -@@ -145,6 +144,13 @@ mozilla_decoders_init(void) - if (initialized) - return 0; - -+ PangoContext* context = gdk_pango_context_get (); -+ PangoFontMap* fontmap = pango_context_get_font_map (context); -+ g_object_unref (context); -+ -+ if (!PANGO_IS_FC_FONT_MAP (fontmap)) -+ return -1; -+ - encoder_hash = g_hash_table_new(g_str_hash, g_str_equal); - cmap_hash = g_hash_table_new(g_str_hash, g_str_equal); - wide_hash = g_hash_table_new(g_str_hash, g_str_equal); -@@ -208,7 +214,7 @@ mozilla_decoders_init(void) - } - } - -- 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(fontmap), - mozilla_find_decoder, - NULL, - NULL); diff --git a/sources b/sources index 83dd3a9..9dd9fc2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -9ce0b2381e500e9822ae1e7b8871a147 thunderbird-2.0.0.5-source.tar.bz2 -74f265971b0a882453939713cf00110a thunderbird-langpacks-2.0.0.5-20070720.tar.bz2 +a6dd74f87dafc7516e7970ecefee046b thunderbird-2.0.0.9-source.tar.bz2 +5abe9f6d6b292adaa4283cd001781ae8 thunderbird-langpacks-2.0.0.9-20071115.tar.bz2 diff --git a/thunderbird.spec b/thunderbird.spec index bfc3a76..4ce7d94 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -7,8 +7,8 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 2.0.0.5 -Release: 2%{?dist} +Version: 2.0.0.9 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPL Group: Applications/Internet @@ -18,7 +18,7 @@ Group: Applications/Internet %define tarball thunderbird-2.0.0.0rc1-source.tar.bz2 %endif Source0: %{tarball} -Source1: thunderbird-langpacks-%{version}-20070720.tar.bz2 +Source1: thunderbird-langpacks-%{version}-20071115.tar.bz2 Source10: thunderbird-mozconfig Source11: thunderbird-mozconfig-branded Source12: thunderbird-redhat-default-prefs.js @@ -45,7 +45,6 @@ Patch41: firefox-2.0.0.4-undo-uriloader.patch Patch42: firefox-1.1-uriloader.patch # font system fixes -Patch81: firefox-1.5-nopangoxft.patch Patch82: firefox-1.5-pango-mathml.patch Patch83: firefox-1.5-pango-cursor-position.patch Patch84: firefox-2.0-pango-printing.patch @@ -115,7 +114,6 @@ Mozilla Thunderbird is a standalone mail and newsgroup client. %patch42 -p0 # font system fixes -%patch81 -p1 -b .nopangoxft #%patch82 -p1 -b .pango-mathml %patch83 -p1 -b .pango-cursor-position %patch84 -p0 -b .pango-printing @@ -305,6 +303,9 @@ update-desktop-database %{_datadir}/applications #=============================================================================== %changelog +* Thu Nov 15 2007 Christopher Aillon 2.0.0.9-1 +- Update to 2.0.0.9 + * Wed Jul 25 2007 Martin Stransky 2.0.0.5-2 - added ligature pango fix