10 files changed, 153 insertions, 28 deletions

diff --git a/mail/thunderbird/files/patch-mozilla-js-src-jsnum.cpp b/mail/thunderbird/files/patch-bug351181
index fdf4840c1441..fdf4840c1441 100644
--- a/mail/thunderbird/files/patch-mozilla-js-src-jsnum.cpp
+++ b/mail/thunderbird/files/patch-bug351181
diff --git a/mail/thunderbird/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp b/mail/thunderbird/files/patch-bug543241
index 3cb45f175317..3cb45f175317 100644
--- a/mail/thunderbird/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
+++ b/mail/thunderbird/files/patch-bug543241
diff --git a/mail/thunderbird/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc b/mail/thunderbird/files/patch-bug732340
index c8e84ca6768a..f09561f4e8e1 100644
--- a/mail/thunderbird/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc
+++ b/mail/thunderbird/files/patch-bug732340
@@ -1,11 +1,14 @@
 --- mozilla/gfx/harfbuzz/src/hb-ot-layout.cc.orig	2012-06-24 22:14:46.463741874 -0400
 +++ mozilla/gfx/harfbuzz/src/hb-ot-layout.cc	2012-06-24 22:15:06.784770042 -0400
-@@ -540,4 +540,8 @@
+@@ -537,4 +537,10 @@ hb_ot_layout_position_finish (hb_face_t 
    GPOS::position_finish (buffer);
  }
  
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
 +template int SortedArrayOf<Record<LangSys> >::search<unsigned int>(unsigned int const &) const;
 +template int SortedArrayOf<Record<Script> >::search<unsigned int>(unsigned int const &) const;
 +template int SortedArrayOf<IntType<unsigned short> >::search<unsigned int>(unsigned int const &) const;
 +template int SortedArrayOf<RangeRecord>::search<unsigned int>(unsigned int const &) const;
++#endif
+ 
  
diff --git a/mail/thunderbird/files/patch-bug753046 b/mail/thunderbird/files/patch-bug753046
index 8d1ccbf2b748..d20eebb42a3c 100644
--- a/mail/thunderbird/files/patch-bug753046
+++ b/mail/thunderbird/files/patch-bug753046
@@ -264,7 +264,7 @@ new file mode 100644
 index 0000000..3fc1a87
 --- /dev/null
 +++ mozilla/ipc/chromium/src/base/dir_reader_bsd.h
-@@ -0,0 +1,108 @@
+@@ -0,0 +1,112 @@
 +// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -316,7 +316,11 @@ index 0000000..3fc1a87
 +  bool Next() {
 +    if (size_) {
 +      struct dirent* dirent = reinterpret_cast<struct dirent*>(&buf_[offset_]);
++#ifdef OS_DRAGONFLY
++      offset_ += _DIRENT_DIRSIZ(dirent);
++#else
 +      offset_ += dirent->d_reclen;
++#endif
 +    }
 +
 +    if (offset_ != size_)
diff --git a/mail/thunderbird/files/patch-bug774671 b/mail/thunderbird/files/patch-bug774671
new file mode 100644
index 000000000000..35fbe946041c
--- /dev/null
+++ b/mail/thunderbird/files/patch-bug774671
@@ -0,0 +1,15 @@
+--- mozilla/js/src/jsprvtd.h.orig	2012-08-25 02:31:13.000000000 +0200
++++ mozilla/js/src/jsprvtd.h	2012-09-06 17:14:09.000000000 +0200
+@@ -149,9 +149,9 @@
+ class UpvarCookie;
+ 
+ class Proxy;
+-class BaseProxyHandler;
+-class DirectWrapper;
+-class CrossCompartmentWrapper;
++class JS_FRIEND_API(BaseProxyHandler);
++class JS_FRIEND_API(DirectWrapper);
++class JS_FRIEND_API(CrossCompartmentWrapper);
+ 
+ class TempAllocPolicy;
+ class RuntimeAllocPolicy;
diff --git a/mail/thunderbird/files/patch-bug787904 b/mail/thunderbird/files/patch-bug787904
new file mode 100644
index 000000000000..efd1a9154581
--- /dev/null
+++ b/mail/thunderbird/files/patch-bug787904
@@ -0,0 +1,12 @@
+--- mozilla/js/src/gc/Heap.h
++++ mozilla/js/src/gc/Heap.h
+@@ -108,7 +108,8 @@ struct Cell
+  * Bug 692267: Move page size definition to gc/Memory.h and include it
+  *             directly once jsgc.h is no longer an installed header.
+  */
+-#if defined(SOLARIS) && (defined(__sparc) || defined(__sparcv9))
++#if (defined(SOLARIS) || defined(__FreeBSD__)) && \
++    (defined(__sparc) || defined(__sparcv9) || defined(__ia64))
+ const size_t PageShift = 13;
+ #else
+ const size_t PageShift = 12;
diff --git a/mail/thunderbird/files/patch-bug788039 b/mail/thunderbird/files/patch-bug788039
new file mode 100644
index 000000000000..c42105d133c4
--- /dev/null
+++ b/mail/thunderbird/files/patch-bug788039
@@ -0,0 +1,59 @@
+# Bug 788039 - With no prefix search libevent via pkg-config.
+
+--- mozilla/config/autoconf.mk.in~
++++ mozilla/config/autoconf.mk.in
+@@ -227,7 +227,7 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA
+ 
+ MOZ_NATIVE_LIBEVENT = @MOZ_NATIVE_LIBEVENT@
+ MOZ_LIBEVENT_LIBS = @MOZ_LIBEVENT_LIBS@
+-MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@
++MOZ_LIBEVENT_CFLAGS = @MOZ_LIBEVENT_CFLAGS@
+ 
+ MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@
+ MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@
+--- mozilla/configure.in~
++++ mozilla/configure.in
+@@ -3854,7 +3854,7 @@ fi
+ dnl system libevent Support
+ dnl ========================================================
+ MOZ_ARG_WITH_STRING(system-libevent,
+-[  --with-system-libevent=[PFX]
++[  --with-system-libevent[=PFX]
+                           Use system libevent [installed at prefix PFX]],
+     LIBEVENT_DIR=$withval)
+ 
+@@ -3863,10 +3863,11 @@ _SAVE_LDFLAGS=$LDFLAGS
+ _SAVE_LIBS=$LIBS
+ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
+     MOZ_NATIVE_LIBEVENT=
++elif test "$LIBEVENT_DIR" = yes; then
++    PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
++        MOZ_NATIVE_LIBEVENT=1,
++        AC_MSG_ERROR([--with-system-libevent requested but libevent package not found]))
+ else
+-    if test "${LIBEVENT_DIR}" = "yes"; then
+-        LIBEVENT_DIR=/usr
+-    fi
+     CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS"
+     LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS"
+     MOZ_CHECK_HEADER(event.h,
+@@ -3876,16 +3877,16 @@ else
+         AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
+     AC_CHECK_LIB(event, event_init,
+                  [MOZ_NATIVE_LIBEVENT=1
+-                  MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
++                  MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include"
+                   MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
+-                 [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
++                 [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=])
+ fi
+ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
+ 
+ AC_SUBST(MOZ_NATIVE_LIBEVENT)
+-AC_SUBST(MOZ_LIBEVENT_INCLUDES)
++AC_SUBST(MOZ_LIBEVENT_CFLAGS)
+ AC_SUBST(MOZ_LIBEVENT_LIBS)
+ 
+ dnl ========================================================
diff --git a/mail/thunderbird/files/patch-clang32-libc++-visibility-hack b/mail/thunderbird/files/patch-clang32-libc++-visibility-hack
new file mode 100644
index 000000000000..9b920f63be0f
--- /dev/null
+++ b/mail/thunderbird/files/patch-clang32-libc++-visibility-hack
@@ -0,0 +1,57 @@
+--- configure.in~
++++ configure.in
+@@ -2855,6 +2855,7 @@ EOF
+ #pragma GCC visibility push(hidden)
+ #pragma GCC visibility push(default)
+ #include <string.h>
++#include <iterator>
+ #pragma GCC visibility pop
+ 
+ __attribute__ ((visibility ("default"))) void Func() {
+@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() {
+ }
+ EOF
+                        ac_cv_have_visibility_builtin_bug=no
+-                       if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
++                       if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
+                          ac_cv_have_visibility_builtin_bug=yes
+                        else
+                          if test `grep -c "@PLT" conftest.S` = 0; then
+--- mozilla/configure.in~
++++ mozilla/configure.in
+@@ -2855,6 +2855,7 @@ EOF
+ #pragma GCC visibility push(hidden)
+ #pragma GCC visibility push(default)
+ #include <string.h>
++#include <iterator>
+ #pragma GCC visibility pop
+ 
+ __attribute__ ((visibility ("default"))) void Func() {
+@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() {
+ }
+ EOF
+                        ac_cv_have_visibility_builtin_bug=no
+-                       if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
++                       if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
+                          ac_cv_have_visibility_builtin_bug=yes
+                        else
+                          if test `grep -c "@PLT" conftest.S` = 0; then
+--- mozilla/js/src/configure.in~
++++ mozilla/js/src/configure.in
+@@ -2855,6 +2855,7 @@ EOF
+ #pragma GCC visibility push(hidden)
+ #pragma GCC visibility push(default)
+ #include <string.h>
++#include <iterator>
+ #pragma GCC visibility pop
+ 
+ __attribute__ ((visibility ("default"))) void Func() {
+@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() {
+ }
+ EOF
+                        ac_cv_have_visibility_builtin_bug=no
+-                       if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
++                       if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
+                          ac_cv_have_visibility_builtin_bug=yes
+                        else
+                          if test `grep -c "@PLT" conftest.S` = 0; then
diff --git a/mail/thunderbird/files/patch-mozilla-configure.in b/mail/thunderbird/files/patch-mozilla-configure.in
deleted file mode 100644
index d084ef86926d..000000000000
--- a/mail/thunderbird/files/patch-mozilla-configure.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- mozilla/configure.in.orig	2012-05-23 20:56:34.000000000 +0200
-+++ mozilla/configure.in	2012-05-27 18:18:25.000000000 +0200
-@@ -4230,6 +4233,9 @@
- if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
-     MOZ_NATIVE_LIBEVENT=
- else
-+PKG_CHECK_MODULES(MOZ_LIBEVENT,	libevent,
-+    [MOZ_NATIVE_LIBEVENT=1
-+     MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [
-     if test "${LIBEVENT_DIR}" = "yes"; then
-         LIBEVENT_DIR=/usr
-     fi
-@@ -4242,10 +4248,11 @@ else
-         AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
-     AC_CHECK_LIB(event, event_init,
-                  [MOZ_NATIVE_LIBEVENT=1
--                  MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
-+                  MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include"
-                   MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
-                  [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
- fi
-+])
- CFLAGS=$_SAVE_CFLAGS
- LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
diff --git a/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in b/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in
index 5d2e72cd0a96..294e8270334a 100644
--- a/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in
+++ b/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in
@@ -22,7 +22,7 @@
 -# message_pump_libevent.cc includes third_party/libevent/event.h,
 -# which we put in $(DIST), see export rule below
 -LOCAL_INCLUDES += -I$(DIST)
-+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_INCLUDES))
++LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS))
  endif # }
  
  vpath %.cc \