- update to Thunderbird 14.0 (bnc#)

* relicensed to MPL-2.0
- update Enigmail to 1.4.3
  * bugfix release

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=184

MozillaThunderbird.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Jul 15 08:06:50 UTC 2012 - wr@rosenauer.org
+
+- update to Thunderbird 14.0 (bnc#)
+  * relicensed to MPL-2.0
+- update Enigmail to 1.4.3
+
 -------------------------------------------------------------------
 Thu Jul  5 09:58:15 UTC 2012 - adrian@suse.de
 
@@ -7,7 +14,7 @@ Thu Jul  5 09:58:15 UTC 2012 - adrian@suse.de
 Fri Jun 15 07:00:43 UTC 2012 - wr@rosenauer.org
 
 - update to Thunderbird 13.0.1
-  * bugfix release 
+  * bugfix release
 
 -------------------------------------------------------------------
 Sat Jun  2 12:41:08 UTC 2012 - wr@rosenauer.org

MozillaThunderbird.spec

@@ -31,7 +31,7 @@ BuildRequires:  libgnomeui-devel
 BuildRequires:  libidl-devel
 BuildRequires:  libnotify-devel
 BuildRequires:  mozilla-nspr-devel >= 4.9.0
-BuildRequires:  mozilla-nss-devel >= 3.13.4
+BuildRequires:  mozilla-nss-devel >= 3.13.5
 BuildRequires:  nss-shared-helper-devel
 BuildRequires:  python
 BuildRequires:  startup-notification-devel
@@ -40,11 +40,11 @@ BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11-libXt-devel
 BuildRequires:  yasm
 BuildRequires:  zip
-%define mainversion 13.0.1
+%define mainversion 14.0
 %define update_channel release
 Version:        %{mainversion}
 Release:        0
-%define releasedate 2012061400
+%define releasedate 2012071300
 Provides:       thunderbird = %{version}
 %if %{with_kde}
 # this is needed to match this package with the kde4 helper package without the main package
@@ -53,7 +53,7 @@ Provides:       thunderbird = %{version}
 Provides:       mozilla-kde4-version = %{kde_helper_version}
 %endif
 Summary:        The Stand-Alone Mozilla Mail Component
-License:        MPL-1.1 or GPL-2.0+ or LGPL-2.1+
+License:        MPL-2.0
 Group:          Productivity/Networking/Email/Clients
 Url:            http://www.mozilla.org/products/thunderbird/
 Source:         thunderbird-%{version}-source.tar.bz2
@@ -65,27 +65,22 @@ Source4:        l10n-%{version}.tar.bz2
 Source6:        suse-default-prefs.js
 Source7:        find-external-requires.sh
 Source8:        thunderbird-rpmlintrc
-Source9:        enigmail-1.4.2.tar.gz
+Source9:        enigmail-1.4.3.tar.gz
 Source10:       create-tar.sh
 Source11:       compare-locales.tar.bz2
 Source12:       kde.js
 # Gecko/Toolkit
 Patch1:         mozilla-shared-nss-db.patch
 Patch2:         mozilla-language.patch
-Patch3:         mozilla-linux3.patch
+Patch3:         mozilla-dump_syms-static.patch
-Patch4:         mozilla-dump_syms-static.patch
+Patch4:         mozilla-disable-neon-option.patch
-Patch5:         mozilla-disable-neon-option.patch
+Patch5:         mozilla-nongnome-proxies.patch
-Patch6:         mozilla-nongnome-proxies.patch
+Patch6:         mozilla-kde.patch
-Patch7:         mozilla-kde.patch
+Patch7:         mozilla-gcc47.patch
-Patch8:         mozilla-libnotify.patch
-Patch9:         mozilla-revert_621446.patch
-Patch10:        mozilla-gcc47.patch
-Patch11:        mozilla-system-nspr.patch
 # Thunderbird/mail
 Patch20:        tb-ssldap.patch
 Patch21:        tb-develdirs.patch
 Patch22:        thunderbird-shared-nss-db.patch
-Patch23:        mailnews-showalert.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         coreutils fileutils textutils /bin/sh
 Recommends:     libcanberra0
@@ -125,7 +120,7 @@ Mozilla application suite.
 
 %package translations-common
 Summary:        Common translations for MozillaThunderbird
-License:        MPL-1.1 or GPL-2.0+ or LGPL-2.1+
+License:        MPL-2.0
 Group:          System/Localization
 Provides:       locale(%{name}:ar;ca;cs;da;de;en_GB;es_AR;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN;zh_TW)
 PreReq:         %{name} = %{mainversion}
@@ -138,7 +133,7 @@ of MozillaThunderbird.
 
 %package translations-other
 Summary:        Extra translations for MozillaThunderbird
-License:        MPL-1.1 or GPL-2.0+ or LGPL-2.1+
+License:        MPL-2.0
 Group:          System/Localization
 Provides:       locale(%{name}:ast;be;bg;bn_BD;br;el;et;eu;fy_NL;ga_IE;gd;gl;he;hr;hy_AM;id;is;lt;nn_NO;pa_IN;rm;ro;si;sk;sl;sq;sr;ta_LK;tr;uk;vi)
 PreReq:         %{name} = %{mainversion}
@@ -151,7 +146,7 @@ of MozillaThunderbird.
 
 %package devel
 Summary:        Mozilla Thunderbird SDK
-License:        MPL-1.1 or GPL-2.0+ or LGPL-2.1+
+License:        MPL-2.0
 Group:          Development/Libraries/Other
 Requires:       mozilla-nspr-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr-devel)
 PreReq:         mozilla-nss-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss-devel)
@@ -165,7 +160,7 @@ Software Development Kit to build plugins/extensions against Thunderbird.
 
 %package buildsymbols
 Summary:        Breakpad buildsymbols for %{name}
-License:        MPL-1.1 or GPL-2.0+ or LGPL-2.1+
+License:        MPL-2.0
 Group:          Development/Debug
 
 %description buildsymbols
@@ -175,7 +170,7 @@ symbols meant for upload to Mozilla's crash collector database.
 
 %if %build_enigmail
 %package -n enigmail
-Version:        1.4.2+%{mainversion}
+Version:        1.4.3+%{mainversion}
 Release:        0
 Summary:        OpenPGP addon for Thunderbird and SeaMonkey
 License:        MPL-1.1 or GPL-2.0+
@@ -204,22 +199,17 @@ pushd mozilla
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
+#%patch4 -p1
 %patch5 -p1
-%patch6 -p1
 %if %{with_kde}
-%patch7 -p1
+%patch6 -p1
 %endif
-%patch8 -p1
+%patch7 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
 popd
 # comm-central patches
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
-%patch23 -p1
 
 %build
 # no need to add build time to binaries
@@ -567,6 +557,7 @@ exit 0
 %{_libdir}/%{progname}/*.a
 %{_libdir}/%{progname}/*.py
 %{_libdir}/%{progname}/ply/
+%{_libdir}/%{progname}/xpcshell
 #%{_libdir}/pkgconfig/*.pc
 %{_includedir}/%{progname}/
 

compare-locales.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b9f2d060e054f2a5edc1873f4ae6dfafd45263894128803c2f32d8859d7d8bed
+oid sha256:f116921912d786fccc15759ad19f8e25d882ffab0454fb49572537d656a07527
-size 29350
+size 29363

create-tar.sh

@@ -2,8 +2,8 @@
 
 CHANNEL="release"
 BRANCH="releases/comm-$CHANNEL"
-RELEASE_TAG="THUNDERBIRD_13_0_1_RELEASE"
+RELEASE_TAG="THUNDERBIRD_14_0_RELEASE"
-VERSION="13.0.1"
+VERSION="14.0"
 
 echo "cloning $BRANCH..."
 hg clone http://hg.mozilla.org/$BRANCH thunderbird

enigmail-1.4.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:df463620f47a30d2a0e1634793b41a285e1a2c861b024e1a57c9d91cf6bf3581
-size 1319995

enigmail-1.4.3.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:440035f19a22e8e234c530a0e78fb9ee74bb934fcf721777868de79324636d27
+size 1337811

l10n-13.0.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:df57072f51a95dd04319b04614ae8e1b8091d575c97501180f5fd73b205856d4
-size 25858954

l10n-14.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d3218a3f28d663c660fe93abf3e60a1e6f11bff45e8d805618e15ad8da30d82c
+size 26111343

mailnews-showalert.patch

@@ -1,89 +0,0 @@
-# HG changeset patch
-# Parent 7aff84f58a8fd64d2bf34fe386e97f173f2562f3
-
-diff --git a/mailnews/base/src/nsMessengerUnixIntegration.cpp b/mailnews/base/src/nsMessengerUnixIntegration.cpp
---- a/mailnews/base/src/nsMessengerUnixIntegration.cpp
-+++ b/mailnews/base/src/nsMessengerUnixIntegration.cpp
-@@ -378,47 +378,46 @@ nsresult nsMessengerUnixIntegration::Sho
- 
-   nsCOMPtr<nsIPrefBranch> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
-   NS_ENSURE_SUCCESS(rv, rv);
-   bool showAlert = true;
-   prefBranch->GetBoolPref(SHOW_ALERT_PREF, &showAlert);
- 
-   if (showAlert)
-   {
-+    mAlertInProgress = true;
- #ifdef MOZ_THUNDERBIRD
-     nsCOMPtr<nsIAlertsService> alertsService(do_GetService(NS_SYSTEMALERTSERVICE_CONTRACTID, &rv));
-     if (NS_SUCCEEDED(rv)) {
--      mAlertInProgress = true;
-       rv = alertsService->ShowAlertNotification(NS_LITERAL_STRING(NEW_MAIL_ALERT_ICON),
-                                                 aAlertTitle,
-                                                 aAlertText,
-                                                 false,
-                                                 NS_ConvertASCIItoUTF16(aFolderURI),
-                                                 this,
-                                                 EmptyString());
-       if (NS_SUCCEEDED(rv))
-         return rv;
-     }
-     AlertFinished();
--    ShowNewAlertNotification(false);
-+    rv = ShowNewAlertNotification(false);
- 
- #else
-     nsCOMPtr<nsIAlertsService> alertsService (do_GetService(NS_ALERTSERVICE_CONTRACTID, &rv));
-     if (NS_SUCCEEDED(rv))
-     {
-       rv = alertsService->ShowAlertNotification(NS_LITERAL_STRING(NEW_MAIL_ALERT_ICON), aAlertTitle,
-                                                 aAlertText, true,
-                                                 NS_ConvertASCIItoUTF16(aFolderURI), this,
-                                                 EmptyString());
--      mAlertInProgress = true;
-     }
- #endif
-   }
- 
--  if (!showAlert || NS_FAILED(rv)) // go straight to showing the system tray icon.
-+  if (NS_FAILED(rv)) // go straight to showing the system tray icon.
-     AlertFinished();
- 
-   return rv;
- }
- 
- #ifdef MOZ_THUNDERBIRD
- // Opening Thunderbird's new mail alert notification window for not supporting libnotify
- // aUserInitiated --> true if we are opening the alert notification in response to a user action
-@@ -463,28 +462,25 @@ nsresult nsMessengerUnixIntegration::Sho
-     nsCOMPtr<nsISupportsPRBool> scriptableUserInitiated (do_CreateInstance(NS_SUPPORTS_PRBOOL_CONTRACTID, &rv));
-     NS_ENSURE_SUCCESS(rv, rv);
-     scriptableUserInitiated->SetData(aUserInitiated);
-     argsArray->AppendElement(scriptableUserInitiated, false);
- 
-     nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
-     nsCOMPtr<nsIDOMWindow> newWindow;
- 
-+    mAlertInProgress = true;
-     rv = wwatch->OpenWindow(0, ALERT_CHROME_URL, "_blank",
-                             "chrome,dialog=yes,titlebar=no,popup=yes", argsArray,
-                             getter_AddRefs(newWindow));
- 
--    mAlertInProgress = true;
-+    if (NS_FAILED(rv))
-+      AlertFinished();
-   }
- 
--  // if the user has turned off the mail alert, or openWindow generated an error,
--  // then go straight to the system tray.
--  if (!showAlert || NS_FAILED(rv))
--    AlertFinished();
--
-   return rv;
- }
- #endif
- 
- nsresult nsMessengerUnixIntegration::AlertFinished()
- {
-   mAlertInProgress = false;
-   return NS_OK;

mozilla-gcc47.patch

@@ -1,113 +1,14 @@
 # HG changeset patch
-# Parent 7bc8f0e5bed8cb2212e27228e628861737256459
+# User Mike Hommey <mh+mozilla@glandium.org>
-Patch to make Mozilla build with gcc 4.7, including
+# Date 1336991062 -7200
-- Bug 734490 - "no viable overloaded 'PRIxPTR'" when building with Clang or GCC 4.7 (TM: Mozilla14)
+# Node ID 234d34706ea1a0e9a9d2c61561c4441590712df0
-- Bug 741348 - Work around crashreporter client build failure with gcc 4.7 (TM: Mozilla15)
+# Parent  0f2f145158b595f5242bf0d79b2de413373730c1
+Bug 741348 - Work around crashreporter client build failure with gcc 4.7
 
-diff --git a/layout/base/tests/TestPoisonArea.cpp b/layout/base/tests/TestPoisonArea.cpp
---- a/layout/base/tests/TestPoisonArea.cpp
-+++ b/layout/base/tests/TestPoisonArea.cpp
-@@ -392,53 +392,53 @@ ReservePoisonArea()
- {
-   if (sizeof(uintptr_t) == 8) {
-     // Use the hardware-inaccessible region.
-     // We have to avoid 64-bit constants and shifts by 32 bits, since this
-     // code is compiled in 32-bit mode, although it is never executed there.
-     uintptr_t result = (((uintptr_t(0x7FFFFFFFu) << 31) << 1 |
-                          uintptr_t(0xF0DEAFFFu)) &
-                         ~uintptr_t(PAGESIZE-1));
--    printf("INFO | poison area assumed at 0x%.*"PRIxPTR"\n", SIZxPTR, result);
-+    printf("INFO | poison area assumed at 0x%.*" PRIxPTR "\n", SIZxPTR, result);
-     return result;
-   } else {
-     // First see if we can allocate the preferred poison address from the OS.
-     uintptr_t candidate = (0xF0DEAFFF & ~(PAGESIZE-1));
-     void *result = ReserveRegion(candidate, false);
-     if (result == (void *)candidate) {
-       // success - inaccessible page allocated
--      printf("INFO | poison area allocated at 0x%.*"PRIxPTR
-+      printf("INFO | poison area allocated at 0x%.*" PRIxPTR
-              " (preferred addr)\n", SIZxPTR, (uintptr_t)result);
-       return candidate;
-     }
- 
-     // That didn't work, so see if the preferred address is within a range
-     // of permanently inacessible memory.
-     if (ProbeRegion(candidate)) {
-       // success - selected page cannot be usable memory
-       if (result != MAP_FAILED)
-         ReleaseRegion(result);
--      printf("INFO | poison area assumed at 0x%.*"PRIxPTR
-+      printf("INFO | poison area assumed at 0x%.*" PRIxPTR
-              " (preferred addr)\n", SIZxPTR, candidate);
-       return candidate;
-     }
- 
-     // The preferred address is already in use.  Did the OS give us a
-     // consolation prize?
-     if (result != MAP_FAILED) {
--      printf("INFO | poison area allocated at 0x%.*"PRIxPTR
-+      printf("INFO | poison area allocated at 0x%.*" PRIxPTR
-              " (consolation prize)\n", SIZxPTR, (uintptr_t)result);
-       return (uintptr_t)result;
-     }
- 
-     // It didn't, so try to allocate again, without any constraint on
-     // the address.
-     result = ReserveRegion(0, false);
-     if (result != MAP_FAILED) {
--      printf("INFO | poison area allocated at 0x%.*"PRIxPTR
-+      printf("INFO | poison area allocated at 0x%.*" PRIxPTR
-              " (fallback)\n", SIZxPTR, (uintptr_t)result);
-       return (uintptr_t)result;
-     }
- 
-     printf("ERROR | no usable poison area found\n");
-     return 0;
-   }
- }
-@@ -450,17 +450,17 @@ static uintptr_t
- ReservePositiveControl()
- {
- 
-   void *result = ReserveRegion(0, false);
-   if (result == MAP_FAILED) {
-     printf("ERROR | allocating positive control | %s\n", LastErrMsg());
-     return 0;
-   }
--  printf("INFO | positive control allocated at 0x%.*"PRIxPTR"\n",
-+  printf("INFO | positive control allocated at 0x%.*" PRIxPTR "\n",
-          SIZxPTR, (uintptr_t)result);
-   return (uintptr_t)result;
- }
- 
- /* The "negative control" area confirms that our probe logic does detect a
-  * page that is readable, writable, or executable.
-  */
- static uintptr_t
-@@ -481,17 +481,17 @@ ReserveNegativeControl()
-   // Now mark it executable as well as readable and writable.
-   // (mmap(PROT_EXEC) may fail when applied to anonymous memory.)
- 
-   if (MakeRegionExecutable(result)) {
-     printf("ERROR | making negative control executable | %s\n", LastErrMsg());
-     return 0;
-   }
- 
--  printf("INFO | negative control allocated at 0x%.*"PRIxPTR"\n",
-+  printf("INFO | negative control allocated at 0x%.*" PRIxPTR "\n",
-          SIZxPTR, (uintptr_t)result);
-   return (uintptr_t)result;
- }
- 
- static void
- JumpTo(uintptr_t opaddr)
- {
- #ifdef __ia64
 diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
 --- a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
 +++ b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
-@@ -61,8 +61,11 @@ HOST_CPPSRCS = \
+@@ -65,8 +65,11 @@ HOST_CPPSRCS = \
    file_id.cc \
    guid_creator.cc \
    $(NULL)

mozilla-kde.patch

@@ -45,7 +45,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
  #include "prefapi.h"
  #include "prefread.h"
  #include "prefapi_private_data.h"
-@@ -937,16 +938,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
+@@ -941,16 +942,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
  
  static nsresult pref_LoadPrefsInDirList(const char *listId)
  {
@@ -80,7 +80,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
      return NS_OK;
  
    bool hasMore;
-@@ -962,17 +981,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -966,17 +985,17 @@ static nsresult pref_LoadPrefsInDirList(
  
      nsCAutoString leaf;
      path->GetNativeLeafName(leaf);
@@ -99,7 +99,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
  {
    nsZipItemPtr<char> manifest(jarReader, name, true);
    NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1062,28 +1081,40 @@ static nsresult pref_InitInitialObjects(
+@@ -1070,28 +1089,40 @@ static nsresult pref_InitInitialObjects(
    /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
    static const char* specialFiles[] = {
  #if defined(XP_MACOSX)
@@ -137,9 +137,9 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
      NS_WARNING("Error parsing application default preferences.");
  
    // Load jar:$app/omni.jar!/defaults/preferences/*.js
+   // or jar:$gre/omni.jar!/defaults/preferences/*.js.
    nsRefPtr<nsZipArchive> appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP);
-   if (appJarReader) {
+   // GetReader(mozilla::Omnijar::APP) returns null when $app == $gre, in which
-     rv = appJarReader->FindInit("defaults/preferences/*.js$", &findPtr);
 diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in
 --- a/toolkit/components/downloads/Makefile.in
 +++ b/toolkit/components/downloads/Makefile.in
@@ -179,7 +179,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
  #include "AndroidBridge.h"
  #endif
  
-@@ -2221,16 +2225,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2259,16 +2263,25 @@ nsDownload::SetState(DownloadState aStat
        nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
  
        // Master pref to control this function.
@@ -205,7 +205,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
          PRInt64 goat = PR_Now() - mStartTime;
          showTaskbarAlert = goat > alertIntervalUSec;
  
-@@ -2254,19 +2267,20 @@ nsDownload::SetState(DownloadState aStat
+@@ -2292,19 +2305,20 @@ nsDownload::SetState(DownloadState aStat
                // If downloads are automatically removed per the user's
                // retention policy, there's no reason to make the text clickable
                // because if it is, they'll click open the download manager and
@@ -2192,7 +2192,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
 --- a/toolkit/xre/Makefile.in
 +++ b/toolkit/xre/Makefile.in
-@@ -96,17 +96,18 @@ else
+@@ -100,17 +100,18 @@ else
  ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
  CMMSRCS = nsNativeAppSupportCocoa.mm
  EXPORTS += MacQuirks.h
@@ -3755,7 +3755,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
 diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
 --- a/xpcom/io/Makefile.in
 +++ b/xpcom/io/Makefile.in
-@@ -188,17 +188,17 @@ include $(topsrcdir)/ipc/chromium/chromi
+@@ -189,17 +189,17 @@ include $(topsrcdir)/ipc/chromium/chromi
  DEFINES		+= -D_IMPL_NS_COM
  
  ifeq ($(OS_ARCH),Linux)
@@ -3795,7 +3795,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
  #include "prmem.h"
  #include "plbase64.h"
  
-@@ -1796,44 +1797,51 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1798,44 +1799,51 @@ nsLocalFile::SetPersistentDescriptor(con
      return InitWithNativePath(aPersistentDescriptor);
  #endif
  }
@@ -3861,7 +3861,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
        return rv;
      }
      return NS_ERROR_FAILURE;
-@@ -1859,16 +1867,23 @@ nsLocalFile::Launch()
+@@ -1861,16 +1869,23 @@ nsLocalFile::Launch()
  
      if (nsnull == connection)
        return NS_ERROR_FAILURE;

mozilla-libnotify.patch

@@ -1,61 +0,0 @@
-# HG changeset patch
-# User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent c684863b1eb3bcae92ef24bc2ac511985b1ad7e4
-Bug 737646 - no biff notification if notification-daemon not running
-
-diff --git a/toolkit/system/gnome/nsAlertsIconListener.cpp b/toolkit/system/gnome/nsAlertsIconListener.cpp
---- a/toolkit/system/gnome/nsAlertsIconListener.cpp
-+++ b/toolkit/system/gnome/nsAlertsIconListener.cpp
-@@ -47,16 +47,17 @@
- #include <gdk/gdk.h>
- 
- // Compatibility macro for <libnotify-0.7
- #ifndef NOTIFY_CHECK_VERSION
- #define NOTIFY_CHECK_VERSION(x,y,z) 0
- #endif
- 
- static bool gHasActions = false;
-+static bool gHasCaps = false;
- 
- static void notify_action_cb(NotifyNotification *notification,
-                              gchar *action, gpointer user_data)
- {
-   nsAlertsIconListener* alert = static_cast<nsAlertsIconListener*> (user_data);
-   alert->SendCallback();
- }
- 
-@@ -338,27 +339,34 @@ nsAlertsIconListener::InitAlertAsync(con
-       appShortName.AssignLiteral("Mozilla");
-     }
- 
-     if (!notify_init(appShortName.get()))
-       return NS_ERROR_FAILURE;
- 
-     GList *server_caps = notify_get_server_caps();
-     if (server_caps) {
-+      gHasCaps = true;
-       for (GList* cap = server_caps; cap != NULL; cap = cap->next) {
-         if (!strcmp((char*) cap->data, "actions")) {
-           gHasActions = true;
-           break;
-         }
-       }
-       g_list_foreach(server_caps, (GFunc)g_free, NULL);
-       g_list_free(server_caps);
-     }
-   }
- 
-+  if (!gHasCaps) {
-+    // if notify_get_server_caps() failed above we need to assume
-+    // there is no notification-server to display anything
-+    return NS_ERROR_FAILURE;
-+  }
-+
-   if (!gHasActions && aAlertTextClickable)
-     return NS_ERROR_FAILURE; // No good, fallback to XUL
- 
-   nsCOMPtr<nsIObserverService> obsServ =
-       do_GetService("@mozilla.org/observer-service;1");
-   if (obsServ)
-     obsServ->AddObserver(this, "quit-application", true);
- 

mozilla-linux3.patch

@@ -1,23 +0,0 @@
-# HG changeset patch
-# Parent bf7c3e1c6174630743f9f94808c4dd3a2edc0c6b
-diff --git a/toolkit/crashreporter/tools/symbolstore.py b/toolkit/crashreporter/tools/symbolstore.py
---- a/toolkit/crashreporter/tools/symbolstore.py
-+++ b/toolkit/crashreporter/tools/symbolstore.py
-@@ -376,16 +376,17 @@ def GetVCSFilename(file, srcdirs):
-     return (file.replace("\\", "/"), root)
- 
- def GetPlatformSpecificDumper(**kwargs):
-     """This function simply returns a instance of a subclass of Dumper
-     that is appropriate for the current platform."""
-     return {'win32': Dumper_Win32,
-             'cygwin': Dumper_Win32,
-             'linux2': Dumper_Linux,
-+	    'linux3': Dumper_Linux,
-             'sunos5': Dumper_Solaris,
-             'darwin': Dumper_Mac}[sys.platform](**kwargs)
- 
- def SourceIndex(fileStream, outputPath, vcs_root):
-     """Takes a list of files, writes info to a data block in a .stream file"""
-     # Creates a .pdb.stream file in the mozilla\objdir to be used for source indexing
-     # Create the srcsrv data block that indexes the pdb file
-     result = True

mozilla-revert_621446.patch

@@ -1,148 +0,0 @@
-# HG changeset patch
-# Parent 8da41a2cee774ce4d00b9ac1032a495b8bc560a0
-Revert investigation patch for bmo#621446; as it is useless on desktop and breaks the build for certain compilers
-
-diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp
---- a/netwerk/protocol/http/HttpChannelParent.cpp
-+++ b/netwerk/protocol/http/HttpChannelParent.cpp
-@@ -52,29 +52,25 @@
- #include "nsIBadCertListener2.h"
- #include "nsICacheEntryDescriptor.h"
- #include "nsSerializationHelper.h"
- #include "nsISerializable.h"
- #include "nsIAssociatedContentSecurity.h"
- #include "nsIApplicationCacheService.h"
- #include "nsIOfflineCacheUpdate.h"
- #include "nsIRedirectChannelRegistrar.h"
--#include "prinit.h"
- 
- namespace mozilla {
- namespace net {
- 
- HttpChannelParent::HttpChannelParent(PBrowserParent* iframeEmbedding)
-   : mIPCClosed(false)
-   , mStoredStatus(0)
-   , mStoredProgress(0)
-   , mStoredProgressMax(0)
--  , mSentRedirect1Begin(false)
--  , mSentRedirect1BeginFailed(false)
--  , mReceivedRedirect2Verify(false)
- {
-   // Ensure gHttpHandler is initialized: we need the atom table up and running.
-   nsIHttpProtocolHandler* handler;
-   CallGetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &handler);
-   NS_ASSERTION(handler, "no http handler");
- 
-   mTabParent = do_QueryObject(static_cast<TabParent*>(iframeEmbedding));
- }
-@@ -326,21 +322,16 @@ HttpChannelParent::RecvUpdateAssociatedC
-     mAssociatedContentSecurity->SetCountSubRequestsHighSecurity(high);
-     mAssociatedContentSecurity->SetCountSubRequestsLowSecurity(low);
-     mAssociatedContentSecurity->SetCountSubRequestsBrokenSecurity(broken);
-     mAssociatedContentSecurity->SetCountSubRequestsNoSecurity(no);
-   }
-   return true;
- }
- 
--// Bug 621446 investigation, we don't want conditional PR_Aborts bellow to be
--// merged to a single address.
--#pragma warning(disable : 4068)
--#pragma GCC optimize ("O0")
--
- bool
- HttpChannelParent::RecvRedirect2Verify(const nsresult& result, 
-                                        const RequestHeaderTuples& changedHeaders)
- {
-   if (NS_SUCCEEDED(result)) {
-     nsCOMPtr<nsIHttpChannel> newHttpChannel =
-         do_QueryInterface(mRedirectChannel);
- 
-@@ -348,40 +339,21 @@ HttpChannelParent::RecvRedirect2Verify(c
-       for (PRUint32 i = 0; i < changedHeaders.Length(); i++) {
-         newHttpChannel->SetRequestHeader(changedHeaders[i].mHeader,
-                                          changedHeaders[i].mValue,
-                                          changedHeaders[i].mMerge);
-       }
-     }
-   }
- 
--  if (!mRedirectCallback) {
--    // Bug 621446 investigation (optimization turned off above)
--    if (mReceivedRedirect2Verify)
--      NS_RUNTIMEABORT("Duplicate fire");
--    if (mSentRedirect1BeginFailed)
--      NS_RUNTIMEABORT("Send to child failed");
--    if (mSentRedirect1Begin && NS_FAILED(result))
--      NS_RUNTIMEABORT("Redirect failed");
--    if (mSentRedirect1Begin && NS_SUCCEEDED(result))
--      NS_RUNTIMEABORT("Redirect succeeded");
--    if (!mRedirectChannel)
--      NS_RUNTIMEABORT("Missing redirect channel");
--  }
--
--  mReceivedRedirect2Verify = true;
--
-   mRedirectCallback->OnRedirectVerifyCallback(result);
-   mRedirectCallback = nsnull;
-   return true;
- }
- 
--// Bug 621446 investigation
--#pragma GCC reset_options
--
- bool
- HttpChannelParent::RecvDocumentChannelCleanup()
- {
-   // From now on only using mAssociatedContentSecurity.  Free everything else.
-   mChannel = 0;          // Reclaim some memory sooner.
-   mCacheDescriptor = 0;  // Else we'll block other channels reading same URI
-   return true;
- }
-@@ -583,24 +555,18 @@ HttpChannelParent::StartRedirect(PRUint3
- 
-   nsHttpChannel *httpChan = static_cast<nsHttpChannel *>(mChannel.get());
-   nsHttpResponseHead *responseHead = httpChan->GetResponseHead();
-   bool result = SendRedirect1Begin(newChannelId,
-                                    IPC::URI(newURI),
-                                    redirectFlags,
-                                    responseHead ? *responseHead
-                                                 : nsHttpResponseHead());
--  if (!result) {
--    // Bug 621446 investigation
--    mSentRedirect1BeginFailed = true;
-+  if (!result)
-     return NS_BINDING_ABORTED;
--  }
--
--  // Bug 621446 investigation
--  mSentRedirect1Begin = true;
- 
-   // Result is handled in RecvRedirect2Verify above
- 
-   mRedirectChannel = newChannel;
-   mRedirectCallback = callback;
-   return NS_OK;
- }
- 
-diff --git a/netwerk/protocol/http/HttpChannelParent.h b/netwerk/protocol/http/HttpChannelParent.h
---- a/netwerk/protocol/http/HttpChannelParent.h
-+++ b/netwerk/protocol/http/HttpChannelParent.h
-@@ -128,18 +128,14 @@ private:
-   nsCOMPtr<nsIChannel> mRedirectChannel;
-   nsCOMPtr<nsIAsyncVerifyRedirectCallback> mRedirectCallback;
- 
-   // state for combining OnStatus/OnProgress with OnDataAvailable
-   // into one IPDL call to child.
-   nsresult mStoredStatus;
-   PRUint64 mStoredProgress;
-   PRUint64 mStoredProgressMax;
--
--  bool mSentRedirect1Begin : 1;
--  bool mSentRedirect1BeginFailed : 1;
--  bool mReceivedRedirect2Verify : 1;
- };
- 
- } // namespace net
- } // namespace mozilla
- 
- #endif // mozilla_net_HttpChannelParent_h

mozilla-shared-nss-db.patch

@@ -1,16 +1,16 @@
 From: Hans Petter Jansson <hpj@copyleft.no>
       Wolfgang Rosenauer <wr@rosenauer.org>
 Subject: use libnsssharedhelper if available at compile time
-         (can be disabled by exporting MOZ_TB_NO_NSSHELPER=1)
+         (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1)
 References:
 
 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
 --- a/config/autoconf.mk.in
 +++ b/config/autoconf.mk.in
-@@ -581,16 +581,20 @@ MOZ_LIBNOTIFY_LIBS	= @MOZ_LIBNOTIFY_LIBS
+@@ -590,16 +590,20 @@ MOZ_ENABLE_LIBNOTIFY	= @MOZ_ENABLE_LIBNO
- MOZ_ENABLE_LIBNOTIFY	= @MOZ_ENABLE_LIBNOTIFY@
  
  MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS@
+ MOZ_ALSA_CFLAGS         = @MOZ_ALSA_CFLAGS@
  
  GLIB_CFLAGS	= @GLIB_CFLAGS@
  GLIB_LIBS	= @GLIB_LIBS@
@@ -31,7 +31,7 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -8213,16 +8213,31 @@ AC_SUBST(QCMS_LIBS)
+@@ -8180,16 +8180,31 @@ AC_SUBST(QCMS_LIBS)
  
  dnl ========================================================
  dnl HarfBuzz
@@ -66,7 +66,7 @@ diff --git a/configure.in b/configure.in
 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
 --- a/security/manager/ssl/src/Makefile.in
 +++ b/security/manager/ssl/src/Makefile.in
-@@ -118,12 +118,14 @@ EXTRA_DEPS = $(NSS_DEP_LIBS)
+@@ -119,12 +119,14 @@ EXTRA_DEPS = $(NSS_DEP_LIBS)
  DEFINES += \
    -DNSS_ENABLE_ECC \
    -DDLL_PREFIX=\"$(DLL_PREFIX)\" \
@@ -109,7 +109,7 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
  #include "nsNetUtil.h"
  #include "nsAppDirectoryServiceDefs.h"
  #include "nsDirectoryService.h"
-@@ -1733,18 +1740,34 @@ nsNSSComponent::InitializeNSS(bool showW
+@@ -1776,18 +1783,34 @@ nsNSSComponent::InitializeNSS(bool showW
      ConfigureInternalPKCS11Token();
  
      // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
@@ -149,7 +149,7 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
 --- a/toolkit/library/Makefile.in
 +++ b/toolkit/library/Makefile.in
-@@ -471,17 +471,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
+@@ -439,17 +439,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
  endif
  endif
  endif

mozilla-system-nspr.patch

@@ -1,27 +0,0 @@
-# HG changeset patch
-# User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent e94edfdb1f5bd5c29dc54cfb83768f9c84f3f4de
-Bug 736854 - PHal.ipdl includes NSPR incorrectly - breaking system NSPR usage
-
-diff --git a/hal/sandbox/PHal.ipdl b/hal/sandbox/PHal.ipdl
---- a/hal/sandbox/PHal.ipdl
-+++ b/hal/sandbox/PHal.ipdl
-@@ -34,17 +34,17 @@
-  * and other provisions required by the GPL or the LGPL. If you do not delete
-  * the provisions above, a recipient may use your version of this file under
-  * the terms of any one of the MPL, the GPL or the LGPL.
-  *
-  * ***** END LICENSE BLOCK ***** */
- 
- include protocol PContent;
- include protocol PBrowser;
--include "nspr/prtime.h";
-+include "prtime.h";
- include "mozilla/HalSensor.h";
- include "mozilla/HalTypes.h";
- 
- using PRTime;
- using mozilla::hal::FlashMode;
- using mozilla::hal::LightType;
- using mozilla::hal::LightMode;
- using mozilla::hal::SensorType;

mozilla.sh.in

@@ -133,10 +133,7 @@ if [ $moz_debug -eq 1 ]; then
   trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15
   echo -e "set args ${1+"$@"}\nrun" > $tmpfile
   echo "$moz_debugger $MOZ_PROGRAM -x $tmpfile"
-  $moz_debugger "$MOZ_PROGRAM" -x $tmpfile
+  exec $moz_debugger "$MOZ_PROGRAM" -x $tmpfile
 else
-  $MOZ_PROGRAM "$@"
+  exec $MOZ_PROGRAM "$@"
 fi
-exitcode=$?
-
-exit $exitcode

thunderbird-13.0.1-source.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:97f9021b4dbfae08d076e508495d271442b02047b140b942d7c113f4f13d0a0c
-size 102545437

thunderbird-14.0-source.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ee8dc43e16c07f1f8221405e8b403ea8fcbed1348c97fed41cc9c5ec0c7e0fe
+size 105194533