Update to 0.6.1. This is mainly a bug fix release according to the release

notes at http://www.mozilla.org/projects/firebird/release-notes.html,
but it went from being based on Mozilla 1.4b to 1.5a.

Note, the master site may be temporary.  The source tarball at
${MASTER_SITE_MOZILLA} was missing some key bits that prevented compilation.

3 files changed, 26 insertions, 105 deletions

diff --git a/www/firefox/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/firefox/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
deleted file mode 100644
index 03a418121c1a..000000000000
--- a/www/firefox/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
---- gfx/src/gtk/nsFontMetricsXft.cpp.orig	Mon May 12 06:03:28 2003
-+++ gfx/src/gtk/nsFontMetricsXft.cpp	Sat May 31 11:32:14 2003
-@@ -90,6 +90,7 @@
-     FcPattern *mPattern;
-     FcPattern *mFontName;
-     FcCharSet *mCharset;
-+    int        mNotXft;
- };
- 
- struct MozXftLangGroup {
-@@ -772,7 +773,7 @@
-     // font in our loaded list that supports the character
-     for (PRInt32 i = 0, end = mLoadedFonts.Count(); i < end; ++i) {
-         nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(i);
--        if (FcCharSetHasChar(font->mCharset, aChar))
-+        if (FcCharSetHasChar(font->mCharset, aChar) && font->GetXftFont())
-             return font;
-     }
- 
-@@ -1194,7 +1195,7 @@
-         for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) {
-             nsFontXft *font;
-             font = (nsFontXft *)mLoadedFonts.ElementAt(j);
--            if (FcCharSetHasChar(font->mCharset, c)) {
-+            if (FcCharSetHasChar(font->mCharset, c) && font->GetXftFont()) {
-                 foundFont = font;
-                 break;
-             }
-@@ -1503,6 +1504,7 @@
-     FcPatternReference(mFontName);
- 
-     mXftFont = nsnull;
-+    mNotXft  = 0;
- 
-     // set up our charset
-     mCharset = nsnull;
-@@ -1529,7 +1531,7 @@
- XftFont *
- nsFontXft::GetXftFont(void)
- {
--    if (!mXftFont) {
-+    if (!mXftFont && !mNotXft) {
-         FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName);
-         if (!pat)
-             return nsnull;
-@@ -1548,8 +1550,10 @@
-             FcPatternDel(pat, FC_SPACING);
- 
-         mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat);
--        if (!mXftFont)
-+        if (!mXftFont) {
-             FcPatternDestroy(pat);
-+            mNotXft = 1;
-+        }
-     }
- 
-     return mXftFont;
diff --git a/www/firefox/files/patch-jsfun.c b/www/firefox/files/patch-jsfun.c
deleted file mode 100644
index 69aacb9b54cd..000000000000
--- a/www/firefox/files/patch-jsfun.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- js/src/jsfun.c.orig	Fri May 30 20:55:38 2003
-+++ js/src/jsfun.c	Fri May 30 20:54:24 2003
-@@ -1081,7 +1081,7 @@
-     JSString *atomstr;
-     char *propname;
-     JSScopeProperty *sprop;
--    jsid userid;
-+    uint32 userid;
-     JSAtom *atom;
-     uintN i, n, dupflag;
-     uint32 type;
-@@ -1157,7 +1157,7 @@
-                 userid = INT_TO_JSVAL(sprop->shortid);
-                 propname = ATOM_BYTES((JSAtom *)sprop->id);
-                 if (!JS_XDRUint32(xdr, &type) ||
--                    !JS_XDRUint32(xdr, (uint32 *)&userid) ||
-+                    !JS_XDRUint32(xdr, &userid) ||
-                     !JS_XDRCString(xdr, &propname)) {
-                     if (mark)
-                         JS_ARENA_RELEASE(&cx->tempPool, mark);
-@@ -1173,7 +1173,7 @@
-                 uintN attrs = JSPROP_ENUMERATE | JSPROP_PERMANENT;
- 
-                 if (!JS_XDRUint32(xdr, &type) ||
--                    !JS_XDRUint32(xdr, (uint32 *)&userid) ||
-+                    !JS_XDRUint32(xdr, &userid) ||
-                     !JS_XDRCString(xdr, &propname)) {
-                     return JS_FALSE;
-                 }
diff --git a/www/firefox/files/patch-nsprpub-pr-src-pthreads-ptio.c b/www/firefox/files/patch-nsprpub-pr-src-pthreads-ptio.c
index 4a965d4c7440..4243bc8a8193 100644
--- a/www/firefox/files/patch-nsprpub-pr-src-pthreads-ptio.c
+++ b/www/firefox/files/patch-nsprpub-pr-src-pthreads-ptio.c
@@ -1,22 +1,29 @@
-Index: nsprpub/pr/src/pthreads/ptio.c
-diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
---- nsprpub/pr/src/pthreads/ptio.c.orig	Fri Apr 12 03:14:39 2002
-+++ nsprpub/pr/src/pthreads/ptio.c	Tue Jul 30 18:52:11 2002
-@@ -3414,6 +3414,17 @@
+--- nsprpub/pr/src/pthreads/ptio.c.orig	Tue Jul  8 23:37:46 2003
++++ nsprpub/pr/src/pthreads/ptio.c	Wed Jul 23 00:53:15 2003
+@@ -3370,7 +3370,7 @@
+ PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd);
+ #if defined(_PR_INET6_PROBE)
+ PR_EXTERN(PRBool) _pr_ipv6_is_present;
+-#ifdef DARWIN
++#if defined(DARWIN) || defined(FREEBSD)
+ static PRBool _pr_ipv6_v6only_on_by_default;
+ #endif
+ PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket()
+@@ -3385,7 +3385,7 @@
+      */
+     osfd = socket(AF_INET6, SOCK_STREAM, 0);
+     if (osfd != -1) {
+-#ifdef DARWIN
++#if defined(DARWIN) || defined(FREEBSD)
+         /* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option
+          * is turned on by default, contrary to what RFC 3493, Section
+          * 5.3 says.  So we have to turn it off.  Find out whether we
+@@ -3452,7 +3452,7 @@
      if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
      else
      {
-+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
-+	defined(__FreeBSD__) && defined(IPV6_V6ONLY)
-+		if (domain == PR_AF_INET6) {
-+			int opt = 0;
-+			if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
-+                           &opt, sizeof(opt))) {
-+				close(osfd);
-+				return NULL;
-+			}
-+		}
-+#endif
-         fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
-         if (fd == NULL) close(osfd);
-     }
+-#ifdef DARWIN
++#if defined(DARWIN) || defined(FREEBSD)
+         if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default)
+         {
+             int on = 0;