5 files changed, 24 insertions, 52 deletions

diff --git a/mail/thunderbird/files/mozconfig.in b/mail/thunderbird/files/mozconfig.in
index 25aec5d460a6..8d2ab306729c 100644
--- a/mail/thunderbird/files/mozconfig.in
+++ b/mail/thunderbird/files/mozconfig.in
@@ -13,9 +13,9 @@ ac_add_options --disable-oji
 ac_add_options --disable-necko-disk-cache
 ac_add_options --disable-tests
 ac_add_options --disable-profilesharing
-ac_add_options --enable-extensions=wallet,spellcheck
+ac_add_options --enable-extensions=wallet,spellcheck,xmlextras
 ac_add_options --enable-necko-protocols=http,file,jar,viewsource,res,data
-ac_add_options --enable-image-decoders=png,gif,jpeg
+ac_add_options --enable-image-decoders=png,gif,jpeg,bmp
 ac_add_options --enable-default-toolkit=gtk2
 ######################################################################
 # FBSD specific
@@ -51,6 +51,10 @@ if test -n "$WITH_DEBUG"; then
     ac_add_options --enable-debug
 else
     ac_add_options --disable-debug
+    export BUILD_OFFICIAL=1
+    export MOZILLA_OFFICIAL=1
+    mk_add_options BUILD_OFFICIAL=1
+    mk_add_options MOZILLA_OFFICIAL=1
 fi # test -n "$WITH_DEBUG"
 if test -n "$WITH_LOGGING"; then
     ac_add_options --enable-logging
diff --git a/mail/thunderbird/files/patch-config_preprocess.pl b/mail/thunderbird/files/patch-config_preprocess.pl
index da1f69a2d338..390f4700dd53 100644
--- a/mail/thunderbird/files/patch-config_preprocess.pl
+++ b/mail/thunderbird/files/patch-config_preprocess.pl
@@ -1,6 +1,6 @@
---- config/preprocessor.pl.orig	Wed Aug 13 05:46:33 2003
-+++ config/preprocessor.pl	Thu Sep  4 00:42:12 2003
-@@ -71,16 +71,40 @@
+--- config/preprocessor.pl.orig	Fri Oct 24 18:17:32 2003
++++ config/preprocessor.pl	Sun Dec  7 15:17:57 2003
+@@ -76,16 +76,40 @@
  ########################################################################
  
  package main;
@@ -45,12 +45,12 @@
      }
      local $stack->{'variables'}->{'DIRECTORY'} = $directory;
      local $stack->{'variables'}->{'FILE'} = $filename;
-@@ -374,7 +398,7 @@
+@@ -395,7 +419,7 @@
      my $stack = shift;
      return if $stack->disabled;
      die "argument expected\n" unless @_;
--    main::include($stack, File::Spec->catpath(File::Spec::Unix->splitpath(@_)));
-+    main::include($stack, File::Spec->catfile(dirname(@_), basename(@_)));
- }
- 
- sub filter {
+-    my $filename = File::Spec->catpath(File::Spec::Unix->splitpath(@_));
++    my $filename = File::Spec->catpath(dirname(@_), basename(@_));
+     if ($stack->{'dependencies'}) {
+         $stack->visit($filename);
+     } else {
diff --git a/mail/thunderbird/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/mail/thunderbird/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
index 0b0e08247101..2adcd3412e13 100644
--- a/mail/thunderbird/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
+++ b/mail/thunderbird/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
@@ -1,6 +1,6 @@
---- gfx/src/gtk/nsFontMetricsXft.cpp.save	Thu Aug  7 12:14:49 2003
-+++ gfx/src/gtk/nsFontMetricsXft.cpp	Thu Aug  7 12:33:45 2003
-@@ -106,6 +106,7 @@
+--- gfx/src/gtk/nsFontMetricsXft.cpp.orig	Tue Nov 25 21:44:50 2003
++++ gfx/src/gtk/nsFontMetricsXft.cpp	Sun Dec  7 15:20:48 2003
+@@ -105,6 +105,7 @@
      FcPattern *mPattern;
      FcPattern *mFontName;
      FcCharSet *mCharset;
@@ -8,25 +8,16 @@
  };
  
  class nsFontXftInfo;
-@@ -1051,7 +1052,7 @@
-     // font in our loaded list that supports the character
-     for (PRInt32 i = 0, end = mLoadedFonts.Count(); i < end; ++i) {
+@@ -1093,7 +1094,7 @@
+ 
+     for (PRInt32 i = 1, end = mLoadedFonts.Count(); i < end; ++i) {
          nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(i);
 -        if (font->HasChar(PRUint32(aChar)))
 +        if (font->HasChar(PRUint32(aChar)) && font->GetXftFont())
              return font;
      }
  
-@@ -1492,7 +1493,7 @@
-         // this character.
-         for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) {
-             font = (nsFontXft *)mLoadedFonts.ElementAt(j);
--            if (font->HasChar(c)) {
-+            if (font->HasChar(c) && font->GetXftFont()) {
-                 currFont = font;
-                 goto FoundFont; // for speed -- avoid "if" statement
-             }
-@@ -1922,6 +1923,7 @@
+@@ -1960,6 +1961,7 @@
      FcPatternReference(mFontName);
  
      mXftFont = nsnull;
@@ -34,7 +25,7 @@
  
      // set up our charset
      mCharset = nsnull;
-@@ -1948,7 +1950,7 @@
+@@ -1986,7 +1988,7 @@
  XftFont *
  nsFontXft::GetXftFont(void)
  {
@@ -43,7 +34,7 @@
          FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName);
          if (!pat)
              return nsnull;
-@@ -1967,8 +1969,10 @@
+@@ -2005,8 +2007,10 @@
              FcPatternDel(pat, FC_SPACING);
  
          mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat);
diff --git a/mail/thunderbird/files/patch-nsprpub-pr-src-misc-prtime.c b/mail/thunderbird/files/patch-nsprpub-pr-src-misc-prtime.c
deleted file mode 100644
index 9682808e4d9e..000000000000
--- a/mail/thunderbird/files/patch-nsprpub-pr-src-misc-prtime.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- nsprpub/pr/src/misc/prtime.c.orig	Thu Feb 27 01:01:02 2003
-+++ nsprpub/pr/src/misc/prtime.c	Thu May 22 16:46:49 2003
-@@ -1666,7 +1666,7 @@
-  */
- 
- #if defined(SUNOS4) || (__GLIBC__ >= 2) || defined(XP_BEOS) \
--        || defined(NETBSD)
-+        || defined(NETBSD) || defined(__FreeBSD__)
-     a.tm_zone = NULL;
-     a.tm_gmtoff = tm->tm_params.tp_gmt_offset + tm->tm_params.tp_dst_offset;
- #endif
diff --git a/mail/thunderbird/files/patch-sparc64 b/mail/thunderbird/files/patch-sparc64
index b9cb83058235..e875857c4306 100644
--- a/mail/thunderbird/files/patch-sparc64
+++ b/mail/thunderbird/files/patch-sparc64
@@ -55,15 +55,3 @@ diff -ru ./nsprpub/pr/include/md/_freebsd.cfg ../../work~/mozilla/nsprpub/pr/inc
  #else
  
  #error "Unknown CPU architecture"
-diff -ru ./nsprpub/pr/include/md/_freebsd.h ../../work~/mozilla/nsprpub/pr/include/md/_freebsd.h
---- ./nsprpub/pr/include/md/_freebsd.h	Thu Jan 16 15:09:12 2003
-+++ ../../work~/mozilla/nsprpub/pr/include/md/_freebsd.h	Tue May 20 21:27:13 2003
-@@ -48,6 +48,8 @@
- #define _PR_SI_ARCHITECTURE "x86"
- #elif defined(__alpha)
- #define _PR_SI_ARCHITECTURE "alpha"
-+#elif defined(__sparc__)
-+#define _PR_SI_ARCHITECTURE "sparc"
- #else
- #error "Unknown CPU architecture"
- #endif