From 1097999394d01a77e9b903f5a132c00a8b32bdad Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Nov 25 2009 11:02:54 +0000 Subject: Sync with Mozilla latest RC1 build --- diff --git a/.cvsignore b/.cvsignore index 4ccf485..fcb369a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -5,3 +5,4 @@ thunderbird-3.0b4-source.tar.bz2 thunderbird-langpacks-3.0b4-20090917.tar.bz2 thunderbird-3.0rc1.source.tar.bz2 thunderbird-langpacks-3.0rc1-20091118.tar.bz2 +thunderbird-langpacks-3.0rc1-20091125.tar.bz2 diff --git a/sources b/sources index 3d3c461..e93e1b2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f9da82698c8171a4cf68bdd234065844 thunderbird-3.0rc1.source.tar.bz2 -70d5100c83a6b188bc6bbc5284682aed thunderbird-langpacks-3.0rc1-20091118.tar.bz2 +49028d9de4c4e167d469bbd4c6665b8c thunderbird-3.0rc1.source.tar.bz2 +a25c36e9320f3a16a10e3141ceed841d thunderbird-langpacks-3.0rc1-20091125.tar.bz2 diff --git a/thunderbird-clipboard-crash.patch b/thunderbird-clipboard-crash.patch new file mode 100644 index 0000000..d2861b8 --- /dev/null +++ b/thunderbird-clipboard-crash.patch @@ -0,0 +1,116 @@ +diff -r 7f1f309a34f8 widget/src/gtk2/nsClipboard.cpp +--- a/mozilla/widget/src/gtk2/nsClipboard.cpp Thu Oct 22 12:45:52 2009 +0800 ++++ b/mozilla/widget/src/gtk2/nsClipboard.cpp Fri Nov 13 11:19:27 2009 +0100 +@@ -424,25 +424,25 @@ nsClipboard::HasDataMatchingFlavors(cons + for (PRUint32 i = 0; i < aLength && !*_retval; i++) { + // We special case text/unicode here. + if (!strcmp(aFlavorList[i], kUnicodeMime) && + gtk_selection_data_targets_include_text(selection_data)) { + *_retval = PR_TRUE; + break; + } + + for (PRInt32 j = 0; j < n_targets; j++) { + gchar *atom_name = gdk_atom_name(targets[j]); +- if (!strcmp(atom_name, aFlavorList[i])) ++ if (!g_strcmp0(atom_name, aFlavorList[i])) + *_retval = PR_TRUE; + + // X clipboard wants image/jpeg, not image/jpg +- if (!strcmp(aFlavorList[i], kJPEGImageMime) && !strcmp(atom_name, "image/jpeg")) ++ if (!g_strcmp0(aFlavorList[i], kJPEGImageMime) && !g_strcmp0(atom_name, "image/jpeg")) + *_retval = PR_TRUE; + + g_free(atom_name); + + if (*_retval) + break; + } + } + gtk_selection_data_free(selection_data); + g_free(targets); +diff -r 7f1f309a34f8 widget/src/gtk2/nsDragService.cpp +--- a/mozilla/widget/src/gtk2/nsDragService.cpp Thu Oct 22 12:45:52 2009 +0800 ++++ b/mozilla/widget/src/gtk2/nsDragService.cpp Fri Nov 13 11:19:27 2009 +0100 +@@ -824,50 +824,47 @@ nsDragService::IsDataFlavorSupported(con + + // check the target context vs. this flavor, one at a time + GList *tmp; + for (tmp = mTargetDragContext->targets; tmp; tmp = tmp->next) { + /* Bug 331198 */ + GdkAtom atom = GDK_POINTER_TO_ATOM(tmp->data); + gchar *name = NULL; + name = gdk_atom_name(atom); + PR_LOG(sDragLm, PR_LOG_DEBUG, + ("checking %s against %s\n", name, aDataFlavor)); +- if (name && (strcmp(name, aDataFlavor) == 0)) { ++ if (g_strcmp0(name, aDataFlavor) == 0) { + PR_LOG(sDragLm, PR_LOG_DEBUG, ("good!\n")); + *_retval = PR_TRUE; + } + // check for automatic text/uri-list -> text/x-moz-url mapping + if (*_retval == PR_FALSE && +- name && +- (strcmp(name, gTextUriListType) == 0) && +- (strcmp(aDataFlavor, kURLMime) == 0)) { ++ (g_strcmp0(name, gTextUriListType) == 0) && ++ (g_strcmp0(aDataFlavor, kURLMime) == 0)) { + PR_LOG(sDragLm, PR_LOG_DEBUG, + ("good! ( it's text/uri-list and \ + we're checking against text/x-moz-url )\n")); + *_retval = PR_TRUE; + } + // check for automatic _NETSCAPE_URL -> text/x-moz-url mapping + if (*_retval == PR_FALSE && +- name && +- (strcmp(name, gMozUrlType) == 0) && +- (strcmp(aDataFlavor, kURLMime) == 0)) { ++ (g_strcmp0(name, gMozUrlType) == 0) && ++ (g_strcmp0(aDataFlavor, kURLMime) == 0)) { + PR_LOG(sDragLm, PR_LOG_DEBUG, + ("good! ( it's _NETSCAPE_URL and \ + we're checking against text/x-moz-url )\n")); + *_retval = PR_TRUE; + } + // check for auto text/plain -> text/unicode mapping + if (*_retval == PR_FALSE && +- name && +- (strcmp(name, kTextMime) == 0) && +- ((strcmp(aDataFlavor, kUnicodeMime) == 0) || +- (strcmp(aDataFlavor, kFileMime) == 0))) { ++ (g_strcmp0(name, kTextMime) == 0) && ++ ((g_strcmp0(aDataFlavor, kUnicodeMime) == 0) || ++ (g_strcmp0(aDataFlavor, kFileMime) == 0))) { + PR_LOG(sDragLm, PR_LOG_DEBUG, + ("good! ( it's text plain and we're checking \ + against text/unicode or application/x-moz-file)\n")); + *_retval = PR_TRUE; + } + g_free(name); + } + return NS_OK; + } + +@@ -974,21 +971,21 @@ nsDragService::IsTargetContextList(void) + + GList *tmp; + + // walk the list of context targets and see if one of them is a list + // of items. + for (tmp = mTargetDragContext->targets; tmp; tmp = tmp->next) { + /* Bug 331198 */ + GdkAtom atom = GDK_POINTER_TO_ATOM(tmp->data); + gchar *name = NULL; + name = gdk_atom_name(atom); +- if (strcmp(name, gMimeListType) == 0) ++ if (g_strcmp0(name, gMimeListType) == 0) + retval = PR_TRUE; + g_free(name); + if (retval) + break; + } + return retval; + } + + // Maximum time to wait for a "drag_received" arrived, in microseconds + #define NS_DND_TIMEOUT 500000 diff --git a/thunderbird-debuginfo-fix-include.patch b/thunderbird-debuginfo-fix-include.patch new file mode 100644 index 0000000..843a46a --- /dev/null +++ b/thunderbird-debuginfo-fix-include.patch @@ -0,0 +1,33 @@ +diff -up comm-central/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc.include comm-central/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc +--- comm-central/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc.include 2009-09-16 02:57:07.000000000 +0200 ++++ comm-central/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc 2009-10-12 09:47:59.000000000 +0200 +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + #include + #include +diff -up comm-central/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc.include comm-central/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc +--- comm-central/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc.include 2009-09-16 02:57:07.000000000 +0200 ++++ comm-central/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc 2009-10-12 09:47:59.000000000 +0200 +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + + #include + #include +diff -up comm-central/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc.include comm-central/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc +--- comm-central/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc.include 2009-09-16 02:57:07.000000000 +0200 ++++ comm-central/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2009-10-12 10:09:56.000000000 +0200 +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/thunderbird-mozconfig b/thunderbird-mozconfig index ae76851..3df47c0 100644 --- a/thunderbird-mozconfig +++ b/thunderbird-mozconfig @@ -1,5 +1,3 @@ -#export CFLAGS=-gstabs+ -#export CXXFLAGS=-gstabs+ mk_add_options MOZ_CO_PROJECT=mail ac_add_options --enable-application=mail mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir-tb/ @@ -29,9 +27,6 @@ ac_add_options --enable-svg ac_add_options --enable-canvas ac_add_options --enable-system-hunspell ac_add_options --disable-crashreporter -#ac_add_options --disable-static -#ac_add_options --disable-static-mail -#ac_add_options --enable-libxul export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 diff --git a/thunderbird-mozconfig-debuginfo b/thunderbird-mozconfig-debuginfo new file mode 100644 index 0000000..a0ef07a --- /dev/null +++ b/thunderbird-mozconfig-debuginfo @@ -0,0 +1,5 @@ +# For mozilla's debuginfo: +export CFLAGS="-gstabs+" +export CXXFLAGS="-gstabs+" +export MOZ_DEBUG_SYMBOLS=1 +ac_add_options --enable-crashreporter diff --git a/thunderbird-redhat-default-prefs.js b/thunderbird-redhat-default-prefs.js index e00e50e..a4bd7a9 100644 --- a/thunderbird-redhat-default-prefs.js +++ b/thunderbird-redhat-default-prefs.js @@ -1,6 +1,7 @@ pref("app.update.enabled", false); pref("app.update.autoInstallEnabled", false); -pref("browser.display.use_system_colors", true); +# Allow users to set custom colors +# pref("browser.display.use_system_colors", true); pref("general.useragent.vendor", "Fedora"); pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR"); pref("intl.locale.matchOS", true); @@ -11,3 +12,9 @@ pref("toolkit.networkmanager.disable", false); pref("network.protocol-handler.app.http", "COMMAND"); pref("network.protocol-handler.app.https", "COMMAND"); pref("network.protocol-handler.app.ftp", "COMMAND"); + +# Disable global indexing by default +pref("mailnews.database.global.indexer.enabled", false); + +# Do not switch to Smart Folders after upgrade to 3.0b4 +pref("mail.folder.views.version", "1") diff --git a/thunderbird.spec b/thunderbird.spec index 5faa7f6..d765f93 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -33,7 +33,7 @@ Group: Applications/Internet %endif Source0: %{tarball} %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version_internal}-20091118.tar.bz2 +Source1: thunderbird-langpacks-%{version_internal}-20091125.tar.bz2 %endif Source10: thunderbird-mozconfig Source11: thunderbird-mozconfig-branded