diff options
Diffstat (limited to 'www/firefox/patches')
63 files changed, 555 insertions, 487 deletions
diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa index 9ca093d7a39..3b8517eb686 100644 --- a/www/firefox/patches/patch-aa +++ b/www/firefox/patches/patch-aa @@ -1,8 +1,9 @@ -$NetBSD: patch-aa,v 1.2 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2005/12/10 13:47:22 taya Exp $ ---- config/autoconf.mk.in.orig 2004-10-31 04:29:54.000000000 +0000 -+++ config/autoconf.mk.in -@@ -32,13 +32,13 @@ MOZ_APP_DISPLAYNAME = @MOZ_APP_DISPLAYNA +diff -ruN ../Orig/mozilla/config/autoconf.mk.in ./config/autoconf.mk.in +--- ../Orig/mozilla/config/autoconf.mk.in 2005-08-18 02:17:17.000000000 +0900 ++++ ./config/autoconf.mk.in 2005-12-04 19:02:42.000000000 +0900 +@@ -54,13 +54,13 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ diff --git a/www/firefox/patches/patch-ab b/www/firefox/patches/patch-ab index 45fa51a7844..72d7644050d 100644 --- a/www/firefox/patches/patch-ab +++ b/www/firefox/patches/patch-ab @@ -1,9 +1,9 @@ -$NetBSD: patch-ab,v 1.4 2005/10/12 16:39:24 joerg Exp $ +$NetBSD: patch-ab,v 1.5 2005/12/10 13:47:22 taya Exp $ -diff -ru ../Orig/mozilla/configure.in ./configure.in ---- ../Orig/mozilla/configure.in 2004-05-14 06:57:46.000000000 +0900 -+++ ./configure.in 2004-06-15 23:55:39.000000000 +0900 -@@ -1008,7 +1008,7 @@ +diff -ruN ../Orig/mozilla/configure.in ./configure.in +--- ../Orig/mozilla/configure.in 2005-10-04 14:53:49.000000000 +0900 ++++ ./configure.in 2005-12-04 19:02:51.000000000 +0900 +@@ -1360,7 +1360,7 @@ esac ;; @@ -12,7 +12,7 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then DLL_SUFFIX=".so.1.0" DSO_LDOPTS="-shared" -@@ -1017,6 +1017,9 @@ +@@ -1374,6 +1374,9 @@ # MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive' # MKSHLIB_UNFORCE_ALL='' # fi @@ -22,7 +22,7 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in ;; *-hpux*) -@@ -1308,6 +1311,13 @@ +@@ -1768,6 +1771,13 @@ if test "$LIBRUNPATH"; then DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" fi @@ -36,7 +36,7 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in ;; *-nto*) -@@ -1531,7 +1541,7 @@ +@@ -1993,7 +2003,7 @@ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@' MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract' MKSHLIB_UNFORCE_ALL='' @@ -45,9 +45,9 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in AR_LIST="$AR t" AR_EXTRACT="$AR x" AR_DELETE="$AR d" -@@ -4280,7 +4290,7 @@ dnl = Enable code optimization. OFF by d +@@ -5205,7 +5215,7 @@ + dnl = Enable code optimization. ON by default. dnl ======================================================== - MOZ_OPTIMIZE= if test -z "$MOZ_OPTIMIZE_FLAGS"; then - MOZ_OPTIMIZE_FLAGS="-O" + MOZ_OPTIMIZE_FLAGS="" diff --git a/www/firefox/patches/patch-ac b/www/firefox/patches/patch-ac index 0f0e2c83f2c..84bdf567e4c 100644 --- a/www/firefox/patches/patch-ac +++ b/www/firefox/patches/patch-ac @@ -1,8 +1,9 @@ -$NetBSD: patch-ac,v 1.6 2005/10/12 16:39:24 joerg Exp $ +$NetBSD: patch-ac,v 1.7 2005/12/10 13:47:22 taya Exp $ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2005-04-28 16:01:33.000000000 +0000 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in -@@ -45,10 +45,13 @@ +diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/reflect/xptcall/src/md/unix/Makefile.in +--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2005-06-15 17:32:21.000000000 +0900 ++++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in 2005-12-04 19:03:04.000000000 +0900 +@@ -61,10 +61,13 @@ # # Lots of Unixish x86 flavors # @@ -17,7 +18,7 @@ $NetBSD: patch-ac,v 1.6 2005/10/12 16:39:24 joerg Exp $ endif # # New code for Linux, et. al., with gcc -@@ -140,7 +143,7 @@ +@@ -157,7 +160,7 @@ # NetBSD/ARM # ifeq ($(OS_ARCH),NetBSD) @@ -26,7 +27,7 @@ $NetBSD: patch-ac,v 1.6 2005/10/12 16:39:24 joerg Exp $ CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp endif endif -@@ -174,7 +177,7 @@ +@@ -191,7 +194,7 @@ # NetBSD/m68k # ifeq ($(OS_ARCH),NetBSD) @@ -35,7 +36,7 @@ $NetBSD: patch-ac,v 1.6 2005/10/12 16:39:24 joerg Exp $ CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp endif endif -@@ -257,6 +260,7 @@ +@@ -274,6 +277,7 @@ ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST))) CPPSRCS := xptcinvoke_ppc_netbsd.cpp xptcstubs_ppc_netbsd.cpp ASFILES := xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_ppc_netbsd.s @@ -43,7 +44,7 @@ $NetBSD: patch-ac,v 1.6 2005/10/12 16:39:24 joerg Exp $ endif # -@@ -305,6 +309,13 @@ +@@ -322,6 +326,13 @@ CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s endif diff --git a/www/firefox/patches/patch-ad b/www/firefox/patches/patch-ad index 635354f2a3d..f6da3476929 100644 --- a/www/firefox/patches/patch-ad +++ b/www/firefox/patches/patch-ad @@ -1,8 +1,9 @@ -$NetBSD: patch-ad,v 1.3 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-ad,v 1.4 2005/12/10 13:47:22 taya Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp.orig 2001-09-28 20:12:51.000000000 +0000 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp -@@ -132,6 +132,15 @@ extern "C" { +diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp +--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp 2004-04-18 23:18:18.000000000 +0900 ++++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp 2005-12-04 19:03:09.000000000 +0900 +@@ -132,6 +132,15 @@ } } @@ -18,7 +19,7 @@ $NetBSD: patch-ad,v 1.3 2005/09/22 14:14:04 jlam Exp $ XPTC_PUBLIC_API(nsresult) XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, PRUint32 paramCount, nsXPTCVariant* params) -@@ -139,30 +148,30 @@ XPTC_InvokeByIndex(nsISupports* that, PR +@@ -139,30 +148,30 @@ PRUint32 result; __asm__ __volatile__( diff --git a/www/firefox/patches/patch-ae b/www/firefox/patches/patch-ae index 9a6e166b0d2..31762cbdcd1 100644 --- a/www/firefox/patches/patch-ae +++ b/www/firefox/patches/patch-ae @@ -1,8 +1,9 @@ -$NetBSD: patch-ae,v 1.3 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-ae,v 1.4 2005/12/10 13:47:22 taya Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp.orig 2001-09-28 20:12:52.000000000 +0000 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp -@@ -123,17 +123,27 @@ extern "C" { +diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp +--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp 2004-04-18 23:18:18.000000000 +0900 ++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp 2005-12-04 19:03:11.000000000 +0900 +@@ -123,17 +123,27 @@ } } diff --git a/www/firefox/patches/patch-af b/www/firefox/patches/patch-af index d6a45cac0f9..2f2c7f9f9b7 100644 --- a/www/firefox/patches/patch-af +++ b/www/firefox/patches/patch-af @@ -1,16 +1,17 @@ -$NetBSD: patch-af,v 1.3 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-af,v 1.4 2005/12/10 13:47:22 taya Exp $ ---- security/nss/lib/freebl/unix_rand.c.orig 2003-05-30 23:31:19.000000000 +0000 -+++ security/nss/lib/freebl/unix_rand.c -@@ -32,6 +32,7 @@ - */ +diff -ruN ../Orig/mozilla/security/nss/lib/freebl/unix_rand.c ./security/nss/lib/freebl/unix_rand.c +--- ../Orig/mozilla/security/nss/lib/freebl/unix_rand.c 2005-10-11 08:22:50.000000000 +0900 ++++ ./security/nss/lib/freebl/unix_rand.c 2005-12-04 19:04:32.000000000 +0900 +@@ -35,6 +35,7 @@ + * ***** END LICENSE BLOCK ***** */ #include <stdio.h> +#include <fcntl.h> #include <string.h> #include <signal.h> #include <unistd.h> -@@ -691,7 +692,11 @@ safe_popen(char *cmd) +@@ -694,7 +695,11 @@ /* dup write-side of pipe to stderr and stdout */ if (p[1] != 1) dup2(p[1], 1); if (p[1] != 2) dup2(p[1], 2); @@ -20,6 +21,6 @@ $NetBSD: patch-af,v 1.3 2005/09/22 14:14:04 jlam Exp $ + dup2(fd, 0); + close(fd); + } - for (fd = getdtablesize(); --fd > 2; close(fd)) - ; - + { + int ndesc = getdtablesize(); + for (fd = PR_MIN(65536, ndesc); --fd > 2; close(fd)); diff --git a/www/firefox/patches/patch-ag b/www/firefox/patches/patch-ag index a5455a29e36..b3a282e0c2f 100644 --- a/www/firefox/patches/patch-ag +++ b/www/firefox/patches/patch-ag @@ -1,14 +1,15 @@ -$NetBSD: patch-ag,v 1.3 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-ag,v 1.4 2005/12/10 13:47:22 taya Exp $ ---- extensions/transformiix/source/base/ErrorObserver.h.orig 2003-01-17 12:39:36.000000000 +0000 -+++ extensions/transformiix/source/base/ErrorObserver.h -@@ -28,7 +28,8 @@ +diff -ruN ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h ./extensions/transformiix/source/base/ErrorObserver.h +--- ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h 2004-05-21 19:41:22.000000000 +0900 ++++ ./extensions/transformiix/source/base/ErrorObserver.h 2005-12-04 19:05:55.000000000 +0900 +@@ -41,7 +41,8 @@ - #include "baseutils.h" - #include "txError.h" + #include "txCore.h" + #ifdef TX_EXE -#include <iostream.h> +#include <iostream> +using namespace std; - class nsAString; + #endif /** diff --git a/www/firefox/patches/patch-ah b/www/firefox/patches/patch-ah index 8f5f89ca784..ed74dbd66b0 100644 --- a/www/firefox/patches/patch-ah +++ b/www/firefox/patches/patch-ah @@ -1,8 +1,9 @@ -$NetBSD: patch-ah,v 1.3 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-ah,v 1.4 2005/12/10 13:47:22 taya Exp $ ---- gfx/idl/nsIFreeType2.idl.orig 2004-04-16 01:09:33.000000000 +0000 -+++ gfx/idl/nsIFreeType2.idl -@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer); +diff -ruN ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl +--- ../Orig/mozilla/gfx/idl/nsIFreeType2.idl 2004-04-16 08:30:02.000000000 +0900 ++++ ./gfx/idl/nsIFreeType2.idl 2005-12-04 19:06:04.000000000 +0900 +@@ -76,10 +76,11 @@ native FT_Sfnt_Tag(FT_Sfnt_Tag); native FT_Size(FT_Size); @@ -16,7 +17,7 @@ $NetBSD: patch-ah,v 1.3 2005/09/22 14:14:04 jlam Exp $ native FTC_Manager(FTC_Manager); // #ifdef MOZ_SVG -@@ -99,7 +100,7 @@ interface nsIFreeType2 : nsISupports +@@ -99,7 +100,7 @@ readonly attribute FT_Library library; readonly attribute FTC_Manager FTCacheManager; @@ -25,7 +26,7 @@ $NetBSD: patch-ah,v 1.3 2005/09/22 14:14:04 jlam Exp $ void doneFace(in FT_Face face); void doneFreeType(in FT_Library lib); -@@ -115,16 +116,16 @@ interface nsIFreeType2 : nsISupports +@@ -115,16 +116,16 @@ void outlineDecompose(in FT_Outline_p outline, in const_FT_Outline_Funcs_p funcs, in voidPtr p); void setCharmap(in FT_Face face, in FT_CharMap charmap); diff --git a/www/firefox/patches/patch-ai b/www/firefox/patches/patch-ai index ead13b82750..5ced0003483 100644 --- a/www/firefox/patches/patch-ai +++ b/www/firefox/patches/patch-ai @@ -1,8 +1,9 @@ -$NetBSD: patch-ai,v 1.3 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-ai,v 1.4 2005/12/10 13:47:22 taya Exp $ ---- gfx/src/ps/nsFontMetricsPS.cpp.orig 2004-02-05 01:57:05.000000000 +0000 -+++ gfx/src/ps/nsFontMetricsPS.cpp -@@ -1141,10 +1141,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa +diff -ruN ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetricsPS.cpp +--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp 2005-04-28 17:04:00.000000000 +0900 ++++ ./gfx/src/ps/nsFontMetricsPS.cpp 2005-12-04 19:06:07.000000000 +0900 +@@ -1859,10 +1859,10 @@ mPixelSize = NSToIntRound(app2dev * mFont->size); @@ -17,7 +18,7 @@ $NetBSD: patch-ai,v 1.3 2005/09/22 14:14:04 jlam Exp $ nsresult rv; mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv); -@@ -1190,7 +1190,7 @@ nsFontPSFreeType::GetWidth(const PRUnich +@@ -1896,7 +1896,7 @@ if (!face) return 0; @@ -26,7 +27,7 @@ $NetBSD: patch-ai,v 1.3 2005/09/22 14:14:04 jlam Exp $ nsresult rv = mFt2->GetImageCache(&iCache); if (NS_FAILED(rv)) { NS_ERROR("Failed to get Image Cache"); -@@ -1228,8 +1228,8 @@ nsFontPSFreeType::getFTFace() +@@ -1934,8 +1934,8 @@ FTC_Manager cManager; mFt2->GetFTCacheManager(&cManager); @@ -37,7 +38,7 @@ $NetBSD: patch-ai,v 1.3 2005/09/22 14:14:04 jlam Exp $ NS_ASSERTION(rv==0, "failed to get face/size"); if (rv) return nsnull; -@@ -1622,16 +1622,16 @@ void nsFT2Type8Generator::GeneratePSFont +@@ -2379,16 +2379,16 @@ mEntry->GetFamilyName(fontName); mEntry->GetStyleName(styleName); diff --git a/www/firefox/patches/patch-aj b/www/firefox/patches/patch-aj index 4bc7669d9bb..46a37e8d58e 100644 --- a/www/firefox/patches/patch-aj +++ b/www/firefox/patches/patch-aj @@ -1,8 +1,9 @@ -$NetBSD: patch-aj,v 1.3 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-aj,v 1.4 2005/12/10 13:47:22 taya Exp $ ---- gfx/src/freetype/nsFreeType.h.orig 2004-04-16 21:31:42.000000000 +0000 -+++ gfx/src/freetype/nsFreeType.h -@@ -104,13 +104,13 @@ typedef FT_Error (*FT_Outline_Decompose_ +diff -ruN ../Orig/mozilla/gfx/src/freetype/nsFreeType.h ./gfx/src/freetype/nsFreeType.h +--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.h 2005-05-02 02:36:19.000000000 +0900 ++++ ./gfx/src/freetype/nsFreeType.h 2005-12-04 19:06:10.000000000 +0900 +@@ -120,13 +120,13 @@ typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*); typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap); typedef FT_Error (*FTC_Image_Cache_Lookup_t) @@ -20,7 +21,7 @@ $NetBSD: patch-aj,v 1.3 2005/09/22 14:14:04 jlam Exp $ // #ifdef MOZ_SVG typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*); typedef FT_Error (*FT_Get_Kerning_t) -@@ -165,7 +165,7 @@ protected: +@@ -181,7 +181,7 @@ FT_Outline_Decompose_t nsFT_Outline_Decompose; FT_Set_Charmap_t nsFT_Set_Charmap; FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup; @@ -29,7 +30,7 @@ $NetBSD: patch-aj,v 1.3 2005/09/22 14:14:04 jlam Exp $ FTC_Manager_Done_t nsFTC_Manager_Done; FTC_Manager_New_t nsFTC_Manager_New; FTC_Image_Cache_New_t nsFTC_Image_Cache_New; -@@ -213,7 +213,7 @@ protected: +@@ -229,7 +229,7 @@ PRLibrary *mSharedLib; FT_Library mFreeTypeLibrary; FTC_Manager mFTCacheManager; diff --git a/www/firefox/patches/patch-ak b/www/firefox/patches/patch-ak index 4c95e50f99a..ccf9b14e424 100644 --- a/www/firefox/patches/patch-ak +++ b/www/firefox/patches/patch-ak @@ -1,8 +1,9 @@ -$NetBSD: patch-ak,v 1.3 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-ak,v 1.4 2005/12/10 13:47:22 taya Exp $ ---- gfx/src/freetype/nsFreeType.cpp.orig 2004-02-07 15:22:30.000000000 +0000 -+++ gfx/src/freetype/nsFreeType.cpp -@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = { +diff -ruN ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFreeType.cpp +--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp 2005-07-14 03:21:10.000000000 +0900 ++++ ./gfx/src/freetype/nsFreeType.cpp 2005-12-04 19:06:15.000000000 +0900 +@@ -110,11 +110,11 @@ {"FT_New_Face", NS_FT2_OFFSET(nsFT_New_Face), PR_TRUE}, {"FT_Outline_Decompose", NS_FT2_OFFSET(nsFT_Outline_Decompose), PR_TRUE}, {"FT_Set_Charmap", NS_FT2_OFFSET(nsFT_Set_Charmap), PR_TRUE}, @@ -17,7 +18,7 @@ $NetBSD: patch-ak,v 1.3 2005/09/22 14:14:04 jlam Exp $ // #ifdef MOZ_SVG {"FT_Glyph_Transform", NS_FT2_OFFSET(nsFT_Glyph_Transform), PR_TRUE}, {"FT_Get_Kerning", NS_FT2_OFFSET(nsFT_Get_Kerning), PR_TRUE}, -@@ -282,7 +282,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT +@@ -288,7 +288,7 @@ } NS_IMETHODIMP @@ -26,7 +27,7 @@ $NetBSD: patch-ak,v 1.3 2005/09/22 14:14:04 jlam Exp $ FT_UInt glyphID, FT_Glyph *glyph) { // call the FreeType2 function via the function pointer -@@ -291,11 +291,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_ +@@ -297,11 +297,11 @@ } NS_IMETHODIMP @@ -41,7 +42,7 @@ $NetBSD: patch-ak,v 1.3 2005/09/22 14:14:04 jlam Exp $ return error ? NS_ERROR_FAILURE : NS_OK; } -@@ -320,7 +320,7 @@ nsFreeType2::ManagerNew(FT_Library libra +@@ -326,7 +326,7 @@ } NS_IMETHODIMP @@ -50,7 +51,7 @@ $NetBSD: patch-ak,v 1.3 2005/09/22 14:14:04 jlam Exp $ { // call the FreeType2 function via the function pointer FT_Error error = nsFTC_Image_Cache_New(manager, cache); -@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res +@@ -395,7 +395,7 @@ } NS_IMETHODIMP diff --git a/www/firefox/patches/patch-al b/www/firefox/patches/patch-al index 0e31e2dc2e1..0d285db22bc 100644 --- a/www/firefox/patches/patch-al +++ b/www/firefox/patches/patch-al @@ -1,22 +1,24 @@ -$NetBSD: patch-al,v 1.3 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-al,v 1.4 2005/12/10 13:47:22 taya Exp $ ---- gfx/src/ps/nsFontMetricsPS.h.orig 2003-04-22 16:25:09.000000000 +0000 -+++ gfx/src/ps/nsFontMetricsPS.h -@@ -320,7 +320,7 @@ protected: +diff -ruN ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h ./gfx/src/ps/nsFontMetricsPS.h +--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h 2005-06-29 03:29:10.000000000 +0900 ++++ ./gfx/src/ps/nsFontMetricsPS.h 2005-12-04 19:07:24.000000000 +0900 +@@ -424,7 +424,8 @@ nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID; nsCOMPtr<nsIFreeType2> mFt2; PRUint16 mPixelSize; - FTC_Image_Desc mImageDesc; + FTC_ImageType mImageDesc; ++ + nsCString mFontNameBase; // the base name of type 1 (sub) fonts + nscoord mHeight; - - static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont, -@@ -363,7 +363,7 @@ public: +@@ -493,7 +494,7 @@ protected: nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry; nsCOMPtr<nsIFreeType2> mFt2; - FTC_Image_Desc mImageDesc; + FTC_ImageType mImageDesc; }; - #endif - + #endif // MOZ_ENABLE_FREETYPE2 + #endif // MOZ_ENABLE_XFT diff --git a/www/firefox/patches/patch-an b/www/firefox/patches/patch-an index ee000e43a55..b62e7969221 100644 --- a/www/firefox/patches/patch-an +++ b/www/firefox/patches/patch-an @@ -1,8 +1,9 @@ -$NetBSD: patch-an,v 1.3 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-an,v 1.4 2005/12/10 13:47:22 taya Exp $ ---- gfx/src/x11shared/nsFontFreeType.h.orig 2003-04-22 16:25:13.000000000 +0000 -+++ gfx/src/x11shared/nsFontFreeType.h -@@ -110,7 +110,7 @@ protected: +diff -ruN ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h ./gfx/src/x11shared/nsFontFreeType.h +--- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h 2004-04-18 06:52:34.000000000 +0900 ++++ ./gfx/src/x11shared/nsFontFreeType.h 2005-12-04 19:07:46.000000000 +0900 +@@ -110,7 +110,7 @@ XImage *GetXImage(PRUint32 width, PRUint32 height); nsITrueTypeFontCatalogEntry *mFaceID; PRUint16 mPixelSize; diff --git a/www/firefox/patches/patch-ao b/www/firefox/patches/patch-ao index 5ee8adeb651..f18212998d5 100644 --- a/www/firefox/patches/patch-ao +++ b/www/firefox/patches/patch-ao @@ -1,8 +1,9 @@ -$NetBSD: patch-ao,v 1.3 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-ao,v 1.4 2005/12/10 13:47:22 taya Exp $ ---- gfx/src/x11shared/nsFontFreeType.cpp.orig 2003-12-25 08:24:52.000000000 +0000 -+++ gfx/src/x11shared/nsFontFreeType.cpp -@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace() +diff -ruN ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11shared/nsFontFreeType.cpp +--- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp 2004-04-18 06:52:34.000000000 +0900 ++++ ./gfx/src/x11shared/nsFontFreeType.cpp 2005-12-04 19:07:49.000000000 +0900 +@@ -177,7 +177,7 @@ FTC_Manager mgr; nsresult rv; mFt2->GetFTCacheManager(&mgr); @@ -11,7 +12,7 @@ $NetBSD: patch-ao,v 1.3 2005/09/22 14:14:04 jlam Exp $ NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size"); if (NS_FAILED(rv)) return nsnull; -@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy +@@ -191,22 +191,15 @@ PRBool embedded_bimap = PR_FALSE; mFaceID = aFaceID; mPixelSize = aPixelSize; @@ -38,7 +39,7 @@ $NetBSD: patch-ao,v 1.3 2005/09/22 14:14:04 jlam Exp $ PRUint32 num_embedded_bitmaps, i; PRInt32* embedded_bitmapheights; mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps, -@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy +@@ -218,7 +211,6 @@ if (embedded_bitmapheights[i] == aPixelSize) { embedded_bimap = PR_TRUE; // unhinted must be set for embedded bitmaps to be used @@ -46,7 +47,7 @@ $NetBSD: patch-ao,v 1.3 2005/09/22 14:14:04 jlam Exp $ break; } } -@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con +@@ -312,7 +304,7 @@ if (!face) return NS_ERROR_FAILURE; @@ -55,7 +56,7 @@ $NetBSD: patch-ao,v 1.3 2005/09/22 14:14:04 jlam Exp $ mFt2->GetImageCache(&icache); if (!icache) return NS_ERROR_FAILURE; -@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar +@@ -401,7 +393,7 @@ if (!face) return 0; @@ -64,7 +65,7 @@ $NetBSD: patch-ao,v 1.3 2005/09/22 14:14:04 jlam Exp $ mFt2->GetImageCache(&icache); if (!icache) return 0; -@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering +@@ -723,7 +715,7 @@ if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2); #endif diff --git a/www/firefox/patches/patch-ap b/www/firefox/patches/patch-ap index af3365dadd6..40210afbd5d 100644 --- a/www/firefox/patches/patch-ap +++ b/www/firefox/patches/patch-ap @@ -1,8 +1,9 @@ -$NetBSD: patch-ap,v 1.4 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-ap,v 1.5 2005/12/10 13:47:22 taya Exp $ ---- security/coreconf/command.mk.orig 2002-02-15 22:53:12.000000000 +0000 -+++ security/coreconf/command.mk -@@ -42,7 +42,7 @@ CCF = $(CC) $(CFLAGS) +diff -ruN ../Orig/mozilla/security/coreconf/command.mk ./security/coreconf/command.mk +--- ../Orig/mozilla/security/coreconf/command.mk 2004-04-26 00:02:17.000000000 +0900 ++++ ./security/coreconf/command.mk 2005-12-04 19:07:51.000000000 +0900 +@@ -46,7 +46,7 @@ LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS) LINK_EXE = $(LINK) $(OS_LFLAGS) $(LFLAGS) NFSPWD = $(NSINSTALL_DIR)/nfspwd diff --git a/www/firefox/patches/patch-aq b/www/firefox/patches/patch-aq index e3c12669934..1d24715cc59 100644 --- a/www/firefox/patches/patch-aq +++ b/www/firefox/patches/patch-aq @@ -1,8 +1,9 @@ -$NetBSD: patch-aq,v 1.3 2005/10/12 16:39:24 joerg Exp $ +$NetBSD: patch-aq,v 1.4 2005/12/10 13:47:22 taya Exp $ ---- directory/c-sdk/configure.in.orig 2004-09-14 20:59:40.000000000 +0000 -+++ directory/c-sdk/configure.in -@@ -52,7 +52,7 @@ USE_64= +diff -ruN ../Orig/mozilla/directory/c-sdk/configure.in ./directory/c-sdk/configure.in +--- ../Orig/mozilla/directory/c-sdk/configure.in 2005-06-15 06:27:33.000000000 +0900 ++++ ./directory/c-sdk/configure.in 2005-12-04 19:07:54.000000000 +0900 +@@ -54,7 +54,7 @@ USE_CPLUS= USE_IPV6= USE_MDUPDATE= @@ -11,7 +12,7 @@ $NetBSD: patch-aq,v 1.3 2005/10/12 16:39:24 joerg Exp $ _DEBUG_FLAGS=-g MOZ_DEBUG=1 MOZ_OPTIMIZE= -@@ -888,7 +888,7 @@ case "$target" in +@@ -907,7 +907,7 @@ PR_MD_CSRCS=dgux.c ;; @@ -20,7 +21,7 @@ $NetBSD: patch-aq,v 1.3 2005/10/12 16:39:24 joerg Exp $ if test -z "$USE_NSPR_THREADS"; then USE_PTHREADS=1 fi -@@ -2046,7 +2046,7 @@ if test -n "$USE_PTHREADS"; then +@@ -2061,7 +2061,7 @@ _PTHREAD_LDFLAGS= fi ;; @@ -29,7 +30,7 @@ $NetBSD: patch-aq,v 1.3 2005/10/12 16:39:24 joerg Exp $ AC_DEFINE(_THREAD_SAFE) dnl -pthread links in -lc_r, so don't specify it explicitly. if test "$ac_cv_have_dash_pthread" = "yes"; then -@@ -2099,7 +2099,7 @@ case "$target" in +@@ -2114,7 +2114,7 @@ AC_DEFINE(_PR_NEED_PTHREAD_INIT) fi ;; diff --git a/www/firefox/patches/patch-aw b/www/firefox/patches/patch-aw index b70c1b8ba64..702e71424d8 100644 --- a/www/firefox/patches/patch-aw +++ b/www/firefox/patches/patch-aw @@ -1,11 +1,12 @@ -$NetBSD: patch-aw,v 1.3 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-aw,v 1.4 2005/12/10 13:47:22 taya Exp $ ---- widget/src/gtksuperwin/Makefile.in.orig 2004-01-07 13:36:54.000000000 +0000 -+++ widget/src/gtksuperwin/Makefile.in -@@ -25,6 +25,7 @@ include $(DEPTH)/config/autoconf.mk - MODULE = widget +diff -ruN ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in ./widget/src/gtksuperwin/Makefile.in +--- ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in 2004-12-15 14:52:41.000000000 +0900 ++++ ./widget/src/gtksuperwin/Makefile.in 2005-12-04 19:08:57.000000000 +0900 +@@ -46,6 +46,7 @@ LIBRARY_NAME = gtksuperwin EXPORT_LIBRARY = 1 + LIBXUL_LIBRARY = 1 +MKSHLIB = $(MKCSHLIB) PACKAGE_FILE = gtksuperwin.pkg diff --git a/www/firefox/patches/patch-ax b/www/firefox/patches/patch-ax index 08d5d0c92cc..0efd5869071 100644 --- a/www/firefox/patches/patch-ax +++ b/www/firefox/patches/patch-ax @@ -1,8 +1,9 @@ -$NetBSD: patch-ax,v 1.3 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-ax,v 1.4 2005/12/10 13:47:22 taya Exp $ ---- security/coreconf/SunOS5.mk.orig 2004-10-15 22:22:17.000000000 +0000 -+++ security/coreconf/SunOS5.mk -@@ -181,6 +181,10 @@ endif +diff -ruN ../Orig/mozilla/security/coreconf/SunOS5.mk ./security/coreconf/SunOS5.mk +--- ../Orig/mozilla/security/coreconf/SunOS5.mk 2004-10-11 11:15:42.000000000 +0900 ++++ ./security/coreconf/SunOS5.mk 2005-12-04 19:09:09.000000000 +0900 +@@ -182,6 +182,10 @@ DSO_LDOPTS += -G -h $(notdir $@) endif diff --git a/www/firefox/patches/patch-ba b/www/firefox/patches/patch-ba index a8aa3e38cf0..dc6dc3c3f24 100644 --- a/www/firefox/patches/patch-ba +++ b/www/firefox/patches/patch-ba @@ -1,8 +1,9 @@ -$NetBSD: patch-ba,v 1.4 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-ba,v 1.5 2005/12/10 13:47:22 taya Exp $ ---- nsprpub/pr/include/md/_netbsd.cfg.orig 2000-12-01 21:29:17.000000000 +0000 -+++ nsprpub/pr/include/md/_netbsd.cfg -@@ -45,7 +45,8 @@ +diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg +--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg 2004-04-28 09:33:44.000000000 +0900 ++++ ./nsprpub/pr/include/md/_netbsd.cfg 2005-12-04 19:09:16.000000000 +0900 +@@ -48,7 +48,8 @@ #define PR_AF_INET6 24 /* same as AF_INET6 */ @@ -12,7 +13,7 @@ $NetBSD: patch-ba,v 1.4 2005/09/22 14:14:04 jlam Exp $ #define IS_LITTLE_ENDIAN 1 #undef IS_BIG_ENDIAN -@@ -91,7 +92,53 @@ +@@ -94,7 +95,53 @@ #define PR_ALIGN_OF_DOUBLE 4 #define PR_ALIGN_OF_POINTER 4 @@ -67,7 +68,7 @@ $NetBSD: patch-ba,v 1.4 2005/09/22 14:14:04 jlam Exp $ #undef IS_LITTLE_ENDIAN #define IS_BIG_ENDIAN 1 -@@ -184,6 +231,55 @@ +@@ -187,6 +234,55 @@ #define PR_BYTES_PER_WORD_LOG2 3 #define PR_BYTES_PER_DWORD_LOG2 3 diff --git a/www/firefox/patches/patch-bb b/www/firefox/patches/patch-bb index cb18f32520a..fdcd37c1c2a 100644 --- a/www/firefox/patches/patch-bb +++ b/www/firefox/patches/patch-bb @@ -1,36 +1,19 @@ -$NetBSD: patch-bb,v 1.4 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-bb,v 1.5 2005/12/10 13:47:22 taya Exp $ ---- nsprpub/pr/include/md/_netbsd.h.orig 2003-09-11 17:24:53.000000000 +0000 -+++ nsprpub/pr/include/md/_netbsd.h -@@ -44,16 +44,26 @@ +diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md/_netbsd.h +--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h 2004-05-20 00:37:10.000000000 +0900 ++++ ./nsprpub/pr/include/md/_netbsd.h 2005-12-04 19:14:22.000000000 +0900 +@@ -44,6 +44,8 @@ #define _PR_SI_ARCHITECTURE "x86" #elif defined(__alpha__) #define _PR_SI_ARCHITECTURE "alpha" -+#elif defined(__amd64__) ++#elif defined(__amd64__) +#define _PR_SI_ARCHITECTURE "amd64" #elif defined(__m68k__) #define _PR_SI_ARCHITECTURE "m68k" #elif defined(__powerpc__) - #define _PR_SI_ARCHITECTURE "powerpc" -+#elif defined(__sparc_v9__) -+#define _PR_SI_ARCHITECTURE "sparc64" - #elif defined(__sparc__) - #define _PR_SI_ARCHITECTURE "sparc" - #elif defined(__mips__) - #define _PR_SI_ARCHITECTURE "mips" - #elif defined(__arm32__) - #define _PR_SI_ARCHITECTURE "arm32" -+#elif defined(__ARMEL__) -+#define _PR_SI_ARCHITECTURE "armel" -+#elif defined(__ARMEL__) -+#define _PR_SI_ARCHITECTURE "armeb" -+#elif defined(__arm__) -+#define _PR_SI_ARCHITECTURE "arm" - #endif - - #if defined(__ELF__) -@@ -86,6 +96,12 @@ - #define _PR_INET6_PROBE +@@ -95,6 +97,12 @@ + #define _PR_HAVE_GETPROTO_R_INT #endif +#if __NetBSD_Version__ >= 106370000 @@ -42,31 +25,3 @@ $NetBSD: patch-bb,v 1.4 2005/09/22 14:14:04 jlam Exp $ #define USE_SETJMP #ifndef _PR_PTHREADS -@@ -108,7 +124,17 @@ - } - #define _MD_GET_SP(_thread) CONTEXT(_thread)[2] - #endif --#ifdef __sparc__ -+#ifdef __sparc_v9__ -+#define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \ -+{ \ -+ sigsetjmp(CONTEXT(_thread), 1); \ -+ CONTEXT(_thread)[1] = (unsigned char*) ((_sp) - 176 - 0x7ff); \ -+ CONTEXT(_thread)[2] = (long) _main; \ -+ CONTEXT(_thread)[3] = (long) _main + 4; \ -+ *status = PR_TRUE; \ -+} -+#define _MD_GET_SP(_thread) (CONTEXT(_thread)[2]+0x7ff) -+#elif defined(__sparc__) - #define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \ - { \ - sigsetjmp(CONTEXT(_thread), 1); \ -@@ -150,7 +176,7 @@ - } - #define _MD_GET_SP(_thread) CONTEXT(_thread)[32] - #endif --#ifdef __arm32__ -+#ifdef __arm__ - #define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \ - { \ - sigsetjmp(CONTEXT(_thread), 1); \ diff --git a/www/firefox/patches/patch-bm b/www/firefox/patches/patch-bm index 5280435c2bb..4e1b2f236e3 100644 --- a/www/firefox/patches/patch-bm +++ b/www/firefox/patches/patch-bm @@ -1,8 +1,9 @@ -$NetBSD: patch-bm,v 1.3 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-bm,v 1.4 2005/12/10 13:47:22 taya Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp.orig 2001-09-28 20:12:52.000000000 +0000 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp -@@ -118,18 +118,23 @@ PrepareAndDispatch(nsXPTCStubBase* self, +diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp +--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp 2004-04-18 23:18:18.000000000 +0900 ++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp 2005-12-04 19:17:13.000000000 +0900 +@@ -118,18 +118,23 @@ * so they are contiguous with values passed on the stack, and then calls * PrepareAndDispatch() to do the dirty work. */ diff --git a/www/firefox/patches/patch-bo b/www/firefox/patches/patch-bo index 3a939415f52..0364c4722fd 100644 --- a/www/firefox/patches/patch-bo +++ b/www/firefox/patches/patch-bo @@ -1,17 +1,18 @@ -$NetBSD: patch-bo,v 1.5 2005/10/12 16:39:24 joerg Exp $ +$NetBSD: patch-bo,v 1.6 2005/12/10 13:47:22 taya Exp $ ---- nsprpub/configure.in.orig 2004-09-14 22:59:41.000000000 +0200 -+++ nsprpub/configure.in -@@ -56,7 +56,7 @@ USE_CPLUS= +diff -ruN ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in +--- ../Orig/mozilla/nsprpub/configure.in 2005-09-16 07:37:52.000000000 +0900 ++++ ./nsprpub/configure.in 2005-12-04 19:17:56.000000000 +0900 +@@ -57,7 +57,7 @@ USE_IPV6= USE_MDUPDATE= - MACOS_DEPLOYMENT_TARGET= + _MACOSX_DEPLOYMENT_TARGET= -_OPTIMIZE_FLAGS=-O +_OPTIMIZE_FLAGS= _DEBUG_FLAGS=-g MOZ_DEBUG=1 MOZ_OPTIMIZE= -@@ -933,6 +933,34 @@ case "$target" in +@@ -1045,6 +1045,34 @@ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' MDCPUCFG_H=_freebsd.cfg PR_MD_CSRCS=freebsd.c @@ -46,7 +47,7 @@ $NetBSD: patch-bo,v 1.5 2005/10/12 16:39:24 joerg Exp $ ;; *-hpux*) -@@ -1417,6 +1445,7 @@ mips-nec-sysv*) +@@ -1544,6 +1572,7 @@ AC_DEFINE(XP_UNIX) AC_DEFINE(NETBSD) AC_DEFINE(HAVE_BSD_FLOCK) @@ -54,7 +55,7 @@ $NetBSD: patch-bo,v 1.5 2005/10/12 16:39:24 joerg Exp $ USE_NSPR_THREADS=1 MDCPUCFG_H=_netbsd.cfg PR_MD_CSRCS=netbsd.c -@@ -2149,7 +2178,7 @@ if test -n "$USE_PTHREADS"; then +@@ -2307,7 +2336,7 @@ if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then ac_cv_have_dash_pthread=yes case "$target_os" in @@ -63,7 +64,7 @@ $NetBSD: patch-bo,v 1.5 2005/10/12 16:39:24 joerg Exp $ # Freebsd doesn't use -pthread for compiles, it uses them for linking ;; *) -@@ -2187,7 +2216,7 @@ if test -n "$USE_PTHREADS"; then +@@ -2345,7 +2374,7 @@ _PTHREAD_LDFLAGS= fi ;; @@ -72,7 +73,7 @@ $NetBSD: patch-bo,v 1.5 2005/10/12 16:39:24 joerg Exp $ AC_DEFINE(_REENTRANT) AC_DEFINE(_THREAD_SAFE) dnl -pthread links in -lc_r, so don't specify it explicitly. -@@ -2269,7 +2298,7 @@ case "$target" in +@@ -2426,7 +2455,7 @@ AC_DEFINE(_PR_NEED_PTHREAD_INIT) fi ;; diff --git a/www/firefox/patches/patch-bq b/www/firefox/patches/patch-bq index bcaae295c68..d5724b6e9fd 100644 --- a/www/firefox/patches/patch-bq +++ b/www/firefox/patches/patch-bq @@ -1,8 +1,9 @@ -$NetBSD: patch-bq,v 1.5 2005/10/12 16:39:24 joerg Exp $ +$NetBSD: patch-bq,v 1.6 2005/12/10 13:47:22 taya Exp $ ---- xpcom/io/nsLocalFileUnix.h.orig 2004-01-15 06:14:13.000000000 +0000 -+++ xpcom/io/nsLocalFileUnix.h -@@ -57,7 +57,7 @@ +diff -ruN ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h ./xpcom/io/nsLocalFileUnix.h +--- ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h 2004-04-18 23:18:14.000000000 +0900 ++++ ./xpcom/io/nsLocalFileUnix.h 2005-12-04 19:18:04.000000000 +0900 +@@ -73,7 +73,7 @@ #endif // so we can statfs on freebsd diff --git a/www/firefox/patches/patch-br b/www/firefox/patches/patch-br index 575795e2195..2e7ccd84162 100644 --- a/www/firefox/patches/patch-br +++ b/www/firefox/patches/patch-br @@ -1,8 +1,9 @@ -$NetBSD: patch-br,v 1.5 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-br,v 1.6 2005/12/10 13:47:22 taya Exp $ ---- nsprpub/pr/src/misc/prnetdb.c.orig 2004-09-01 23:07:28.000000000 +0000 -+++ nsprpub/pr/src/misc/prnetdb.c -@@ -2098,7 +2098,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf +diff -ruN ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c ./nsprpub/pr/src/misc/prnetdb.c +--- ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c 2005-08-19 02:24:38.000000000 +0900 ++++ ./nsprpub/pr/src/misc/prnetdb.c 2005-12-04 19:18:10.000000000 +0900 +@@ -2110,7 +2110,17 @@ */ hints.ai_socktype = SOCK_STREAM; diff --git a/www/firefox/patches/patch-bs b/www/firefox/patches/patch-bs index 021111ebd35..9291cacab71 100644 --- a/www/firefox/patches/patch-bs +++ b/www/firefox/patches/patch-bs @@ -1,7 +1,8 @@ -$NetBSD: patch-bs,v 1.4 2005/10/12 16:39:25 joerg Exp $ +$NetBSD: patch-bs,v 1.5 2005/12/10 13:47:22 taya Exp $ ---- config/mkdepend/imakemdep.h.orig 1998-09-05 06:22:25.000000000 +0200 -+++ config/mkdepend/imakemdep.h 2004-11-17 10:33:27.000000000 +0100 +diff -ruN ../Orig/mozilla/config/mkdepend/imakemdep.h ./config/mkdepend/imakemdep.h +--- ../Orig/mozilla/config/mkdepend/imakemdep.h 2004-04-21 06:38:14.000000000 +0900 ++++ ./config/mkdepend/imakemdep.h 2005-12-04 19:21:01.000000000 +0900 @@ -235,7 +235,7 @@ #ifdef _CRAY #define DEFAULT_CPP "/lib/pcpp" @@ -11,7 +12,7 @@ $NetBSD: patch-bs,v 1.4 2005/10/12 16:39:25 joerg Exp $ #define DEFAULT_CPP "/usr/libexec/cpp" #endif #ifdef MACH -@@ -273,10 +273,13 @@ +@@ -273,7 +273,7 @@ #ifdef unix "-Uunix", /* remove unix symbol so that filename unix.c okay */ #endif @@ -20,13 +21,7 @@ $NetBSD: patch-bs,v 1.4 2005/10/12 16:39:25 joerg Exp $ # ifdef __i386__ "-D__i386__", # endif -+# if defined(__amd64__) || defined(__x86_64__) -+ "-D__amd64__ -D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", - # endif -@@ -710,6 +713,9 @@ +@@ -713,6 +713,9 @@ #ifdef __sgi {"__sgi", "1"}, #endif diff --git a/www/firefox/patches/patch-bt b/www/firefox/patches/patch-bt deleted file mode 100644 index 7b77e00dbc9..00000000000 --- a/www/firefox/patches/patch-bt +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bt,v 1.4 2005/09/22 14:14:04 jlam Exp $ - ---- nsprpub/pr/src/io/prprf.c.orig 2004-03-09 03:18:19.000000000 +0000 -+++ nsprpub/pr/src/io/prprf.c -@@ -53,6 +53,11 @@ - */ - #if (defined(LINUX) && defined(__x86_64__)) - #define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar)) -+#elif (defined (__NetBSD__) && \ -+ (defined(__amd64__) || \ -+ (defined(__powerpc__) && __NetBSD_Version__ >= 105000000))) -+#include <stdarg.h> -+#define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar)) - #elif (defined(LINUX) && defined(__powerpc__)) || \ - (defined(LINUX) && defined(__s390__)) || \ - (defined(LINUX) && defined(__s390x__)) || \ diff --git a/www/firefox/patches/patch-bu b/www/firefox/patches/patch-bu index a6f683b6b8d..f3cf45e935c 100644 --- a/www/firefox/patches/patch-bu +++ b/www/firefox/patches/patch-bu @@ -1,7 +1,8 @@ -$NetBSD: patch-bu,v 1.3 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-bu,v 1.4 2005/12/10 13:47:22 taya Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp.orig 2005-09-21 22:14:53.000000000 +0000 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp +diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp +--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp 1970-01-01 09:00:00.000000000 +0900 ++++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp 2005-12-07 00:07:35.000000000 +0900 @@ -0,0 +1,174 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +// Platform specific code to invoke XPCOM methods on native objects diff --git a/www/firefox/patches/patch-bugzilla-319004 b/www/firefox/patches/patch-bugzilla-319004 new file mode 100644 index 00000000000..2bac02d9a52 --- /dev/null +++ b/www/firefox/patches/patch-bugzilla-319004 @@ -0,0 +1,128 @@ +$NetBSD: patch-bugzilla-319004,v 1.1 2005/12/10 13:47:22 taya Exp $ + +Index: toolkit/components/history/src/nsGlobalHistory.cpp +=================================================================== +RCS file: /cvsroot/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp,v +retrieving revision 1.63 +diff -u -8 -r1.63 nsGlobalHistory.cpp +--- toolkit/components/history/src/nsGlobalHistory.cpp 17 Nov 2005 00:23:09 -0000 1.63 ++++ toolkit/components/history/src/nsGlobalHistory.cpp 9 Dec 2005 08:30:42 -0000 +@@ -108,16 +108,20 @@ + + #define PREF_BRANCH_BASE "browser." + #define PREF_BROWSER_HISTORY_EXPIRE_DAYS "history_expire_days" + #define PREF_AUTOCOMPLETE_ONLY_TYPED "urlbar.matchOnlyTyped" + #define PREF_AUTOCOMPLETE_ENABLED "urlbar.autocomplete.enabled" + + #define FIND_BY_AGEINDAYS_PREFIX "find:datasource=history&match=AgeInDays&method=" + ++// see bug #319004 -- clamp title and URL to generously-large but not too large ++// length ++#define HISTORY_STRING_LENGTH_MAX 65536 ++ + // sync history every 10 seconds + #define HISTORY_SYNC_TIMEOUT (10 * PR_MSEC_PER_SEC) + //#define HISTORY_SYNC_TIMEOUT 3000 // every 3 seconds - testing only! + + // the value of mLastNow expires every 3 seconds + #define HISTORY_EXPIRE_NOW_TIMEOUT (3 * PR_MSEC_PER_SEC) + + #define MSECS_PER_DAY (PR_MSEC_PER_SEC * 60 * 60 * 24) +@@ -1105,30 +1109,33 @@ + } + + NS_IMETHODIMP + nsGlobalHistory::SetPageTitle(nsIURI *aURI, const nsAString& aTitle) + { + nsresult rv; + NS_ENSURE_ARG_POINTER(aURI); + +- const nsAFlatString& titleString = PromiseFlatString(aTitle); ++ nsAutoString titleString(Substring(aTitle, 0, HISTORY_STRING_LENGTH_MAX)); + + // skip about: URIs to avoid reading in the db (about:blank, especially) + PRBool isAbout; + rv = aURI->SchemeIs("about", &isAbout); + NS_ENSURE_SUCCESS(rv, rv); + if (isAbout) return NS_OK; + + NS_ENSURE_SUCCESS(OpenDB(), NS_ERROR_FAILURE); + + nsCAutoString URISpec; + rv = aURI->GetSpec(URISpec); + NS_ENSURE_SUCCESS(rv, rv); + ++ if (URISpec.Length() > HISTORY_STRING_LENGTH_MAX) ++ URISpec.Left(URISpec, HISTORY_STRING_LENGTH_MAX); ++ + nsCOMPtr<nsIMdbRow> row; + rv = FindRow(kToken_URLColumn, URISpec.get(), getter_AddRefs(row)); + + // if the row doesn't exist, we silently succeed + if (rv == NS_ERROR_NOT_AVAILABLE) return NS_OK; + NS_ENSURE_SUCCESS(rv, rv); + + // Get the old title so we can notify observers +Index: xpfe/components/history/src/nsGlobalHistory.cpp +=================================================================== +RCS file: /cvsroot/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp,v +retrieving revision 1.213 +diff -u -8 -p -r1.213 nsGlobalHistory.cpp +--- xpfe/components/history/src/nsGlobalHistory.cpp 26 Oct 2005 16:50:47 -0000 1.213 ++++ xpfe/components/history/src/nsGlobalHistory.cpp 9 Dec 2005 08:47:37 -0000 +@@ -106,16 +106,20 @@ nsIPrefBranch* nsGlobalHistory::gPrefBra + + #define PREF_BRANCH_BASE "browser." + #define PREF_BROWSER_HISTORY_EXPIRE_DAYS "history_expire_days" + #define PREF_AUTOCOMPLETE_ONLY_TYPED "urlbar.matchOnlyTyped" + #define PREF_AUTOCOMPLETE_ENABLED "urlbar.autocomplete.enabled" + + #define FIND_BY_AGEINDAYS_PREFIX "find:datasource=history&match=AgeInDays&method=" + ++// see bug #319004 -- clamp title and URL to generously-large but not too large ++// length ++#define HISTORY_STRING_LENGTH_MAX 65536 ++ + // sync history every 10 seconds + #define HISTORY_SYNC_TIMEOUT (10 * PR_MSEC_PER_SEC) + //#define HISTORY_SYNC_TIMEOUT 3000 // every 3 seconds - testing only! + + // the value of mLastNow expires every 3 seconds + #define HISTORY_EXPIRE_NOW_TIMEOUT (3 * PR_MSEC_PER_SEC) + + static const PRInt64 MSECS_PER_DAY = LL_INIT(20, 500654080); // (1000000LL * 60 * 60 * 24) +@@ -1028,30 +1032,33 @@ nsGlobalHistory::GetCount(PRUint32* aCou + } + + NS_IMETHODIMP + nsGlobalHistory::SetPageTitle(nsIURI *aURI, const nsAString& aTitle) + { + nsresult rv; + NS_ENSURE_ARG_POINTER(aURI); + +- const nsAFlatString& titleString = PromiseFlatString(aTitle); ++ nsAutoString titleString(Substring(aTitle, 0, HISTORY_STRING_LENGTH_MAX)); + + // skip about: URIs to avoid reading in the db (about:blank, especially) + PRBool isAbout; + rv = aURI->SchemeIs("about", &isAbout); + NS_ENSURE_SUCCESS(rv, rv); + if (isAbout) return NS_OK; + + NS_ENSURE_SUCCESS(OpenDB(), NS_ERROR_FAILURE); + + nsCAutoString URISpec; + rv = aURI->GetSpec(URISpec); + NS_ENSURE_SUCCESS(rv, rv); + ++ if (URISpec.Length() > HISTORY_STRING_LENGTH_MAX) ++ URISpec.Left(URISpec, HISTORY_STRING_LENGTH_MAX); ++ + nsCOMPtr<nsIMdbRow> row; + rv = FindRow(kToken_URLColumn, URISpec.get(), getter_AddRefs(row)); + + // if the row doesn't exist, we silently succeed + if (rv == NS_ERROR_NOT_AVAILABLE) return NS_OK; + NS_ENSURE_SUCCESS(rv, rv); + + // Get the old title so we can notify observers diff --git a/www/firefox/patches/patch-bv b/www/firefox/patches/patch-bv index eb5db4e529c..31a30729aa0 100644 --- a/www/firefox/patches/patch-bv +++ b/www/firefox/patches/patch-bv @@ -1,7 +1,8 @@ -$NetBSD: patch-bv,v 1.3 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-bv,v 1.4 2005/12/10 13:47:22 taya Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp.orig 2005-09-21 22:14:53.000000000 +0000 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp +diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp +--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp 1970-01-01 09:00:00.000000000 +0900 ++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp 2005-12-04 19:32:22.000000000 +0900 @@ -0,0 +1,206 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ + diff --git a/www/firefox/patches/patch-bw b/www/firefox/patches/patch-bw deleted file mode 100644 index b8d1bd2f2d1..00000000000 --- a/www/firefox/patches/patch-bw +++ /dev/null @@ -1,63 +0,0 @@ -$NetBSD: patch-bw,v 1.4 2005/09/22 14:14:04 jlam Exp $ - ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp.orig 2001-09-28 20:12:52.000000000 +0000 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp -@@ -188,6 +188,50 @@ __asm__( - * nsresult nsXPTCStubBase::Stub##n() - * Sets register $1 to "methodIndex" and jumps to SharedStub. - */ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+"#### Stub"#n" ####\n" \ -+".text\n" \ -+" .align 5\n" \ -+" .if "#n" < 10 \n" \ -+" .globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+" .ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n" \ -+" .frame $30,0,$26,0\n" \ -+" ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n" \ -+" .prologue 1\n" \ -+" lda $1,"#n"\n" \ -+" br $31,$SharedStub..ng\n" \ -+" .end _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+" .elseif "#n" < 100 \n" \ -+" .globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+" .ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n" \ -+" .frame $30,0,$26,0\n" \ -+" ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n" \ -+" .prologue 1\n" \ -+" lda $1,"#n"\n" \ -+" br $31,$SharedStub..ng\n" \ -+" .end _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+" .elseif "#n" < 1000 \n" \ -+" .globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+" .ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n" \ -+" .frame $30,0,$26,0\n" \ -+" ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n" \ -+" .prologue 1\n" \ -+" lda $1,"#n"\n" \ -+" br $31,$SharedStub..ng\n" \ -+" .end _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+" .else\n" \ -+" .err \"stub number "#n"> 1000 not yet supported\"\n" \ -+" .endif\n" \ -+ ); -+#else /* G++2.95 ABI */ - #define STUB_ENTRY(n) \ - __asm__( \ - "#### Stub"#n" ####\n" \ -@@ -204,6 +248,7 @@ __asm__( \ - "br $31,$SharedStub..ng\n\t" \ - ".end Stub"#n"__14nsXPTCStubBase" \ - ); -+#endif - - #define SENTINEL_ENTRY(n) \ - nsresult nsXPTCStubBase::Sentinel##n() \ diff --git a/www/firefox/patches/patch-bx b/www/firefox/patches/patch-bx index af3b53b75dd..f0ec02b98c5 100644 --- a/www/firefox/patches/patch-bx +++ b/www/firefox/patches/patch-bx @@ -1,8 +1,9 @@ -$NetBSD: patch-bx,v 1.3 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-bx,v 1.4 2005/12/10 13:47:22 taya Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp.orig 2001-09-28 20:12:53.000000000 +0000 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp -@@ -119,8 +119,10 @@ PrepareAndDispatch(nsXPTCStubBase* self, +diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp +--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp 2004-04-18 23:18:18.000000000 +0900 ++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp 2005-12-04 19:34:41.000000000 +0900 +@@ -119,8 +119,10 @@ if ((PRUint32) ap & 4) ap++; // doubles are 8-byte aligned on stack dp->val.d = *(double*) ap; ap += 2; @@ -13,7 +14,7 @@ $NetBSD: patch-bx,v 1.3 2005/09/22 14:14:04 jlam Exp $ } continue; } -@@ -130,8 +132,10 @@ PrepareAndDispatch(nsXPTCStubBase* self, +@@ -130,8 +132,10 @@ else { dp->val.f = *(float*) ap; ap += 1; @@ -24,7 +25,7 @@ $NetBSD: patch-bx,v 1.3 2005/09/22 14:14:04 jlam Exp $ } continue; } -@@ -195,7 +199,9 @@ PrepareAndDispatch(nsXPTCStubBase* self, +@@ -195,7 +199,9 @@ // however, it's quick, dirty, and'll break when the ABI changes on // us, which is what we want ;-). @@ -35,7 +36,7 @@ $NetBSD: patch-bx,v 1.3 2005/09/22 14:14:04 jlam Exp $ __asm__ ( \ ".section \".text\" \n\t" \ ".align 2 \n\t" \ -@@ -206,6 +212,46 @@ __asm__ ( +@@ -206,6 +212,46 @@ "li 11,"#n" \n\t" \ "b SharedStub@local \n" \ ); diff --git a/www/firefox/patches/patch-by b/www/firefox/patches/patch-by index 268544a8d08..de9a3b89b3b 100644 --- a/www/firefox/patches/patch-by +++ b/www/firefox/patches/patch-by @@ -1,8 +1,9 @@ -$NetBSD: patch-by,v 1.3 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-by,v 1.4 2005/12/10 13:47:22 taya Exp $ ---- layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp.orig 2004-03-19 01:36:16.000000000 +0000 -+++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp -@@ -155,15 +155,15 @@ void NS_InitSVGLibartGlyphMetricsFTGloba +diff -ruN ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp +--- ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp 2004-11-24 03:01:01.000000000 +0900 ++++ ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp 2005-12-04 19:34:45.000000000 +0900 +@@ -155,15 +155,15 @@ static NS_NAMED_LITERAL_STRING(arial, "arial"); nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("helvetica"), @@ -21,7 +22,7 @@ $NetBSD: patch-by,v 1.3 2005/09/22 14:14:04 jlam Exp $ } void NS_FreeSVGLibartGlyphMetricsFTGlobals() -@@ -440,19 +440,19 @@ nsSVGLibartGlyphMetricsFT::InitializeFac +@@ -440,19 +440,19 @@ return; } diff --git a/www/firefox/patches/patch-bz b/www/firefox/patches/patch-bz index abfe6c91725..3baa5fe3bb7 100644 --- a/www/firefox/patches/patch-bz +++ b/www/firefox/patches/patch-bz @@ -1,7 +1,8 @@ -$NetBSD: patch-bz,v 1.2 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-bz,v 1.3 2005/12/10 13:47:22 taya Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s.orig 2001-03-11 17:22:22.000000000 +0000 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s +diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s +--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s 2001-03-12 02:22:22.000000000 +0900 ++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s 2005-12-04 19:34:51.000000000 +0900 @@ -1,27 +1,27 @@ -# -*- Mode: Asm -*- -# @@ -88,7 +89,7 @@ $NetBSD: patch-bz,v 1.2 2005/09/22 14:14:04 jlam Exp $ stfd f2,48(sp) stfd f3,56(sp) stfd f4,64(sp) -@@ -69,21 +69,20 @@ SharedStub: +@@ -69,21 +69,20 @@ stfd f7,88(sp) stfd f8,96(sp) diff --git a/www/firefox/patches/patch-ca b/www/firefox/patches/patch-ca index 2c5c40f0076..78bccd76b8d 100644 --- a/www/firefox/patches/patch-ca +++ b/www/firefox/patches/patch-ca @@ -1,7 +1,8 @@ -$NetBSD: patch-ca,v 1.2 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-ca,v 1.3 2005/12/10 13:47:22 taya Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig 2001-03-11 17:22:17.000000000 +0000 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s +diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s +--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s 2001-03-12 02:22:17.000000000 +0900 ++++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s 2005-12-04 19:34:59.000000000 +0900 @@ -1,27 +1,28 @@ -# -*- Mode: Asm -*- -# @@ -116,7 +117,7 @@ $NetBSD: patch-ca,v 1.2 2005/09/22 14:14:04 jlam Exp $ lfd f2,40(r30) lfd f3,48(r30) lfd f4,56(r30) -@@ -82,18 +83,18 @@ XPTC_InvokeByIndex: +@@ -82,18 +83,18 @@ lfd f7,80(r30) lfd f8,88(r30) @@ -146,7 +147,7 @@ $NetBSD: patch-ca,v 1.2 2005/09/22 14:14:04 jlam Exp $ lwz r5,8(r30) lwz r6,12(r30) lwz r7,16(r30) -@@ -101,13 +102,13 @@ XPTC_InvokeByIndex: +@@ -101,13 +102,13 @@ lwz r9,24(r30) lwz r10,28(r30) diff --git a/www/firefox/patches/patch-cb b/www/firefox/patches/patch-cb index 479a817caef..562d8c13ed7 100644 --- a/www/firefox/patches/patch-cb +++ b/www/firefox/patches/patch-cb @@ -1,8 +1,9 @@ -$NetBSD: patch-cb,v 1.2 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-cb,v 1.3 2005/12/10 13:47:22 taya Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp.orig 2001-09-28 20:12:52.000000000 +0000 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp -@@ -104,8 +104,10 @@ invoke_copy_to_stack(PRUint32* d, +diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp +--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp 2004-04-18 23:18:18.000000000 +0900 ++++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp 2005-12-04 19:35:01.000000000 +0900 +@@ -104,8 +104,10 @@ if ((PRUint32) d & 4) d++; // doubles are 8-byte aligned on stack *((double*) d) = s->val.d; d += 2; @@ -13,7 +14,7 @@ $NetBSD: patch-cb,v 1.2 2005/09/22 14:14:04 jlam Exp $ } } else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) { -@@ -114,8 +116,10 @@ invoke_copy_to_stack(PRUint32* d, +@@ -114,8 +116,10 @@ else { *((float*) d) = s->val.f; d += 1; diff --git a/www/firefox/patches/patch-cc b/www/firefox/patches/patch-cc deleted file mode 100644 index aec53df7634..00000000000 --- a/www/firefox/patches/patch-cc +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-cc,v 1.2 2005/09/22 14:14:04 jlam Exp $ - ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp.orig 2001-09-28 20:12:51.000000000 +0000 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp -@@ -163,7 +163,11 @@ __asm__( - "bis $16,$16,$1\n\t" /* load "this" */ - "ldq $2,16($15)\n\t" /* load "methodIndex" */ - "ldq $1,0($1)\n\t" /* load vtable */ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+ "s8addq $2,0,$2\n\t" /* vtable index = "methodIndex" * 8 */ -+#else /* G++2.95 ABI */ - "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#endif - "addq $1,$2,$1\n\t" - "ldq $27,0($1)\n\t" /* load address of function */ - "jsr $26,($27),0\n\t" /* call virtual function */ diff --git a/www/firefox/patches/patch-cd b/www/firefox/patches/patch-cd index 5ec1cc84f1b..9921bad5a51 100644 --- a/www/firefox/patches/patch-cd +++ b/www/firefox/patches/patch-cd @@ -1,19 +1,9 @@ -$NetBSD: patch-cd,v 1.2 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-cd,v 1.3 2005/12/10 13:47:22 taya Exp $ ---- modules/plugin/base/public/nptypes.h.orig 2004-09-01 16:59:55.000000000 +0000 -+++ modules/plugin/base/public/nptypes.h -@@ -78,8 +78,10 @@ - typedef int bool; - #endif - #else /* OPENBSD is defined, so use its bool */ -+ #if !defined(__cplusplus) - #include <stdbool.h> - #endif -+ #endif - #else - /* - * FreeBSD defines uint32_t and bool. -@@ -97,6 +99,7 @@ +diff -ruN ../Orig/mozilla/modules/plugin/base/public/nptypes.h ./modules/plugin/base/public/nptypes.h +--- ../Orig/mozilla/modules/plugin/base/public/nptypes.h 2005-05-20 06:49:42.000000000 +0900 ++++ ./modules/plugin/base/public/nptypes.h 2005-12-04 19:35:14.000000000 +0900 +@@ -93,6 +93,7 @@ */ #include <stdint.h> @@ -21,7 +11,7 @@ $NetBSD: patch-cd,v 1.2 2005/09/22 14:14:04 jlam Exp $ #if !defined(__GNUC__) || (__GNUC__ > 2 || __GNUC_MINOR__ > 95) #include <stdbool.h> #else -@@ -106,4 +109,5 @@ +@@ -102,4 +103,5 @@ */ #define bool int #endif diff --git a/www/firefox/patches/patch-ce b/www/firefox/patches/patch-ce deleted file mode 100644 index a2f76330a1a..00000000000 --- a/www/firefox/patches/patch-ce +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ce,v 1.2 2005/09/22 14:14:04 jlam Exp $ - ---- toolkit/mozapps/installer/unix/wizard/Makefile.in.orig 2004-10-25 08:23:28.000000000 +0000 -+++ toolkit/mozapps/installer/unix/wizard/Makefile.in -@@ -60,6 +60,10 @@ LIBS = \ - -lpthread \ - $(NULL) - -+ifeq ($(OS_ARCH),SunOS) -+LIBS += -lnsl -+endif -+ - EXTRA_DEPS = \ - $(DIST)/lib/$(LIB_PREFIX)jar50_s.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)xpnet_s.$(LIB_SUFFIX) \ diff --git a/www/firefox/patches/patch-cf b/www/firefox/patches/patch-cf deleted file mode 100644 index 6362bc99e63..00000000000 --- a/www/firefox/patches/patch-cf +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-cf,v 1.2 2005/09/22 14:14:04 jlam Exp $ - ---- browser/config/mozconfig.orig 2004-07-07 08:31:10.000000000 +0000 -+++ browser/config/mozconfig -@@ -3,7 +3,8 @@ - # . $topsrcdir/browser/config/mozconfig - # to the top of your mozconfig file. - --export MOZ_PHOENIX=1 -+MOZ_PHOENIX=1 -+export MOZ_PHOENIX - mk_add_options MOZ_PHOENIX=1 - - ac_add_options --disable-ldap diff --git a/www/firefox/patches/patch-cg b/www/firefox/patches/patch-cg index 65949f22a66..822370bb201 100644 --- a/www/firefox/patches/patch-cg +++ b/www/firefox/patches/patch-cg @@ -1,8 +1,9 @@ -$NetBSD: patch-cg,v 1.6 2005/10/12 16:39:25 joerg Exp $ +$NetBSD: patch-cg,v 1.7 2005/12/10 13:47:22 taya Exp $ ---- extensions/transformiix/source/base/Double.cpp.orig 2004-01-15 21:23:18.000000000 +0000 -+++ extensions/transformiix/source/base/Double.cpp -@@ -48,8 +48,40 @@ +diff -ruN ../Orig/mozilla/extensions/transformiix/source/base/Double.cpp ./extensions/transformiix/source/base/Double.cpp +--- ../Orig/mozilla/extensions/transformiix/source/base/Double.cpp 2004-06-17 09:12:42.000000000 +0900 ++++ ./extensions/transformiix/source/base/Double.cpp 2005-12-04 19:39:05.000000000 +0900 +@@ -49,8 +49,40 @@ * Utility class for doubles */ @@ -44,7 +45,7 @@ $NetBSD: patch-cg,v 1.6 2005/10/12 16:39:25 joerg Exp $ #include <ieeefp.h> #ifdef __alpha__ fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; -@@ -127,9 +159,20 @@ const PRUint32 infMask[2] = {0, TX_DO +@@ -128,9 +160,20 @@ const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; #endif @@ -68,7 +69,7 @@ $NetBSD: patch-cg,v 1.6 2005/10/12 16:39:25 joerg Exp $ /* * Determines whether the given double represents positive or negative -@@ -157,6 +200,7 @@ MBool Double::isNeg(double aDbl) +@@ -158,6 +201,7 @@ { return (TX_DOUBLE_HI32(aDbl) & TX_DOUBLE_HI32_SIGNBIT) != 0; } @@ -76,7 +77,7 @@ $NetBSD: patch-cg,v 1.6 2005/10/12 16:39:25 joerg Exp $ /* * Converts the given String to a double, if the String value does not -@@ -244,7 +288,7 @@ public: +@@ -245,7 +289,7 @@ { if (mState == eIllegal || mBuffer.IsEmpty() || (mBuffer.Length() == 1 && mBuffer[0] == '.')) { diff --git a/www/firefox/patches/patch-ch b/www/firefox/patches/patch-ch index 05603afbc8e..f09bae9b3bc 100644 --- a/www/firefox/patches/patch-ch +++ b/www/firefox/patches/patch-ch @@ -1,12 +1,12 @@ -$NetBSD: patch-ch,v 1.4 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-ch,v 1.5 2005/12/10 13:47:22 taya Exp $ ---- extensions/transformiix/source/base/primitives.h.orig 2003-01-17 12:43:05.000000000 +0000 -+++ extensions/transformiix/source/base/primitives.h -@@ -51,10 +51,9 @@ public: - /* - * Usefull constants +diff -ruN ../Orig/mozilla/extensions/transformiix/source/base/txCore.h ./extensions/transformiix/source/base/txCore.h +--- ../Orig/mozilla/extensions/transformiix/source/base/txCore.h 2004-05-26 20:54:37.000000000 +0900 ++++ ./extensions/transformiix/source/base/txCore.h 2005-12-04 19:42:43.000000000 +0900 +@@ -65,9 +65,9 @@ + /** + * Useful constants */ -- - static const double NaN; - static const double POSITIVE_INFINITY; - static const double NEGATIVE_INFINITY; @@ -14,5 +14,5 @@ $NetBSD: patch-ch,v 1.4 2005/09/22 14:14:04 jlam Exp $ + static double PositiveInfinity(); + static double NegativeInfinity(); - /* + /** * Determines whether the given double represents positive or negative diff --git a/www/firefox/patches/patch-ci b/www/firefox/patches/patch-ci index ae46908f973..f13de9f21cc 100644 --- a/www/firefox/patches/patch-ci +++ b/www/firefox/patches/patch-ci @@ -1,8 +1,9 @@ -$NetBSD: patch-ci,v 1.4 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-ci,v 1.5 2005/12/10 13:47:22 taya Exp $ ---- extensions/transformiix/source/xpath/FunctionCall.cpp.orig 2003-11-04 15:13:03.000000000 +0000 -+++ extensions/transformiix/source/xpath/FunctionCall.cpp -@@ -92,7 +92,7 @@ double FunctionCall::evaluateToNumber(Ex +diff -ruN ../Orig/mozilla/extensions/transformiix/source/xpath/FunctionCall.cpp ./extensions/transformiix/source/xpath/FunctionCall.cpp +--- ../Orig/mozilla/extensions/transformiix/source/xpath/FunctionCall.cpp 2005-01-29 20:07:14.000000000 +0900 ++++ ./extensions/transformiix/source/xpath/FunctionCall.cpp 2005-12-04 19:43:01.000000000 +0900 +@@ -105,7 +105,7 @@ nsRefPtr<txAExprResult> exprResult; nsresult rv = aExpr->evaluate(aContext, getter_AddRefs(exprResult)); if (NS_FAILED(rv)) diff --git a/www/firefox/patches/patch-cj b/www/firefox/patches/patch-cj index e60c57e185e..a45def763d6 100644 --- a/www/firefox/patches/patch-cj +++ b/www/firefox/patches/patch-cj @@ -1,8 +1,9 @@ -$NetBSD: patch-cj,v 1.4 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-cj,v 1.5 2005/12/10 13:47:22 taya Exp $ ---- extensions/transformiix/source/xpath/MultiplicativeExpr.cpp.orig 2003-11-19 23:06:14.000000000 +0000 -+++ extensions/transformiix/source/xpath/MultiplicativeExpr.cpp -@@ -71,22 +71,22 @@ MultiplicativeExpr::evaluate(txIEvalCont +diff -ruN ../Orig/mozilla/extensions/transformiix/source/xpath/MultiplicativeExpr.cpp ./extensions/transformiix/source/xpath/MultiplicativeExpr.cpp +--- ../Orig/mozilla/extensions/transformiix/source/xpath/MultiplicativeExpr.cpp 2004-06-17 09:12:43.000000000 +0900 ++++ ./extensions/transformiix/source/xpath/MultiplicativeExpr.cpp 2005-12-04 19:43:04.000000000 +0900 +@@ -79,22 +79,22 @@ #if defined(XP_WIN) /* XXX MSVC miscompiles such that (NaN == 0) */ if (Double::isNaN(rightDbl)) diff --git a/www/firefox/patches/patch-ck b/www/firefox/patches/patch-ck index f253c9592cb..12628eed38a 100644 --- a/www/firefox/patches/patch-ck +++ b/www/firefox/patches/patch-ck @@ -1,8 +1,9 @@ -$NetBSD: patch-ck,v 1.4 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-ck,v 1.5 2005/12/10 13:47:22 taya Exp $ ---- extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp.orig 2003-06-16 22:31:17.000000000 +0000 -+++ extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp -@@ -112,12 +112,12 @@ txFormatNumberFunctionCall::evaluate(txI +diff -ruN ../Orig/mozilla/extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp ./extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp +--- ../Orig/mozilla/extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp 2004-06-17 09:12:44.000000000 +0900 ++++ ./extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp 2005-12-04 19:43:07.000000000 +0900 +@@ -114,12 +114,12 @@ return aContext->recycler()->getStringResult(format->mNaN, aResult); } diff --git a/www/firefox/patches/patch-cl b/www/firefox/patches/patch-cl index 0a955c3dd44..0864987237d 100644 --- a/www/firefox/patches/patch-cl +++ b/www/firefox/patches/patch-cl @@ -1,8 +1,9 @@ -$NetBSD: patch-cl,v 1.4 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-cl,v 1.5 2005/12/10 13:47:22 taya Exp $ ---- extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp.orig 2004-01-29 22:04:29.000000000 +0000 -+++ extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp -@@ -258,7 +258,7 @@ getNumberAttr(txStylesheetAttr* aAttribu +diff -ruN ../Orig/mozilla/extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp ./extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp +--- ../Orig/mozilla/extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp 2005-01-24 19:50:39.000000000 +0900 ++++ ./extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp 2005-12-04 19:44:00.000000000 +0900 +@@ -279,7 +279,7 @@ txStylesheetCompilerState& aState, double& aNumber) { @@ -11,16 +12,16 @@ $NetBSD: patch-cl,v 1.4 2005/09/22 14:14:04 jlam Exp $ txStylesheetAttr* attr = nsnull; nsresult rv = getStyleAttr(aAttributes, aAttrCount, kNameSpaceID_None, aName, aRequired, &attr); -@@ -479,7 +479,7 @@ txFnStartLREStylesheet(PRInt32 aNamespac +@@ -500,7 +500,7 @@ NS_ENSURE_SUCCESS(rv, rv); txExpandedName nullExpr; - double prio = Double::NaN; + double prio = Double::NaN(); - nsAutoPtr<txPattern> match(new txRootPattern(MB_TRUE)); - NS_ENSURE_TRUE(match, NS_ERROR_OUT_OF_MEMORY); -@@ -1038,7 +1038,7 @@ txFnStartTemplate(PRInt32 aNamespaceID, + nsAutoPtr<txPattern> match(new txRootPattern()); + NS_ENSURE_TRUE(match, NS_ERROR_OUT_OF_MEMORY); +@@ -1060,7 +1060,7 @@ aState, mode); NS_ENSURE_SUCCESS(rv, rv); diff --git a/www/firefox/patches/patch-cm b/www/firefox/patches/patch-cm index b42b25ce8be..ed0338c42b9 100644 --- a/www/firefox/patches/patch-cm +++ b/www/firefox/patches/patch-cm @@ -1,8 +1,9 @@ -$NetBSD: patch-cm,v 1.4 2005/09/22 14:14:04 jlam Exp $ +$NetBSD: patch-cm,v 1.5 2005/12/10 13:47:22 taya Exp $ ---- extensions/transformiix/source/xslt/txXSLTPatterns.cpp.orig 2003-11-18 22:56:46.000000000 +0000 -+++ extensions/transformiix/source/xslt/txXSLTPatterns.cpp -@@ -99,7 +99,7 @@ nsresult txUnionPattern::addPattern(txPa +diff -ruN ../Orig/mozilla/extensions/transformiix/source/xslt/txXSLTPatterns.cpp ./extensions/transformiix/source/xslt/txXSLTPatterns.cpp +--- ../Orig/mozilla/extensions/transformiix/source/xslt/txXSLTPatterns.cpp 2005-01-16 06:30:39.000000000 +0900 ++++ ./extensions/transformiix/source/xslt/txXSLTPatterns.cpp 2005-12-04 19:44:15.000000000 +0900 +@@ -98,7 +98,7 @@ double txUnionPattern::getDefaultPriority() { NS_ASSERTION(0, "Don't call getDefaultPriority on txUnionPattern"); diff --git a/www/firefox/patches/patch-cn b/www/firefox/patches/patch-cn new file mode 100644 index 00000000000..d0834bda32e --- /dev/null +++ b/www/firefox/patches/patch-cn @@ -0,0 +1,86 @@ +$NetBSD: patch-cn,v 1.1 2005/12/10 13:47:22 taya Exp $ + +diff -ruN ../Orig/mozilla/extensions/transformiix/source/xpath/XFormsFunctionCall.cpp ./extensions/transformiix/source/xpath/XFormsFunctionCall.cpp +--- ../Orig/mozilla/extensions/transformiix/source/xpath/XFormsFunctionCall.cpp 2005-08-05 06:15:37.000000000 +0900 ++++ ./extensions/transformiix/source/xpath/XFormsFunctionCall.cpp 2005-12-04 21:35:33.000000000 +0900 +@@ -104,7 +104,7 @@ + res = (res/i); + } + else { +- res = Double::NaN; ++ res = Double::NaN(); + } + return aContext->recycler()->getNumberResult(res, aResult); + } +@@ -159,7 +159,7 @@ + NS_ENSURE_SUCCESS(rv, rv); + + PRInt32 result = 0; +- double res = Double::NaN; ++ double res = Double::NaN(); + nsresult rv = xformsService->GetDaysFromDateTime(date, &result); + if (NS_SUCCEEDED(rv)) { + res = result; +@@ -345,7 +345,7 @@ + getter_AddRefs(nodes)); + NS_ENSURE_SUCCESS(rv, rv); + +- double res = Double::NaN; ++ double res = Double::NaN(); + PRInt32 i; + for (i = 0; i < nodes->size(); ++i) { + double test; +@@ -353,7 +353,7 @@ + txXPathNodeUtils::appendNodeValue(nodes->get(i), resultStr); + test = Double::toDouble(resultStr); + if (Double::isNaN(test)) { +- res = Double::NaN; ++ res = Double::NaN(); + break; + } + if (test > res || i == 0) { +@@ -373,7 +373,7 @@ + getter_AddRefs(nodes)); + NS_ENSURE_SUCCESS(rv, rv); + +- double res = Double::NaN; ++ double res = Double::NaN(); + PRInt32 i; + for (i = 0; i < nodes->size(); ++i) { + double test; +@@ -381,7 +381,7 @@ + txXPathNodeUtils::appendNodeValue(nodes->get(i), resultStr); + test = Double::toDouble(resultStr); + if (Double::isNaN(test)) { +- res = Double::NaN; ++ res = Double::NaN(); + break; + } + if ((test < res) || (i==0)) { +@@ -404,7 +404,7 @@ + NS_ENSURE_SUCCESS(rv, rv); + + PRInt32 result = 0; +- double res = Double::NaN; ++ double res = Double::NaN(); + nsresult rv = xformsService->GetMonths(duration, &result); + if (NS_SUCCEEDED(rv)) { + res = result; +@@ -480,7 +480,7 @@ + // up the chain + return rv; + } +- res = Double::NaN; ++ res = Double::NaN(); + } + + return aContext->recycler()->getNumberResult(res, aResult); +@@ -505,7 +505,7 @@ + // up the chain + return rv; + } +- res = Double::NaN; ++ res = Double::NaN(); + } + + return aContext->recycler()->getNumberResult(res, aResult); diff --git a/www/firefox/patches/patch-db b/www/firefox/patches/patch-db index 1dae0b3acef..3db56098bbc 100644 --- a/www/firefox/patches/patch-db +++ b/www/firefox/patches/patch-db @@ -1,7 +1,8 @@ -$NetBSD: patch-db,v 1.1 2005/10/12 16:39:25 joerg Exp $ +$NetBSD: patch-db,v 1.2 2005/12/10 13:47:22 taya Exp $ ---- gc/boehm/gcconfig.h.orig 2004-11-17 10:31:05.000000000 +0100 -+++ gc/boehm/gcconfig.h 2004-11-17 10:31:15.000000000 +0100 +diff -ruN ../Orig/mozilla/gc/boehm/gcconfig.h ./gc/boehm/gcconfig.h +--- ../Orig/mozilla/gc/boehm/gcconfig.h 2000-08-11 09:13:36.000000000 +0900 ++++ ./gc/boehm/gcconfig.h 2005-12-04 19:44:25.000000000 +0900 @@ -183,7 +183,7 @@ # define OPENBSD # define mach_type_known diff --git a/www/firefox/patches/patch-dc b/www/firefox/patches/patch-dc index eaa2dbae6e4..df331dbbb0a 100644 --- a/www/firefox/patches/patch-dc +++ b/www/firefox/patches/patch-dc @@ -1,7 +1,8 @@ -$NetBSD: patch-dc,v 1.1 2005/10/12 16:39:25 joerg Exp $ +$NetBSD: patch-dc,v 1.2 2005/12/10 13:47:22 taya Exp $ ---- gc/boehm/mach_dep.c.orig 2004-11-17 10:30:03.000000000 +0100 -+++ gc/boehm/mach_dep.c 2004-11-17 10:30:50.000000000 +0100 +diff -ruN ../Orig/mozilla/gc/boehm/mach_dep.c ./gc/boehm/mach_dep.c +--- ../Orig/mozilla/gc/boehm/mach_dep.c 1999-09-30 11:25:45.000000000 +0900 ++++ ./gc/boehm/mach_dep.c 2005-12-04 19:44:28.000000000 +0900 @@ -206,7 +206,7 @@ && !defined(SCO) && !defined(SCO_ELF) \ && !(defined(LINUX) && defined(__ELF__)) \ diff --git a/www/firefox/patches/patch-dd b/www/firefox/patches/patch-dd index e4ba7358cd7..38004eb12b8 100644 --- a/www/firefox/patches/patch-dd +++ b/www/firefox/patches/patch-dd @@ -1,7 +1,8 @@ -$NetBSD: patch-dd,v 1.1 2005/10/12 16:39:25 joerg Exp $ +$NetBSD: patch-dd,v 1.2 2005/12/10 13:47:22 taya Exp $ ---- mailnews/movemail/src/movemail.c.orig 2004-11-17 10:29:29.000000000 +0100 -+++ mailnews/movemail/src/movemail.c 2004-11-17 10:29:43.000000000 +0100 +diff -ruN ../Orig/mozilla/mailnews/movemail/src/movemail.c ./mailnews/movemail/src/movemail.c +--- ../Orig/mozilla/mailnews/movemail/src/movemail.c 2004-04-18 03:33:14.000000000 +0900 ++++ ./mailnews/movemail/src/movemail.c 2005-12-04 19:44:32.000000000 +0900 @@ -52,7 +52,7 @@ #define LINUX_GLIBC_2 diff --git a/www/firefox/patches/patch-df b/www/firefox/patches/patch-df index ec1378115d7..ab716fa7c8e 100644 --- a/www/firefox/patches/patch-df +++ b/www/firefox/patches/patch-df @@ -1,8 +1,9 @@ -$NetBSD: patch-df,v 1.1 2005/10/12 16:39:25 joerg Exp $ +$NetBSD: patch-df,v 1.2 2005/12/10 13:47:22 taya Exp $ ---- nsprpub/pr/include/md/_freebsd.h.orig 2003-11-16 00:36:13.000000000 +0100 -+++ nsprpub/pr/include/md/_freebsd.h 2004-11-17 10:19:00.000000000 +0100 -@@ -72,7 +76,7 @@ +diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_freebsd.h ./nsprpub/pr/include/md/_freebsd.h +--- ../Orig/mozilla/nsprpub/pr/include/md/_freebsd.h 2004-11-24 06:22:35.000000000 +0900 ++++ ./nsprpub/pr/include/md/_freebsd.h 2005-12-04 19:44:37.000000000 +0900 +@@ -79,7 +79,7 @@ #define _PR_NO_LARGE_FILES #if defined(_PR_PTHREADS) @@ -11,7 +12,7 @@ $NetBSD: patch-df,v 1.1 2005/10/12 16:39:25 joerg Exp $ /* * libc_r before this version of FreeBSD doesn't have poll(). * Although libc has poll(), it is not thread-safe so we can't -@@ -81,7 +85,7 @@ +@@ -88,7 +88,7 @@ #define _PR_POLL_AVAILABLE #endif #else @@ -20,7 +21,7 @@ $NetBSD: patch-df,v 1.1 2005/10/12 16:39:25 joerg Exp $ #define _PR_POLL_AVAILABLE #define _PR_USE_POLL #endif -@@ -90,7 +94,7 @@ +@@ -97,7 +97,7 @@ #define _PR_HAVE_SYSV_SEMAPHORES #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY diff --git a/www/firefox/patches/patch-dh b/www/firefox/patches/patch-dh index 60774902429..3cadbe26368 100644 --- a/www/firefox/patches/patch-dh +++ b/www/firefox/patches/patch-dh @@ -1,7 +1,8 @@ -$NetBSD: patch-dh,v 1.1 2005/10/12 16:39:25 joerg Exp $ +$NetBSD: patch-dh,v 1.2 2005/12/10 13:47:22 taya Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig 2004-11-17 11:30:31.000000000 +0100 -+++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2004-11-17 11:30:50.000000000 +0100 +diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h ./xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h +--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2004-04-18 23:18:18.000000000 +0900 ++++ ./xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2005-12-04 19:44:41.000000000 +0900 @@ -77,6 +77,13 @@ #define THUNK_BASED_THIS_ADJUST #endif diff --git a/www/firefox/patches/patch-dj b/www/firefox/patches/patch-dj index 45358bbc705..883fbeb8003 100644 --- a/www/firefox/patches/patch-dj +++ b/www/firefox/patches/patch-dj @@ -1,7 +1,8 @@ -$NetBSD: patch-dj,v 1.1 2005/10/12 16:39:25 joerg Exp $ +$NetBSD: patch-dj,v 1.2 2005/12/10 13:47:22 taya Exp $ ---- dbm/src/mktemp.c.orig 2005-05-23 21:26:42.000000000 +0200 -+++ dbm/src/mktemp.c 2005-05-23 21:27:08.000000000 +0200 +diff -ruN ../Orig/mozilla/dbm/src/mktemp.c ./dbm/src/mktemp.c +--- ../Orig/mozilla/dbm/src/mktemp.c 2003-01-21 08:13:37.000000000 +0900 ++++ ./dbm/src/mktemp.c 2005-12-04 19:44:43.000000000 +0900 @@ -98,7 +98,7 @@ static int _gettemp(char *path, register int *doopen, int extraFlags) diff --git a/www/firefox/patches/patch-dk b/www/firefox/patches/patch-dk index 3a5be31ec05..0685dc302c7 100644 --- a/www/firefox/patches/patch-dk +++ b/www/firefox/patches/patch-dk @@ -1,8 +1,9 @@ -$NetBSD: patch-dk,v 1.1 2005/10/12 16:39:25 joerg Exp $ +$NetBSD: patch-dk,v 1.2 2005/12/10 13:47:22 taya Exp $ ---- security/coreconf/config.mk.orig 2005-05-24 01:20:38.000000000 +0200 -+++ security/coreconf/config.mk 2005-05-24 01:20:09.000000000 +0200 -@@ -59,7 +59,7 @@ +diff -ruN ../Orig/mozilla/security/coreconf/config.mk ./security/coreconf/config.mk +--- ../Orig/mozilla/security/coreconf/config.mk 2004-04-26 00:02:17.000000000 +0900 ++++ ./security/coreconf/config.mk 2005-12-04 19:44:47.000000000 +0900 +@@ -63,7 +63,7 @@ ####################################################################### TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \ diff --git a/www/firefox/patches/patch-dl b/www/firefox/patches/patch-dl index 5bc7ff098f8..3cc23e2fca0 100644 --- a/www/firefox/patches/patch-dl +++ b/www/firefox/patches/patch-dl @@ -1,7 +1,8 @@ -$NetBSD: patch-dl,v 1.1 2005/10/12 16:39:25 joerg Exp $ +$NetBSD: patch-dl,v 1.2 2005/12/10 13:47:22 taya Exp $ ---- /dev/null 2005-05-24 01:23:34.000000000 +0200 -+++ security/coreconf/DragonFly.mk 2005-05-24 01:23:34.000000000 +0200 +diff -ruN ../Orig/mozilla/security/coreconf/DragonFly.mk ./security/coreconf/DragonFly.mk +--- ../Orig/mozilla/security/coreconf/DragonFly.mk 1970-01-01 09:00:00.000000000 +0900 ++++ ./security/coreconf/DragonFly.mk 2005-12-04 19:44:48.000000000 +0900 @@ -0,0 +1,83 @@ +# +# The contents of this file are subject to the Mozilla Public diff --git a/www/firefox/patches/patch-dm b/www/firefox/patches/patch-dm index 8c3444430da..17714b5d77c 100644 --- a/www/firefox/patches/patch-dm +++ b/www/firefox/patches/patch-dm @@ -1,8 +1,9 @@ -$NetBSD: patch-dm,v 1.1 2005/10/12 16:39:25 joerg Exp $ +$NetBSD: patch-dm,v 1.2 2005/12/10 13:47:22 taya Exp $ ---- security/nss/cmd/platlibs.mk.orig 2005-05-24 14:48:31.000000000 +0200 -+++ security/nss/cmd/platlibs.mk 2005-05-24 14:48:38.000000000 +0200 -@@ -182,8 +182,8 @@ endif +diff -ruN ../Orig/mozilla/security/nss/cmd/platlibs.mk ./security/nss/cmd/platlibs.mk +--- ../Orig/mozilla/security/nss/cmd/platlibs.mk 2005-04-07 06:35:41.000000000 +0900 ++++ ./security/nss/cmd/platlibs.mk 2005-12-04 19:44:52.000000000 +0900 +@@ -186,8 +186,8 @@ # If GNU ld is used, we must use the -rpath-link option to tell # the linker where to find libsoftokn3.so, an implicit dependency # of libnss3.so. diff --git a/www/firefox/patches/patch-do b/www/firefox/patches/patch-do index ce52f010d38..2cc9352ab45 100644 --- a/www/firefox/patches/patch-do +++ b/www/firefox/patches/patch-do @@ -1,7 +1,8 @@ -$NetBSD: patch-do,v 1.1 2005/10/12 16:39:25 joerg Exp $ +$NetBSD: patch-do,v 1.2 2005/12/10 13:47:22 taya Exp $ ---- /dev/null 2005-05-24 23:07:26.000000000 +0200 -+++ directory/c-sdk/config/DragonFly.mk 2005-05-25 00:01:24.000000000 +0200 +diff -ruN ../Orig/mozilla/directory/c-sdk/config/DragonFly.mk ./directory/c-sdk/config/DragonFly.mk +--- ../Orig/mozilla/directory/c-sdk/config/DragonFly.mk 1970-01-01 09:00:00.000000000 +0900 ++++ ./directory/c-sdk/config/DragonFly.mk 2005-12-04 19:44:55.000000000 +0900 @@ -0,0 +1,82 @@ +# +# The contents of this file are subject to the Mozilla Public diff --git a/www/firefox/patches/patch-dp b/www/firefox/patches/patch-dp deleted file mode 100644 index 516468d98f9..00000000000 --- a/www/firefox/patches/patch-dp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dp,v 1.1 2005/10/12 16:39:25 joerg Exp $ - ---- other-licenses/libical/src/libical/Makefile.in.orig 2005-05-25 00:03:42.000000000 +0200 -+++ other-licenses/libical/src/libical/Makefile.in 2005-05-25 00:03:51.000000000 +0200 -@@ -179,7 +179,7 @@ - $(PERL) $(ICALSCRIPTS)/mkrestrictiontable.pl -i $(srcdir)/icalrestriction.c.in \ - $(DESIGNDATA)/restrictions.csv > icalrestriction.c - --ifneq (,$(filter BeOS Darwin OpenVMS NetBSD FreeBSD,$(OS_ARCH))) -+ifneq (,$(filter BeOS Darwin OpenVMS NetBSD FreeBSD DragonFly,$(OS_ARCH))) - DEFINES += -D__USE_BSD=1 - endif - diff --git a/www/firefox/patches/patch-dr b/www/firefox/patches/patch-dr index 851184af5e0..8ac5764c933 100644 --- a/www/firefox/patches/patch-dr +++ b/www/firefox/patches/patch-dr @@ -1,8 +1,9 @@ -$NetBSD: patch-dr,v 1.1 2005/10/12 16:39:25 joerg Exp $ +$NetBSD: patch-dr,v 1.2 2005/12/10 13:47:22 taya Exp $ ---- config/config.mk.orig 2005-05-25 00:07:14.000000000 +0200 -+++ config/config.mk 2005-05-25 00:07:26.000000000 +0200 -@@ -146,7 +146,7 @@ +diff -ruN ../Orig/mozilla/config/config.mk ./config/config.mk +--- ../Orig/mozilla/config/config.mk 2005-07-29 04:48:11.000000000 +0900 ++++ ./config/config.mk 2005-12-04 19:45:20.000000000 +0900 +@@ -121,7 +121,7 @@ # but save the version to allow multiple versions of the same base # platform to be built in the same tree. # diff --git a/www/firefox/patches/patch-ds b/www/firefox/patches/patch-ds index d4a469b5e0d..7c45dc8d4c0 100644 --- a/www/firefox/patches/patch-ds +++ b/www/firefox/patches/patch-ds @@ -1,8 +1,9 @@ -$NetBSD: patch-ds,v 1.1 2005/10/12 16:39:25 joerg Exp $ +$NetBSD: patch-ds,v 1.2 2005/12/10 13:47:22 taya Exp $ ---- security/coreconf/arch.mk.orig 2005-06-03 20:57:46.000000000 +0200 -+++ security/coreconf/arch.mk -@@ -141,7 +141,7 @@ endif +diff -ruN ../Orig/mozilla/security/coreconf/arch.mk ./security/coreconf/arch.mk +--- ../Orig/mozilla/security/coreconf/arch.mk 2005-10-11 08:30:12.000000000 +0900 ++++ ./security/coreconf/arch.mk 2005-12-04 19:45:28.000000000 +0900 +@@ -145,7 +145,7 @@ # IRIX 6.5-ALPHA-1289139620. # diff --git a/www/firefox/patches/patch-dt b/www/firefox/patches/patch-dt index e08e1fe2fdf..1caa16ebaed 100644 --- a/www/firefox/patches/patch-dt +++ b/www/firefox/patches/patch-dt @@ -1,8 +1,9 @@ -$NetBSD: patch-dt,v 1.1 2005/10/12 16:39:25 joerg Exp $ +$NetBSD: patch-dt,v 1.2 2005/12/10 13:47:22 taya Exp $ ---- directory/c-sdk/config/arch.mk.orig 2005-06-03 20:59:03.000000000 +0200 -+++ directory/c-sdk/config/arch.mk -@@ -138,7 +138,7 @@ endif +diff -ruN ../Orig/mozilla/directory/c-sdk/config/arch.mk ./directory/c-sdk/config/arch.mk +--- ../Orig/mozilla/directory/c-sdk/config/arch.mk 2002-03-27 06:51:57.000000000 +0900 ++++ ./directory/c-sdk/config/arch.mk 2005-12-04 19:45:29.000000000 +0900 +@@ -138,7 +138,7 @@ # Handle FreeBSD 2.2-STABLE and Linux 2.0.30-osfmach3 # diff --git a/www/firefox/patches/patch-du b/www/firefox/patches/patch-du index c5e3b876383..b36a107e0d5 100644 --- a/www/firefox/patches/patch-du +++ b/www/firefox/patches/patch-du @@ -1,8 +1,9 @@ -$NetBSD: patch-du,v 1.1 2005/10/12 16:39:25 joerg Exp $ +$NetBSD: patch-du,v 1.2 2005/12/10 13:47:22 taya Exp $ ---- config/rules.mk.orig 2005-06-03 21:08:53.000000000 +0200 -+++ config/rules.mk -@@ -444,6 +444,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic +diff -ruN ../Orig/mozilla/config/rules.mk ./config/rules.mk +--- ../Orig/mozilla/config/rules.mk 2005-10-11 08:16:39.000000000 +0900 ++++ ./config/rules.mk 2005-12-04 19:45:31.000000000 +0900 +@@ -447,6 +447,12 @@ endif endif diff --git a/www/firefox/patches/patch-dv b/www/firefox/patches/patch-dv index f8d8fee4bec..41ebac2bbe5 100644 --- a/www/firefox/patches/patch-dv +++ b/www/firefox/patches/patch-dv @@ -1,8 +1,9 @@ -$NetBSD: patch-dv,v 1.1 2005/10/12 16:39:25 joerg Exp $ +$NetBSD: patch-dv,v 1.2 2005/12/10 13:47:22 taya Exp $ ---- js/src/Makefile.in.orig 2005-06-03 21:11:22.000000000 +0200 -+++ js/src/Makefile.in -@@ -250,6 +250,9 @@ endif # WINNT +diff -ruN ../Orig/mozilla/js/src/Makefile.in ./js/src/Makefile.in +--- ../Orig/mozilla/js/src/Makefile.in 2005-06-01 23:26:26.000000000 +0900 ++++ ./js/src/Makefile.in 2005-12-04 19:45:33.000000000 +0900 +@@ -256,6 +256,9 @@ ifeq ($(OS_ARCH),FreeBSD) LDFLAGS += -pthread endif |