From e9a2e4c58d7523ffc22df112de664d12feff5ff8 Mon Sep 17 00:00:00 2001
From: nigel <nigel@openbsd.org>
Date: Wed, 11 Jan 2012 01:19:43 +0000
Subject: [PATCH] Update thunderbird to 9.0.1

Changes from mpi@ for macppc

Ok landry@, stsp@, mpi@
---
 .../patch-mozilla_gfx_thebes_Makefile_in      |  8 +--
 ...-mozilla_ipc_chromium_src_base_atomicops_h | 17 ++-----
 ..._ipc_chromium_src_base_debug_util_posix_cc | 35 -------------
 ...a_ipc_chromium_src_base_dir_reader_posix_h | 24 +++++++++
 ...-mozilla_ipc_chromium_src_base_file_util_h | 11 ----
 ...a_ipc_chromium_src_base_file_util_posix_cc | 16 +++---
 ...c_chromium_src_base_platform_file_posix_cc | 13 -----
 ...chromium_src_base_platform_thread_posix_cc | 12 -----
 ...omium_src_base_third_party_nspr_prcpucfg_h | 10 ++--
 ...ozilla_ipc_chromium_src_base_time_posix_cc | 12 -----
 ...illa_ipc_chromium_src_build_build_config_h | 31 -----------
 ...ium_src_chrome_common_ipc_channel_posix_cc | 10 ++--
 ...mium_src_chrome_common_ipc_message_utils_h | 51 ++++++++++++-------
 .../patches/patch-mozilla_js_src_Makefile_in  | 26 ----------
 .../patches/patch-mozilla_js_src_configure_in | 14 ++---
 ...h-mozilla_js_src_xpconnect_src_Makefile_in |  8 +--
 ...zilla_security_manager_ssl_src_Makefile_in |  8 +--
 ...zilla_storage_src_mozStorageConnection_cpp |  8 +--
 .../patch-mozilla_toolkit_library_Makefile_in | 10 ++--
 ...h-mozilla_toolkit_library_libxul-config_mk |  8 +--
 ...illa_toolkit_mozapps_installer_packager_mk | 24 ---------
 ...patch-mozilla_widget_public_nsIGfxInfo_idl | 15 ------
 ...mozilla_widget_src_xpwidgets_GfxInfoBase_h | 16 ------
 ...-mozilla_widget_src_xpwidgets_GfxInfoX11_h | 23 ---------
 ...illa_widget_src_xpwidgets_nsBaseWidget_cpp | 48 -----------------
 ...om_reflect_xptcall_src_md_unix_Makefile_in |  8 +--
 mail/mozilla-thunderbird/pkg/PLIST-main       |  5 +-
 27 files changed, 119 insertions(+), 352 deletions(-)
 delete mode 100644 mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_debug_util_posix_cc
 create mode 100644 mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_dir_reader_posix_h
 delete mode 100644 mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file_util_h
 delete mode 100644 mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform_file_posix_cc
 delete mode 100644 mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform_thread_posix_cc
 delete mode 100644 mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_time_posix_cc
 delete mode 100644 mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_build_build_config_h
 delete mode 100644 mail/mozilla-thunderbird/patches/patch-mozilla_js_src_Makefile_in
 delete mode 100644 mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_mozapps_installer_packager_mk
 delete mode 100644 mail/mozilla-thunderbird/patches/patch-mozilla_widget_public_nsIGfxInfo_idl
 delete mode 100644 mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_xpwidgets_GfxInfoBase_h
 delete mode 100644 mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_xpwidgets_GfxInfoX11_h
 delete mode 100644 mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_xpwidgets_nsBaseWidget_cpp

diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_gfx_thebes_Makefile_in b/mail/mozilla-thunderbird/patches/patch-mozilla_gfx_thebes_Makefile_in
index db1b8909cf9..0100e0d1b66 100644
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_gfx_thebes_Makefile_in
+++ b/mail/mozilla-thunderbird/patches/patch-mozilla_gfx_thebes_Makefile_in
@@ -1,8 +1,8 @@
-$OpenBSD: patch-mozilla_gfx_thebes_Makefile_in,v 1.4 2011/12/08 02:25:59 nigel Exp $
+$OpenBSD: patch-mozilla_gfx_thebes_Makefile_in,v 1.5 2012/01/11 01:19:43 nigel Exp $
 ????
---- mozilla/gfx/thebes/Makefile.in.orig	Sat Nov  5 09:20:35 2011
-+++ mozilla/gfx/thebes/Makefile.in	Tue Nov  8 15:21:46 2011
-@@ -389,6 +389,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+--- mozilla/gfx/thebes/Makefile.in.orig	Thu Dec 15 01:22:31 2011
++++ mozilla/gfx/thebes/Makefile.in	Mon Dec 19 22:30:24 2011
+@@ -382,6 +382,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
  CXXFLAGS += $(MOZ_PANGO_CFLAGS)
  endif
  
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_atomicops_h b/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_atomicops_h
index 189ab1efa1b..04ec686950d 100644
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_atomicops_h
+++ b/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_atomicops_h
@@ -1,7 +1,7 @@
-$OpenBSD: patch-mozilla_ipc_chromium_src_base_atomicops_h,v 1.2 2011/10/28 12:31:41 robert Exp $
---- mozilla/ipc/chromium/src/base/atomicops.h.orig	Fri Oct 28 12:35:06 2011
-+++ mozilla/ipc/chromium/src/base/atomicops.h	Fri Oct 28 14:10:20 2011
-@@ -40,12 +40,16 @@ namespace subtle {
+$OpenBSD: patch-mozilla_ipc_chromium_src_base_atomicops_h,v 1.3 2012/01/11 01:19:43 nigel Exp $
+--- mozilla/ipc/chromium/src/base/atomicops.h.orig	Thu Dec 15 01:22:33 2011
++++ mozilla/ipc/chromium/src/base/atomicops.h	Tue Dec 20 00:40:52 2011
+@@ -40,7 +40,7 @@ namespace subtle {
  #endif
  typedef __w64 int32 Atomic32;
  #ifdef ARCH_CPU_64_BITS
@@ -10,12 +10,3 @@ $OpenBSD: patch-mozilla_ipc_chromium_src_base_atomicops_h,v 1.2 2011/10/28 12:31
  #endif
  
  // Use AtomicWord for a machine-sized pointer.  It will use the Atomic32 or
- // Atomic64 routines below, depending on your architecture.
-+#if defined(OS_OPENBSD) && !defined(ARCH_CPU_64_BITS)
-+typedef Atomic32 AtomicWord;
-+#else
- typedef intptr_t AtomicWord;
-+#endif
- 
- // Atomically execute:
- //      result = *ptr;
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_debug_util_posix_cc b/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_debug_util_posix_cc
deleted file mode 100644
index 7be3e065052..00000000000
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_debug_util_posix_cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$OpenBSD: patch-mozilla_ipc_chromium_src_base_debug_util_posix_cc,v 1.1 2011/07/24 07:10:12 landry Exp $
---- mozilla/ipc/chromium/src/base/debug_util_posix.cc.orig	Sat May 28 00:43:47 2011
-+++ mozilla/ipc/chromium/src/base/debug_util_posix.cc	Mon May 30 17:12:06 2011
-@@ -8,10 +8,12 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <stdio.h>
-+#include <limits.h>
- #include <sys/stat.h>
-+#include <sys/param.h>
- #include <sys/types.h>
- #include <unistd.h>
--#ifndef ANDROID
-+#ifdef __GLIBC__
- #include <execinfo.h>
- #include <sys/sysctl.h>
- #endif
-@@ -119,7 +121,7 @@ StackTrace::StackTrace() {
-   const int kMaxCallers = 256;
- 
-   void* callers[kMaxCallers];
--#ifndef ANDROID
-+#ifdef __GLIBC__
-   int count = backtrace(callers, kMaxCallers);
- #else
-   int count = 0;
-@@ -138,7 +140,7 @@ StackTrace::StackTrace() {
- 
- void StackTrace::PrintBacktrace() {
-   fflush(stderr);
--#ifndef ANDROID
-+#ifdef __GLIBC__
-   backtrace_symbols_fd(&trace_[0], trace_.size(), STDERR_FILENO);
- #endif
- }
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_dir_reader_posix_h b/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_dir_reader_posix_h
new file mode 100644
index 00000000000..802bc690be7
--- /dev/null
+++ b/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_dir_reader_posix_h
@@ -0,0 +1,24 @@
+$OpenBSD: patch-mozilla_ipc_chromium_src_base_dir_reader_posix_h,v 1.1 2012/01/11 01:19:43 nigel Exp $
+
+New issue to be sent upstream.
+
+--- mozilla/ipc/chromium/src/base/dir_reader_posix.h.orig	Thu Dec 15 01:22:33 2011
++++ mozilla/ipc/chromium/src/base/dir_reader_posix.h	Mon Dec 19 22:41:00 2011
+@@ -18,7 +18,7 @@
+ // seems worse than falling back to enumerating all file descriptors so we will
+ // probably never implement this on the Mac.
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) && ! defined(OS_OPENBSD)
+ #include "base/dir_reader_linux.h"
+ #else
+ #include "base/dir_reader_fallback.h"
+@@ -26,7 +26,7 @@
+ 
+ namespace base {
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) && ! defined(OS_OPENBSD)
+ typedef DirReaderLinux DirReaderPosix;
+ #else
+ typedef DirReaderFallback DirReaderPosix;
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file_util_h b/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file_util_h
deleted file mode 100644
index 17bc564acb2..00000000000
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file_util_h
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-mozilla_ipc_chromium_src_base_file_util_h,v 1.1 2011/07/24 07:10:12 landry Exp $
---- mozilla/ipc/chromium/src/base/file_util.h.orig	Sat May 28 00:43:47 2011
-+++ mozilla/ipc/chromium/src/base/file_util.h	Mon May 30 17:12:06 2011
-@@ -15,6 +15,7 @@
- #elif defined(ANDROID)
- #include <sys/stat.h>
- #elif defined(OS_POSIX) 
-+#include <sys/types.h>
- #include <fts.h>
- #include <sys/stat.h>
- #endif
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file_util_posix_cc b/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file_util_posix_cc
index bd2e696ac48..36e51ce8329 100644
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file_util_posix_cc
+++ b/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file_util_posix_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-mozilla_ipc_chromium_src_base_file_util_posix_cc,v 1.1 2011/07/24 07:10:12 landry Exp $
---- mozilla/ipc/chromium/src/base/file_util_posix.cc.orig	Sat May 28 00:43:47 2011
-+++ mozilla/ipc/chromium/src/base/file_util_posix.cc	Mon May 30 17:12:06 2011
-@@ -71,8 +71,8 @@ int CountFilesCreatedAfter(const FilePath& path,
+$OpenBSD: patch-mozilla_ipc_chromium_src_base_file_util_posix_cc,v 1.2 2012/01/11 01:19:43 nigel Exp $
+--- mozilla/ipc/chromium/src/base/file_util_posix.cc.orig	Thu Dec 15 01:22:33 2011
++++ mozilla/ipc/chromium/src/base/file_util_posix.cc	Mon Dec 19 22:30:24 2011
+@@ -76,8 +76,8 @@ int CountFilesCreatedAfter(const FilePath& path,
            (strcmp(ent->d_name, "..") == 0))
          continue;
  
@@ -12,7 +12,7 @@ $OpenBSD: patch-mozilla_ipc_chromium_src_base_file_util_posix_cc,v 1.1 2011/07/2
        if (test != 0) {
          LOG(ERROR) << "stat64 failed: " << strerror(errno);
          continue;
-@@ -106,8 +106,8 @@ int CountFilesCreatedAfter(const FilePath& path,
+@@ -111,8 +111,8 @@ int CountFilesCreatedAfter(const FilePath& path,
  // here.
  bool Delete(const FilePath& path, bool recursive) {
    const char* path_str = path.value().c_str();
@@ -23,7 +23,7 @@ $OpenBSD: patch-mozilla_ipc_chromium_src_base_file_util_posix_cc,v 1.1 2011/07/2
    if (test != 0) {
      // The Windows version defines this condition as success.
      bool ret = (errno == ENOENT || errno == ENOTDIR);
-@@ -286,19 +286,19 @@ bool CopyDirectory(const FilePath& from_path,
+@@ -291,19 +291,19 @@ bool CopyDirectory(const FilePath& from_path,
  }
  
  bool PathExists(const FilePath& path) {
@@ -48,7 +48,7 @@ $OpenBSD: patch-mozilla_ipc_chromium_src_base_file_util_posix_cc,v 1.1 2011/07/2
        return false;
    }
    if (S_IWOTH & file_info.st_mode)
-@@ -311,8 +311,8 @@ bool PathIsWritable(const FilePath& path) {
+@@ -316,8 +316,8 @@ bool PathIsWritable(const FilePath& path) {
  }
  
  bool DirectoryExists(const FilePath& path) {
@@ -59,7 +59,7 @@ $OpenBSD: patch-mozilla_ipc_chromium_src_base_file_util_posix_cc,v 1.1 2011/07/2
      return S_ISDIR(file_info.st_mode);
    return false;
  }
-@@ -449,8 +449,8 @@ bool CreateDirectory(const FilePath& full_path) {
+@@ -454,8 +454,8 @@ bool CreateDirectory(const FilePath& full_path) {
  }
  
  bool GetFileInfo(const FilePath& file_path, FileInfo* results) {
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform_file_posix_cc b/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform_file_posix_cc
deleted file mode 100644
index 7df0aef66bc..00000000000
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform_file_posix_cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-mozilla_ipc_chromium_src_base_platform_file_posix_cc,v 1.1 2011/07/24 07:10:12 landry Exp $
---- mozilla/ipc/chromium/src/base/platform_file_posix.cc.orig	Sat May 28 00:43:47 2011
-+++ mozilla/ipc/chromium/src/base/platform_file_posix.cc	Mon May 30 17:12:06 2011
-@@ -4,6 +4,9 @@
- 
- #include "base/platform_file.h"
- 
-+#ifdef __OpenBSD__
-+#include <sys/stat.h>
-+#endif
- #include <fcntl.h>
- #include <errno.h>
- #ifdef ANDROID
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform_thread_posix_cc b/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform_thread_posix_cc
deleted file mode 100644
index 41970eeb281..00000000000
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform_thread_posix_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-mozilla_ipc_chromium_src_base_platform_thread_posix_cc,v 1.1 2011/07/24 07:10:12 landry Exp $
---- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig	Sat May 28 00:43:47 2011
-+++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc	Mon May 30 17:12:06 2011
-@@ -33,6 +33,8 @@ PlatformThreadId PlatformThread::CurrentId() {
-   // into the kernel.
- #if defined(OS_MACOSX)
-   return mach_thread_self();
-+#elif defined(__OpenBSD__)
-+  return getpid();
- #elif defined(OS_LINUX)
-   return syscall(__NR_gettid);
- #endif
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_third_party_nspr_prcpucfg_h b/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_third_party_nspr_prcpucfg_h
index e93c9647304..5740b5a7dea 100644
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_third_party_nspr_prcpucfg_h
+++ b/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_third_party_nspr_prcpucfg_h
@@ -1,6 +1,6 @@
-$OpenBSD: patch-mozilla_ipc_chromium_src_base_third_party_nspr_prcpucfg_h,v 1.1 2011/07/24 07:10:12 landry Exp $
---- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig	Sat May 28 00:43:47 2011
-+++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h	Mon May 30 17:12:06 2011
+$OpenBSD: patch-mozilla_ipc_chromium_src_base_third_party_nspr_prcpucfg_h,v 1.2 2012/01/11 01:19:43 nigel Exp $
+--- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig	Thu Dec 15 01:22:33 2011
++++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h	Mon Dec 19 22:30:24 2011
 @@ -34,7 +34,7 @@
  #include "base/third_party/nspr/prcpucfg_win.h"
  #elif defined(__APPLE__)
@@ -8,5 +8,5 @@ $OpenBSD: patch-mozilla_ipc_chromium_src_base_third_party_nspr_prcpucfg_h,v 1.1
 -#elif defined(__linux__) || defined(ANDROID)
 +#elif defined(__linux__) || defined(ANDROID) || defined(__OpenBSD__)
  #include "base/third_party/nspr/prcpucfg_linux.h"
- #else
- #error Provide a prcpucfg.h appropriate for your platform
+ #elif defined(__OpenBSD__)
+ #include "base/third_party/nspr/prcpucfg_openbsd.h"
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_time_posix_cc b/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_time_posix_cc
deleted file mode 100644
index 626ddb51577..00000000000
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_base_time_posix_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-mozilla_ipc_chromium_src_base_time_posix_cc,v 1.1 2011/07/24 07:10:12 landry Exp $
---- mozilla/ipc/chromium/src/base/time_posix.cc.orig	Sat May 28 00:43:47 2011
-+++ mozilla/ipc/chromium/src/base/time_posix.cc	Mon May 30 17:12:06 2011
-@@ -164,7 +164,7 @@ TimeTicks TimeTicks::Now() {
-   // With numer and denom = 1 (the expected case), the 64-bit absolute time
-   // reported in nanoseconds is enough to last nearly 585 years.
- 
--#elif defined(OS_POSIX) && \
-+#elif defined(__OpenBSD__) || defined(OS_POSIX) && \
-       defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
- 
-   struct timespec ts;
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_build_build_config_h b/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_build_build_config_h
deleted file mode 100644
index b91e4bf4914..00000000000
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_build_build_config_h
+++ /dev/null
@@ -1,31 +0,0 @@
-$OpenBSD: patch-mozilla_ipc_chromium_src_build_build_config_h,v 1.2 2011/08/23 20:19:33 landry Exp $
---- mozilla/ipc/chromium/src/build/build_config.h.orig	Fri Jul 15 07:51:27 2011
-+++ mozilla/ipc/chromium/src/build/build_config.h	Sun Jul 31 22:33:36 2011
-@@ -19,6 +19,8 @@
- #define OS_MACOSX 1
- #elif defined(__linux__) || defined(ANDROID)
- #define OS_LINUX 1
-+#elif defined(__OpenBSD__)
-+#define OS_OPENBSD 1
- #elif defined(_WIN32)
- #define OS_WIN 1
- #else
-@@ -27,7 +29,7 @@
- 
- // For access to standard POSIX features, use OS_POSIX instead of a more
- // specific macro.
--#if defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_OPENBSD)
- #define OS_POSIX 1
- #endif
- 
-@@ -60,6 +62,9 @@
- #elif defined(__ppc__) || defined(__powerpc__)
- #define ARCH_CPU_PPC 1
- #define ARCH_CPU_32_BITS 1
-+#elif defined(__sparc64__)
-+#define ARCH_CPU_SPARC 1
-+#define ARCH_CPU_64_BITS 1
- #else
- #error Please add support for your architecture in build/build_config.h
- #endif
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc_channel_posix_cc b/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc_channel_posix_cc
index 96ea7c2618c..72cea5b8e37 100644
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc_channel_posix_cc
+++ b/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc_channel_posix_cc
@@ -1,9 +1,9 @@
-$OpenBSD: patch-mozilla_ipc_chromium_src_chrome_common_ipc_channel_posix_cc,v 1.1 2011/07/24 07:10:12 landry Exp $
---- mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc.orig	Sat May 28 00:43:47 2011
-+++ mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc	Mon May 30 17:12:06 2011
-@@ -12,6 +12,9 @@
- #include <sys/stat.h>
+$OpenBSD: patch-mozilla_ipc_chromium_src_chrome_common_ipc_channel_posix_cc,v 1.2 2012/01/11 01:19:43 nigel Exp $
+--- mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc.orig	Thu Dec 15 01:22:33 2011
++++ mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc	Mon Dec 19 22:30:24 2011
+@@ -13,6 +13,9 @@
  #include <sys/un.h>
+ #include <sys/uio.h>
  
 +// error: variable 'iovec iov' has initializer but incomplete type
 +#include <sys/uio.h>
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc_message_utils_h b/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc_message_utils_h
index 85a8c273035..b0ee7137cbd 100644
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc_message_utils_h
+++ b/mail/mozilla-thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc_message_utils_h
@@ -1,21 +1,36 @@
-$OpenBSD: patch-mozilla_ipc_chromium_src_chrome_common_ipc_message_utils_h,v 1.2 2011/10/28 12:31:41 robert Exp $
---- mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h.orig	Thu Sep 29 14:31:21 2011
-+++ mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h	Fri Oct 28 12:33:59 2011
-@@ -219,7 +219,7 @@ struct ParamTraits<unsigned long> {
+$OpenBSD: patch-mozilla_ipc_chromium_src_chrome_common_ipc_message_utils_h,v 1.3 2012/01/11 01:19:43 nigel Exp $
+
+Add new long long template, may not be best solution.
+
+--- mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h.orig	Thu Dec 15 01:22:33 2011
++++ mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h	Mon Dec 19 00:50:51 2011
+@@ -193,6 +193,29 @@ struct ParamTraits<unsigned long long> {
+     l->append(StringPrintf(L"%ull", p));
    }
  };
++
++template <>
++struct ParamTraits<long long> {
++  typedef long long param_type;
++  static void Write(Message* m, const param_type& p) {
++    m->WriteData(reinterpret_cast<const char*>(&p), sizeof(param_type));
++ }
++  static bool Read(const Message* m, void** iter, param_type* r) {
++    const char *data;
++    int data_size = 0;
++    bool result = m->ReadData(iter, &data, &data_size);
++    if (result && data_size == sizeof(param_type)) {
++      memcpy(r, data, sizeof(param_type));
++    } else {
++      result = false;
++      NOTREACHED();
++    }
++    return result;
++  }
++  static void Log(const param_type& p, std::wstring* l) {
++    l->append(StringPrintf(L"%ull", p));
++  }
++};
+ #endif
  
--#if !(defined(OS_MACOSX) || defined(OS_WIN) || (defined(CHROMIUM_MOZILLA_BUILD) && defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)))
-+#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(CHROMIUM_MOZILLA_BUILD) && defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)))
- // There size_t is a synonym for |unsigned long| ...
- template <>
- struct ParamTraits<size_t> {
-@@ -272,7 +272,7 @@ struct ParamTraits<uint32> {
- };
- #endif  // defined(OS_MACOSX)
- 
--#if !(defined(CHROMIUM_MOZILLA_BUILD) && defined(OS_LINUX) && defined(ARCH_CPU_64_BITS))
-+#if !(defined(CHROMIUM_MOZILLA_BUILD) && defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) || defined(OS_OPENBSD)
- // int64 is |long int| on 64-bit systems, uint64 is |unsigned long|
- template <>
- struct ParamTraits<int64> {
+ #if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)))
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_js_src_Makefile_in b/mail/mozilla-thunderbird/patches/patch-mozilla_js_src_Makefile_in
deleted file mode 100644
index 82b2096c9a4..00000000000
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_js_src_Makefile_in
+++ /dev/null
@@ -1,26 +0,0 @@
-$OpenBSD: patch-mozilla_js_src_Makefile_in,v 1.1 2011/12/08 02:25:59 nigel Exp $
---- mozilla/js/src/Makefile.in.orig	Thu Nov 17 15:22:31 2011
-+++ mozilla/js/src/Makefile.in	Thu Nov 17 16:59:24 2011
-@@ -438,6 +438,9 @@ else
- ###############################################
- # BEGIN include sources for the Nitro assembler
- #
-+
-+ENABLE_YARR_JIT = 1
-+
- VPATH += 	$(srcdir)/assembler \
- 		$(srcdir)/assembler/wtf \
- 		$(srcdir)/assembler/jit \
-@@ -1081,7 +1084,11 @@ endif
- # Needed to "configure" it correctly.  Unfortunately these
- # flags wind up being applied to all code in js/src, not just
- # the code in js/src/assembler.
--CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1
-+CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1
-+
-+ifneq (,$(ENABLE_YARR_JIT)$(ENABLE_TRACEJIT)$(ENABLE_METHODJIT))
-+CXXFLAGS +=  -DENABLE_JIT=1
-+endif
- 
- INCLUDES +=	-I$(srcdir)/assembler -I$(srcdir)/yarr
- 
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_js_src_configure_in b/mail/mozilla-thunderbird/patches/patch-mozilla_js_src_configure_in
index 73f2f2248bf..20994708426 100644
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_js_src_configure_in
+++ b/mail/mozilla-thunderbird/patches/patch-mozilla_js_src_configure_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-mozilla_js_src_configure_in,v 1.6 2011/12/08 02:25:59 nigel Exp $
---- mozilla/js/src/configure.in.orig	Sat Nov  5 09:20:38 2011
-+++ mozilla/js/src/configure.in	Tue Nov  8 15:21:46 2011
-@@ -1256,7 +1256,7 @@ WIN_TOP_SRC=
+$OpenBSD: patch-mozilla_js_src_configure_in,v 1.7 2012/01/11 01:19:43 nigel Exp $
+--- mozilla/js/src/configure.in.orig	Thu Dec 15 01:22:34 2011
++++ mozilla/js/src/configure.in	Mon Dec 19 22:30:24 2011
+@@ -1236,7 +1236,7 @@ WIN_TOP_SRC=
  MOZ_USER_DIR=".mozilla"
  
  MOZ_JS_LIBS='-L$(libdir) -lmozjs'
@@ -10,7 +10,7 @@ $OpenBSD: patch-mozilla_js_src_configure_in,v 1.6 2011/12/08 02:25:59 nigel Exp
  
  MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
  
-@@ -2440,7 +2440,7 @@ ia64*-hpux*)
+@@ -2231,7 +2231,7 @@ ia64*-hpux*)
      ;;
  
  *-openbsd*)
@@ -19,7 +19,7 @@ $OpenBSD: patch-mozilla_js_src_configure_in,v 1.6 2011/12/08 02:25:59 nigel Exp
      DSO_CFLAGS=''
      DSO_PIC_CFLAGS='-fPIC'
      DSO_LDOPTS='-shared -fPIC'
-@@ -2763,7 +2763,7 @@ arm*-*)
+@@ -2511,7 +2511,7 @@ arm*-*)
      AC_DEFINE(JS_CPU_ARM)
      AC_DEFINE(JS_NUNBOX32)
      ;;
@@ -28,7 +28,7 @@ $OpenBSD: patch-mozilla_js_src_configure_in,v 1.6 2011/12/08 02:25:59 nigel Exp
      ENABLE_TRACEJIT=1
      NANOJIT_ARCH=Sparc
      ENABLE_METHODJIT=1
-@@ -2850,7 +2850,7 @@ case "$target" in
+@@ -2598,7 +2598,7 @@ case "$target" in
  *-solaris*)
      AC_DEFINE(AVMPLUS_UNIX)
      ;;
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_js_src_xpconnect_src_Makefile_in b/mail/mozilla-thunderbird/patches/patch-mozilla_js_src_xpconnect_src_Makefile_in
index 75f6e16ada3..6ec4b1c3404 100644
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_js_src_xpconnect_src_Makefile_in
+++ b/mail/mozilla-thunderbird/patches/patch-mozilla_js_src_xpconnect_src_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-mozilla_js_src_xpconnect_src_Makefile_in,v 1.5 2011/10/03 21:07:05 landry Exp $
---- mozilla/js/src/xpconnect/src/Makefile.in.orig	Wed Aug 31 23:36:53 2011
-+++ mozilla/js/src/xpconnect/src/Makefile.in	Thu Sep  1 10:23:17 2011
-@@ -179,6 +179,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \
+$OpenBSD: patch-mozilla_js_src_xpconnect_src_Makefile_in,v 1.6 2012/01/11 01:19:43 nigel Exp $
+--- mozilla/js/src/xpconnect/src/Makefile.in.orig	Thu Dec 15 01:22:41 2011
++++ mozilla/js/src/xpconnect/src/Makefile.in	Mon Dec 19 22:30:25 2011
+@@ -170,6 +170,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \
  	  --makedepend-output $(MDDEPDIR)/dom_qsgen.pp \
  	  $(ENABLE_TRACEABLE_FLAGS) \
  	  $(srcdir)/dom_quickstubs.qsconf
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_security_manager_ssl_src_Makefile_in b/mail/mozilla-thunderbird/patches/patch-mozilla_security_manager_ssl_src_Makefile_in
index 04108fe2ce8..1c6976c97e3 100644
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_security_manager_ssl_src_Makefile_in
+++ b/mail/mozilla-thunderbird/patches/patch-mozilla_security_manager_ssl_src_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-mozilla_security_manager_ssl_src_Makefile_in,v 1.2 2011/07/24 07:10:12 landry Exp $
---- mozilla/security/manager/ssl/src/Makefile.in.orig	Sat May 28 00:44:24 2011
-+++ mozilla/security/manager/ssl/src/Makefile.in	Mon May 30 14:28:50 2011
-@@ -115,7 +115,10 @@ CSRCS += md4.c
+$OpenBSD: patch-mozilla_security_manager_ssl_src_Makefile_in,v 1.3 2012/01/11 01:19:43 nigel Exp $
+--- mozilla/security/manager/ssl/src/Makefile.in.orig	Thu Dec 15 01:22:55 2011
++++ mozilla/security/manager/ssl/src/Makefile.in	Mon Dec 19 22:30:27 2011
+@@ -114,7 +114,10 @@ CSRCS += md4.c
  
  EXTRA_DEPS = $(NSS_DEP_LIBS)
  
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_storage_src_mozStorageConnection_cpp b/mail/mozilla-thunderbird/patches/patch-mozilla_storage_src_mozStorageConnection_cpp
index a03c48ebebb..fe591073f93 100644
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_storage_src_mozStorageConnection_cpp
+++ b/mail/mozilla-thunderbird/patches/patch-mozilla_storage_src_mozStorageConnection_cpp
@@ -1,8 +1,8 @@
-$OpenBSD: patch-mozilla_storage_src_mozStorageConnection_cpp,v 1.6 2011/12/08 02:25:59 nigel Exp $
+$OpenBSD: patch-mozilla_storage_src_mozStorageConnection_cpp,v 1.7 2012/01/11 01:19:43 nigel Exp $
 force the use of secure_delete instead of using internal sqlite copy
---- mozilla/storage/src/mozStorageConnection.cpp.orig	Sat Nov  5 09:21:06 2011
-+++ mozilla/storage/src/mozStorageConnection.cpp	Tue Nov  8 15:21:46 2011
-@@ -591,6 +591,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
+--- mozilla/storage/src/mozStorageConnection.cpp.orig	Thu Dec 15 01:22:57 2011
++++ mozilla/storage/src/mozStorageConnection.cpp	Mon Dec 19 22:30:27 2011
+@@ -593,6 +593,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
      return convertResultCode(srv);
    }
  
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_library_Makefile_in b/mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_library_Makefile_in
index 91bdc99f269..5b976bf255e 100644
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_library_Makefile_in
+++ b/mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_library_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.8 2011/12/08 02:25:59 nigel Exp $
---- mozilla/toolkit/library/Makefile.in.orig	Tue Nov  8 15:36:13 2011
-+++ mozilla/toolkit/library/Makefile.in	Tue Nov  8 16:55:35 2011
-@@ -171,12 +171,6 @@ EXTRA_DSO_LDOPTS += \
+$OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.9 2012/01/11 01:19:43 nigel Exp $
+--- mozilla/toolkit/library/Makefile.in.orig	Thu Dec 15 01:23:07 2011
++++ mozilla/toolkit/library/Makefile.in	Mon Dec 19 22:30:27 2011
+@@ -170,12 +170,6 @@ EXTRA_DSO_LDOPTS += \
  endif
  endif
  
@@ -14,7 +14,7 @@ $OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.8 2011/12/08 02:25:59 ni
  ifdef MOZ_PLATFORM_MAEMO
  EXTRA_DSO_LDOPTS += $(MOZ_PLATFORM_MAEMO_LIBS)
  endif 
-@@ -250,6 +244,9 @@ export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UT
+@@ -249,6 +243,9 @@ export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UT
  include $(srcdir)/libxul-rules.mk
  
  ifeq ($(OS_ARCH),OpenBSD)
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_library_libxul-config_mk b/mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_library_libxul-config_mk
index b73a17b13c5..6d7d0295f49 100644
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_library_libxul-config_mk
+++ b/mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_library_libxul-config_mk
@@ -1,8 +1,8 @@
-$OpenBSD: patch-mozilla_toolkit_library_libxul-config_mk,v 1.4 2011/12/08 02:25:59 nigel Exp $
+$OpenBSD: patch-mozilla_toolkit_library_libxul-config_mk,v 1.5 2012/01/11 01:19:43 nigel Exp $
 'no target to build -lnss3, needed by libxul.so.17.1'
---- mozilla/toolkit/library/libxul-config.mk.orig	Sat Nov  5 09:21:09 2011
-+++ mozilla/toolkit/library/libxul-config.mk	Tue Nov 15 01:47:24 2011
-@@ -321,13 +321,14 @@ EXTRA_DSO_LDOPTS += \
+--- mozilla/toolkit/library/libxul-config.mk.orig	Thu Dec 15 01:23:07 2011
++++ mozilla/toolkit/library/libxul-config.mk	Mon Dec 19 22:30:27 2011
+@@ -322,13 +322,14 @@ EXTRA_DSO_LDOPTS += \
  	$(PNG_LIBS) \
  	$(QCMS_LIBS) \
  	$(MOZ_JS_LIBS) \
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_mozapps_installer_packager_mk b/mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_mozapps_installer_packager_mk
deleted file mode 100644
index e6dd9ee0955..00000000000
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_mozapps_installer_packager_mk
+++ /dev/null
@@ -1,24 +0,0 @@
-$OpenBSD: patch-mozilla_toolkit_mozapps_installer_packager_mk,v 1.4 2011/12/08 02:25:59 nigel Exp $
-precompile fix undo bug fix
-https://bugzilla.mozilla.org/show_bug.cgi?id=674352
-We don't want the sdk
---- mozilla/toolkit/mozapps/installer/packager.mk.orig	Sat Nov  5 09:21:10 2011
-+++ mozilla/toolkit/mozapps/installer/packager.mk	Tue Nov 15 12:38:17 2011
-@@ -401,7 +401,7 @@ PRECOMPILE_GRE=$$PWD
- endif
- 
- GENERATE_CACHE = \
--  $(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$(PRECOMPILE_GRE)" -a "$$PWD" -f $(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js -e "populate_startupcache('$(PRECOMPILE_DIR)', 'omni.jar', 'startupCache.zip');" && \
-+  $(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$(PRECOMPILE_GRE)" -a "$$PWD" -f $(topsrcdir)/toolkit/mozapps/installer/precompile_cache.js -e "populate_startupcache('$(PRECOMPILE_DIR)', 'omni.jar', 'startupCache.zip');" && \
-   rm -rf jsloader && \
-   $(UNZIP) startupCache.zip && \
-   rm startupCache.zip && \
-@@ -759,7 +759,7 @@ endif
- 	$(NSINSTALL) -D $(DESTDIR)$(bindir)
- 	$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
- 	ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
--ifdef INSTALL_SDK # Here comes the hard part
-+ifdef XXINSTALL_SDK # Here comes the hard part
- 	$(NSINSTALL) -D $(DESTDIR)$(includedir)
- 	(cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \
- 	  (cd $(DESTDIR)$(includedir) && tar -xf -)
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_widget_public_nsIGfxInfo_idl b/mail/mozilla-thunderbird/patches/patch-mozilla_widget_public_nsIGfxInfo_idl
deleted file mode 100644
index bdf24b34254..00000000000
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_widget_public_nsIGfxInfo_idl
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-mozilla_widget_public_nsIGfxInfo_idl,v 1.3 2011/12/08 02:25:59 nigel Exp $
-https://bugzilla.mozilla.org/show_bug.cgi?id=681026
-https://hg.mozilla.org/mozilla-central/rev/bb708067dd57
-
---- mozilla/widget/public/nsIGfxInfo.idl.orig	Sat Nov  5 09:21:11 2011
-+++ mozilla/widget/public/nsIGfxInfo.idl	Tue Nov  8 15:21:46 2011
-@@ -143,5 +143,8 @@ interface nsIGfxInfo : nsISupports
-    * underlying GL impl that's used to implement WebGL.
-    */
-   DOMString getWebGLParameter(in DOMString aParam);
-+
-+  // only useful on X11
-+  [noscript, notxpcom] void GetData();
- };
- 
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_xpwidgets_GfxInfoBase_h b/mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_xpwidgets_GfxInfoBase_h
deleted file mode 100644
index 8fe8ff6bb02..00000000000
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_xpwidgets_GfxInfoBase_h
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-mozilla_widget_src_xpwidgets_GfxInfoBase_h,v 1.1 2011/09/21 14:34:27 nigel Exp $
-https://bugzilla.mozilla.org/show_bug.cgi?id=681026
-https://hg.mozilla.org/mozilla-central/rev/bb708067dd57
-
---- mozilla/widget/src/xpwidgets/GfxInfoBase.h.orig	Sat Sep  3 00:56:28 2011
-+++ mozilla/widget/src/xpwidgets/GfxInfoBase.h	Tue Sep 20 22:24:19 2011
-@@ -84,6 +84,9 @@ class GfxInfoBase : public nsIGfxInfo, (public)
-   // Ideally, Init() would be void-return, but the rules of
-   // NS_GENERIC_FACTORY_CONSTRUCTOR_INIT require it be nsresult return.
-   virtual nsresult Init();
-+  
-+  // only useful on X11
-+  NS_IMETHOD_(void) GetData() { }
- 
- protected:
- 
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_xpwidgets_GfxInfoX11_h b/mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_xpwidgets_GfxInfoX11_h
deleted file mode 100644
index db08e79fbc8..00000000000
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_xpwidgets_GfxInfoX11_h
+++ /dev/null
@@ -1,23 +0,0 @@
-$OpenBSD: patch-mozilla_widget_src_xpwidgets_GfxInfoX11_h,v 1.3 2011/12/08 02:25:59 nigel Exp $
-https://bugzilla.mozilla.org/show_bug.cgi?id=681026
-https://hg.mozilla.org/mozilla-central/rev/bb708067dd57
-
---- mozilla/widget/src/xpwidgets/GfxInfoX11.h.orig	Sat Nov  5 09:21:12 2011
-+++ mozilla/widget/src/xpwidgets/GfxInfoX11.h	Tue Nov  8 15:21:46 2011
-@@ -76,6 +76,8 @@ class GfxInfo : public GfxInfoBase (public)
-   using GfxInfoBase::GetWebGLParameter;
- 
-   virtual nsresult Init();
-+  
-+  NS_IMETHOD_(void) GetData();
- 
- protected:
- 
-@@ -91,7 +93,6 @@ class GfxInfo : public GfxInfoBase (public)
-   int mMajorVersion, mMinorVersion, mRevisionVersion;
- 
-   void AddCrashReportAnnotations();
--  void GetData();
- };
- 
- } // namespace widget
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_xpwidgets_nsBaseWidget_cpp b/mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_xpwidgets_nsBaseWidget_cpp
deleted file mode 100644
index d67a6f1b9a2..00000000000
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_xpwidgets_nsBaseWidget_cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-$OpenBSD: patch-mozilla_widget_src_xpwidgets_nsBaseWidget_cpp,v 1.1 2011/09/21 14:34:27 nigel Exp $
-https://bugzilla.mozilla.org/show_bug.cgi?id=681026
-https://hg.mozilla.org/mozilla-central/rev/bb708067dd57
-
---- mozilla/widget/src/xpwidgets/nsBaseWidget.cpp.orig	Fri Aug 12 15:16:46 2011
-+++ mozilla/widget/src/xpwidgets/nsBaseWidget.cpp	Fri Aug 26 15:38:17 2011
-@@ -828,21 +828,33 @@ nsBaseWidget::GetShouldAccelerate()
-   if (xr)
-     xr->GetInSafeMode(&safeMode);
- 
--  if (disableAcceleration || safeMode)
--    return PR_FALSE;
-+  bool whitelisted = false;
- 
--  if (forceAcceleration)
--    return PR_TRUE;
--
-   nsCOMPtr<nsIGfxInfo> gfxInfo = do_GetService("@mozilla.org/gfx/info;1");
-   if (gfxInfo) {
-+    // bug 655578: on X11 at least, we must always call GetData (even if we don't need that information)
-+    // as that's what causes GfxInfo initialization which kills the zombie 'glxtest' process.
-+    // initially we relied on the fact that GetFeatureStatus calls GetData for us, but bug 681026 showed
-+    // that assumption to be unsafe.
-+    gfxInfo->GetData();
-+
-     PRInt32 status;
-     if (NS_SUCCEEDED(gfxInfo->GetFeatureStatus(nsIGfxInfo::FEATURE_OPENGL_LAYERS, &status))) {
--      if (status != nsIGfxInfo::FEATURE_NO_INFO) {
--        NS_WARNING("OpenGL-accelerated layers are not supported on this system.");
--        return PR_FALSE;
-+      if (status == nsIGfxInfo::FEATURE_NO_INFO) {
-+        whitelisted = true;
-       }
-     }
-+  }
-+
-+  if (disableAcceleration || safeMode)
-+    return PR_FALSE;
-+
-+  if (forceAcceleration)
-+    return PR_TRUE;
-+  
-+  if (!whitelisted) {
-+    NS_WARNING("OpenGL-accelerated layers are not supported on this system.");
-+    return PR_FALSE;
-   }
- 
-   if (accelerateByDefault)
diff --git a/mail/mozilla-thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_src_md_unix_Makefile_in b/mail/mozilla-thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_src_md_unix_Makefile_in
index e0195497b44..97e4335e267 100644
--- a/mail/mozilla-thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_src_md_unix_Makefile_in
+++ b/mail/mozilla-thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_src_md_unix_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-mozilla_xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.4 2011/12/08 02:25:59 nigel Exp $
---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Sat Nov  5 09:21:13 2011
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	Tue Nov  8 15:21:46 2011
-@@ -219,7 +219,7 @@ endif
+$OpenBSD: patch-mozilla_xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.5 2012/01/11 01:19:43 nigel Exp $
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Thu Dec 15 01:23:09 2011
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	Mon Dec 19 22:30:28 2011
+@@ -199,7 +199,7 @@ endif
  #
  # OpenBSD/ARM
  #
diff --git a/mail/mozilla-thunderbird/pkg/PLIST-main b/mail/mozilla-thunderbird/pkg/PLIST-main
index 6c5eeb71c76..0df6579d472 100644
--- a/mail/mozilla-thunderbird/pkg/PLIST-main
+++ b/mail/mozilla-thunderbird/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.8 2011/12/08 02:25:59 nigel Exp $
+@comment $OpenBSD: PLIST-main,v 1.9 2012/01/11 01:19:43 nigel Exp $
 @conflict mozilla-thunderbird-<=3.1.11
 @pkgpath mail/mozilla-thunderbird
 bin/${MOZILLA_PROJECT}
@@ -49,8 +49,10 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_fr.dic
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_gl.dic
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_hr.dic
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_hsb.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_hu.dic
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_ia.dic
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_is.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_it.dic
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_kmr.dic
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_la.dic
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_lt.dic
@@ -63,6 +65,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_ru.dic
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_sh.dic
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_sl.dic
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_sv.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_tr.dic
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_uk.dic
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/isp/
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/isp/SpamAssassin.sfd