7 files changed, 210 insertions, 29 deletions

diff --git a/mail/thunderbird/files/extra-bug780531 b/mail/thunderbird/files/extra-bug780531
deleted file mode 100644
index 5468f16c3be7..000000000000
--- a/mail/thunderbird/files/extra-bug780531
+++ /dev/null
@@ -1,24 +0,0 @@
---- mozilla/configure.in~
-+++ mozilla/configure.in
-@@ -5364,15 +5364,18 @@ AC_SUBST(MOZ_SRTP)
- 
- dnl Use integers over floats for audio on B2G and Android, because audio
- dnl backends for those platforms don't support floats.
--if test "$OS_TARGET" = "Android"; then
-+case "$target" in
-+*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
-     MOZ_SAMPLE_TYPE_S16=1
-     AC_DEFINE(MOZ_SAMPLE_TYPE_S16)
-     AC_SUBST(MOZ_SAMPLE_TYPE_S16)
--else
-+;;
-+*)
-     MOZ_SAMPLE_TYPE_FLOAT32=1
-     AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32)
-     AC_SUBST(MOZ_SAMPLE_TYPE_FLOAT32)
--fi
-+;;
-+esac
- 
- dnl ========================================================
- dnl = Disable Speech API code
diff --git a/mail/thunderbird/files/patch-bug885538 b/mail/thunderbird/files/patch-bug885538
new file mode 100644
index 000000000000..c53534fbb4a9
--- /dev/null
+++ b/mail/thunderbird/files/patch-bug885538
@@ -0,0 +1,31 @@
+
+# HG changeset patch
+# User aceman <acelists@atlas.sk>
+# Date 1374257425 14400
+# Node ID 89bbcd5a2293ae0338d1248b71b49338bece2bdc
+# Parent  baddbdd06d16665bae94e98d1570602cbc6c88ad
+Bug 885538 - Fix clang compile failure in nsMsgSearchTerm.cpp by using an empty string instead of null pointer. r=rkent, a=Standard8
+
+diff --git a/mailnews/base/search/src/nsMsgSearchTerm.cpp b/mailnews/base/search/src/nsMsgSearchTerm.cpp
+--- mailnews/base/search/src/nsMsgSearchTerm.cpp
++++ mailnews/base/search/src/nsMsgSearchTerm.cpp
+@@ -192,17 +192,17 @@ nsresult NS_MsgGetStringForAttribute(int
+     if (attrib == SearchAttribEntryTable[idxAttrib].attrib)
+     {
+       found = true;
+       *string = SearchAttribEntryTable[idxAttrib].attribName;
+       break;
+     }
+   }
+   if (!found)
+-    *string = '\0'; // don't leave the string uninitialized
++    *string = ""; // don't leave the string uninitialized
+ 
+   // we no longer return invalid attribute. If we cannot find the string in the table,
+   // then it is an arbitrary header. Return success regardless if found or not
+   return NS_OK;
+ }
+ 
+ typedef struct
+ {
+
diff --git a/mail/thunderbird/files/patch-bug945046 b/mail/thunderbird/files/patch-bug945046
new file mode 100644
index 000000000000..79f9ecaf36c2
--- /dev/null
+++ b/mail/thunderbird/files/patch-bug945046
@@ -0,0 +1,130 @@
+diff --git config/system-headers config/system-headers
+index 432cba6..18a9627 100644
+--- mozilla/config/system-headers
++++ mozilla/config/system-headers
+@@ -1157,3 +1157,4 @@ unicode/uenum.h
+ unicode/unum.h
+ unicode/ustring.h
+ #endif
++libutil.h
+diff --git js/src/config/system-headers js/src/config/system-headers
+index 432cba6..18a9627 100644
+--- mozilla/js/src/config/system-headers
++++ mozilla/js/src/config/system-headers
+@@ -1157,3 +1157,4 @@ unicode/uenum.h
+ unicode/unum.h
+ unicode/ustring.h
+ #endif
++libutil.h
+diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
+index 9975621..b4b037d 100644
+--- mozilla/toolkit/library/Makefile.in
++++ mozilla/toolkit/library/Makefile.in
+@@ -289,6 +289,10 @@ OS_LIBS += $(call EXPAND_LIBNAME,kvm)
+ EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols
+ endif
+ 
++ifeq ($(OS_ARCH),FreeBSD)
++OS_LIBS += $(call EXPAND_LIBNAME,util)
++endif
++
+ ifeq ($(OS_ARCH),WINNT)
+ OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 version winspool comdlg32 imm32 msimg32 shlwapi psapi ws2_32 dbghelp rasapi32 rasdlg iphlpapi uxtheme setupapi secur32 sensorsapi portabledeviceguids windowscodecs wininet wbemuuid)
+ ifdef ACCESSIBILITY
+diff --git xpcom/base/nsMemoryReporterManager.cpp xpcom/base/nsMemoryReporterManager.cpp
+index b8147c8..0ffb34e 100644
+--- mozilla/xpcom/base/nsMemoryReporterManager.cpp
++++ mozilla/xpcom/base/nsMemoryReporterManager.cpp
+@@ -153,6 +153,43 @@ static nsresult GetResidentFast(int64_t 
+     return GetResident(n);
+ }
+ 
++#ifdef __FreeBSD__
++#include <libutil.h>
++
++static nsresult
++GetKinfoVmentrySelf(int64_t* prss)
++{
++    int cnt;
++    struct kinfo_vmentry *vmmap, *kve;
++    if ((vmmap = kinfo_getvmmap(getpid(), &cnt)) == NULL)
++        return NS_ERROR_FAILURE;
++
++    if (prss)
++        *prss = 0;
++
++    for (int i = 0; i < cnt; i++) {
++        kve = &vmmap[i];
++        if (prss)
++            *prss += kve->kve_private_resident;
++    }
++
++    free(vmmap);
++    return NS_OK;
++}
++
++#define HAVE_PRIVATE_REPORTER
++static nsresult
++GetPrivate(int64_t* aN)
++{
++    int64_t priv;
++    nsresult rv = GetKinfoVmentrySelf(&priv);
++    if (NS_SUCCEEDED(rv))
++        *aN = priv * getpagesize();
++
++    return NS_OK;
++}
++#endif // FreeBSD
++
+ #elif defined(SOLARIS)
+ 
+ #include <procfs.h>
+@@ -327,6 +364,24 @@ static nsresult GetResidentFast(int64_t 
+ }
+ 
+ #define HAVE_PRIVATE_REPORTER
++static nsresult
++GetPrivate(int64_t* aN)
++{
++    PROCESS_MEMORY_COUNTERS_EX pmcex;
++    pmcex.cb = sizeof(PROCESS_MEMORY_COUNTERS_EX);
++
++    if (!GetProcessMemoryInfo(
++            GetCurrentProcess(),
++            (PPROCESS_MEMORY_COUNTERS) &pmcex, sizeof(pmcex))) {
++        return NS_ERROR_FAILURE;
++    }
++
++    *aN = pmcex.PrivateUsage;
++    return NS_OK;
++}
++#endif  // XP_<PLATFORM>
++
++#ifdef HAVE_PRIVATE_REPORTER
+ class PrivateReporter MOZ_FINAL : public MemoryReporterBase
+ {
+ public:
+@@ -339,21 +394,10 @@ public:
+ 
+     NS_IMETHOD GetAmount(int64_t *aAmount)
+     {
+-        PROCESS_MEMORY_COUNTERS_EX pmcex;
+-        pmcex.cb = sizeof(PROCESS_MEMORY_COUNTERS_EX);
+-
+-        if (!GetProcessMemoryInfo(
+-                GetCurrentProcess(),
+-                (PPROCESS_MEMORY_COUNTERS) &pmcex, sizeof(pmcex))) {
+-            return NS_ERROR_FAILURE;
+-        }
+-
+-        *aAmount = pmcex.PrivateUsage;
+-        return NS_OK;
++        return GetPrivate(aAmount);
+     }
+ };
+-
+-#endif  // XP_<PLATFORM>
++#endif
+ 
+ #ifdef HAVE_VSIZE_AND_RESIDENT_REPORTERS
+ class VsizeReporter MOZ_FINAL : public MemoryReporterBase
diff --git a/mail/thunderbird/files/patch-bug946560 b/mail/thunderbird/files/patch-bug946560
new file mode 100644
index 000000000000..f1ab78af9cce
--- /dev/null
+++ b/mail/thunderbird/files/patch-bug946560
@@ -0,0 +1,44 @@
+diff --git xpcom/base/nsMemoryInfoDumper.cpp xpcom/base/nsMemoryInfoDumper.cpp
+index 0b2f78c..d857374 100644
+--- mozilla/xpcom/base/nsMemoryInfoDumper.cpp
++++ mozilla/xpcom/base/nsMemoryInfoDumper.cpp
+@@ -30,7 +30,7 @@
+ #include <unistd.h>
+ #endif
+ 
+-#ifdef XP_LINUX
++#if defined(XP_LINUX) || defined(__FreeBSD__)
+ #include <fcntl.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -109,7 +109,7 @@ private:
+ 
+ } // anonymous namespace
+ 
+-#ifdef XP_LINUX // {
++#if defined(XP_LINUX) || defined(__FreeBSD__) // {
+ namespace {
+ 
+ /*
+@@ -548,7 +548,7 @@ nsMemoryInfoDumper::~nsMemoryInfoDumper(
+ /* static */ void
+ nsMemoryInfoDumper::Initialize()
+ {
+-#ifdef XP_LINUX
++#if defined(XP_LINUX) || defined(__FreeBSD__)
+   SignalPipeWatcher::Create();
+   FifoWatcher::MaybeCreate();
+ #endif
+diff --git xpcom/base/nsMemoryReporterManager.cpp xpcom/base/nsMemoryReporterManager.cpp
+index 8c65665..8f6d0e9 100644
+--- mozilla/xpcom/base/nsMemoryReporterManager.cpp
++++ mozilla/xpcom/base/nsMemoryReporterManager.cpp
+@@ -824,7 +824,7 @@ nsMemoryReporterManager::Init()
+     RegisterReporter(new mozilla::dmd::DMDReporter);
+ #endif
+ 
+-#if defined(XP_LINUX)
++#if defined(XP_LINUX) || defined(__FreeBSD__)
+     nsMemoryInfoDumper::Initialize();
+ #endif
+ 
diff --git a/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in b/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in
index d22a1c412cac..5495298ae3d1 100644
--- a/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in
+++ b/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in
@@ -4,7 +4,7 @@
  CUSTOM_LIBS=1
  endif
  
-+ifeq ($(OS_ARCH), FreeBSD)
++ifneq (,$(filter DragonFly FreeBSD,$(OS_ARCH)))
 +EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
 +EXTRA_LIBS+= $(filter -L% -l%,${NSPRLINK})
 +CUSTOM_LIBS=1
diff --git a/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp b/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp
index 0d17050c939c..bb337cec0bda 100644
--- a/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp
+++ b/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp
@@ -4,7 +4,7 @@
    TriggerQuirks();
  #endif
  
-+  setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/thunderbird", 0);
++  setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0);
    nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath);
    if (NS_FAILED(rv)) {
      Output("Couldn't calculate the application directory.\n");
diff --git a/mail/thunderbird/files/thunderbird.desktop.in b/mail/thunderbird/files/thunderbird.desktop.in
index 790a064ec01d..bfe4cc1f74c2 100644
--- a/mail/thunderbird/files/thunderbird.desktop.in
+++ b/mail/thunderbird/files/thunderbird.desktop.in
@@ -3,9 +3,9 @@ Encoding=UTF-8
 Name=Thunderbird
 GenericName=Mail Client
 Comment=Mail client and News Reader
-Exec=@MOZILLA@ %U
+Exec=@MOZILLA@ %u
 Icon=@PORTNAME_ICON@
-StartupNotify=false
+StartupNotify=true
 Terminal=false
 Type=Application
-Categories=Application;Network;
+Categories=Network;Email;News;InstantMessaging;