From 67a437329d63512827882153a0df12fbf1a6eab4 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Mar 30 2010 08:07:08 +0000 Subject: Update to 3.0.4 --- diff --git a/.cvsignore b/.cvsignore index 7db001d..80fc8ff 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -thunderbird-3.0.3.source.tar.bz2 -thunderbird-langpacks-3.0.3-20100301.tar.bz2 +thunderbird-3.0.4.source.tar.bz2 +thunderbird-langpacks-3.0.4-20100330.tar.bz2 diff --git a/sources b/sources index a2393f1..e43d233 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -89e759fd7a6ab0f1cb0d089d9c89f3ee thunderbird-3.0.3.source.tar.bz2 -444b574b87405642af896f41227f027c thunderbird-langpacks-3.0.3-20100301.tar.bz2 +bb87ca7e62d5869422137765126798be thunderbird-3.0.4.source.tar.bz2 +5b51715204ff7f0c33dac25e0ba27b16 thunderbird-langpacks-3.0.4-20100330.tar.bz2 diff --git a/thunderbird-clipboard-crash.patch b/thunderbird-clipboard-crash.patch deleted file mode 100644 index d2861b8..0000000 --- a/thunderbird-clipboard-crash.patch +++ /dev/null @@ -1,116 +0,0 @@ -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 deleted file mode 100644 index 843a46a..0000000 --- a/thunderbird-debuginfo-fix-include.patch +++ /dev/null @@ -1,33 +0,0 @@ -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.desktop b/thunderbird.desktop index 37689d3..159c15f 100644 --- a/thunderbird.desktop +++ b/thunderbird.desktop @@ -9,3 +9,4 @@ Terminal=false Type=Application StartupWMClass=Thunderbird-bin MimeType=message/rfc822; +StartupNotify=true \ No newline at end of file diff --git a/thunderbird.spec b/thunderbird.spec index b7403e4..7006286 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -35,34 +35,41 @@ Group: Applications/Internet %endif Source0: %{tarball} %if %{build_langpacks} +# Language package archive is build by RH Source1: thunderbird-langpacks-%{version}-20100330.tar.bz2 %endif +# Config file for compilation Source10: thunderbird-mozconfig +# Config file for branded compilation Source11: thunderbird-mozconfig-branded +# Default preferences for Thunderbird Source12: thunderbird-redhat-default-prefs.js +# Config file for debug builds Source13: thunderbird-mozconfig-debuginfo +# Desktop file Source20: thunderbird.desktop +# TB execute script Source21: thunderbird.sh.in +# Script called when user click on link in message Source30: thunderbird-open-browser.sh +# Finds requirements provided outside of the current file set Source100: find-external-requires +# Fix for version issues Patch0: thunderbird-version.patch +# Fix for jemalloc Patch1: mozilla-jemalloc.patch +# Fix for installation fail when building with dynamic linked libraries Patch2: thunderbird-shared-error.patch -Patch3: thunderbird-debuginfo-fix-include.patch -Patch4: thunderbird-clipboard-crash.patch %if %{official_branding} # Required by Mozilla Corporation - %else # Not yet approved by Mozillla Corporation - %endif - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: nspr-devel >= %{nspr_version} BuildRequires: nss-devel >= %{nss_version} @@ -88,7 +95,6 @@ BuildRequires: startup-notification-devel BuildRequires: alsa-lib-devel BuildRequires: autoconf213 BuildRequires: desktop-file-utils - Requires: mozilla-filesystem Requires: nspr >= %{nspr_version} Requires: nss >= %{nss_version} @@ -145,23 +151,14 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch1 -p0 -b .jemalloc %patch2 -p1 -b .shared-error -%if %{include_debuginfo} -%patch3 -p1 -b .fix-include -%endif - -%patch4 -p1 -b .clipboard-crash - %if %{official_branding} # Required by Mozilla Corporation - %else # Not yet approved by Mozillla Corporation - %endif - %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig %if %{official_branding} @@ -340,9 +337,13 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir} cp %{moz_objdir}/mozilla/dist/thunderbird-%{version}.en-US.linux-i686.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir} %endif +#=============================================================================== + %clean %{__rm} -rf $RPM_BUILD_ROOT +#=============================================================================== + %post update-desktop-database &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor @@ -350,6 +351,8 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi +#=============================================================================== + %postun update-desktop-database &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor @@ -357,6 +360,8 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi +#=============================================================================== + %files -f %{tarballdir}/%{name}.lang %defattr(-,root,root,-) %attr(755,root,root) %{_bindir}/thunderbird