diff options
Diffstat (limited to 'www/mozilla-stable/patches')
33 files changed, 0 insertions, 1876 deletions
diff --git a/www/mozilla-stable/patches/patch-aa b/www/mozilla-stable/patches/patch-aa deleted file mode 100644 index 21538dc5b6a..00000000000 --- a/www/mozilla-stable/patches/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2004/12/04 03:50:40 taya Exp $ - -diff -ru ../Orig/mozilla/config/autoconf.mk.in ./config/autoconf.mk.in ---- ../Orig/mozilla/config/autoconf.mk.in 2004-03-21 11:31:17.000000000 +0900 -+++ ./config/autoconf.mk.in 2004-06-10 22:55:06.000000000 +0900 -@@ -31,13 +31,13 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/$(MOZILLA_PKG_NAME) - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ --idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+idldir = @datadir@/idl/$(MOZILLA_PKG_NAME) - --mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+mozappdir = $(libdir)/$(MOZILLA_PKG_NAME) - mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) - mrelibdir = $(mredir)/lib - diff --git a/www/mozilla-stable/patches/patch-ab b/www/mozilla-stable/patches/patch-ab deleted file mode 100644 index 85983fe6ffd..00000000000 --- a/www/mozilla-stable/patches/patch-ab +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2004/12/04 03:50:40 taya Exp $ - ---- configure.in.orig Thu May 13 17:57:46 2004 -+++ configure.in -@@ -996,7 +996,6 @@ case "$target" in - powerpc*) - _PLATFORM_DEFAULT_TOOLKIT='mac' - DSO_LDOPTS="$DSO_LDOPTS -arch ppc" -- MOZ_ENABLE_POSTSCRIPT= - # set MACOSX to generate lib/mac/MoreFiles/Makefile - MACOSX=1 - ;; -@@ -1017,6 +1016,9 @@ case "$target" in - # MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive' - # MKSHLIB_UNFORCE_ALL='' - # fi -+ if test "$LIBRUNPATH"; then -+ DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" -+ fi - ;; - - *-hpux*) -@@ -1308,6 +1310,13 @@ case "$target" in - if test "$LIBRUNPATH"; then - DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" - fi -+ -+ case "${target_cpu}" in -+ alpha*) -+ CFLAGS="$CFLAGS -mieee" -+ CXXFLAGS="$CXXFLAGS -mieee" -+ ;; -+ esac - ;; - - *-nto*) -@@ -1531,7 +1540,7 @@ dnl the qsort routine under solaris is f - MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@' - MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract' - MKSHLIB_UNFORCE_ALL='' -- DSO_LDOPTS='-G -Qoption ld -z,muldefs -h $@' -+ DSO_LDOPTS='-G -z muldefs -h $@' - AR_LIST="$AR t" - AR_EXTRACT="$AR x" - AR_DELETE="$AR d" diff --git a/www/mozilla-stable/patches/patch-ac b/www/mozilla-stable/patches/patch-ac deleted file mode 100644 index d08bfe568db..00000000000 --- a/www/mozilla-stable/patches/patch-ac +++ /dev/null @@ -1,54 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2004/12/04 03:50:40 taya Exp $ - ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2004-04-22 22:50:05.000000000 +0200 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in -@@ -49,6 +49,9 @@ ifneq (,$(filter FreeBSD NetBSD OpenBSD - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (amd64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_unixish_amd64.cpp xptcstubs_unixish_amd64.cpp -+endif - endif - # - # New code for Linux, et. al., with gcc -@@ -140,7 +143,7 @@ endif - # NetBSD/ARM - # - ifeq ($(OS_ARCH),NetBSD) --ifneq (,$(filter arm% sa110,$(OS_TEST))) -+ifneq (,$(filter arm%,$(TARGET_CPU))) - CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp - endif - endif -@@ -174,7 +177,7 @@ endif - # NetBSD/m68k - # - ifeq ($(OS_ARCH),NetBSD) --ifneq (,$(filter amiga atari hp300 mac68k mvme68k next68k sun3 sun3x x68k,$(OS_TEST))) -+ifneq (,$(filter m68k,$(TARGET_CPU))) - CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp - endif - endif -@@ -257,6 +260,7 @@ endif - 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 -+AS := $(CC) -c -x assembler-with-cpp - endif - - # -@@ -305,6 +309,13 @@ ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) - CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s - endif -+# -+# NetBSD/SPARC64 -+# -+ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc64) -+CPPSRCS := xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s -+endif - # - # Solaris/SPARC - # diff --git a/www/mozilla-stable/patches/patch-ad b/www/mozilla-stable/patches/patch-ad deleted file mode 100644 index 2c334c38c63..00000000000 --- a/www/mozilla-stable/patches/patch-ad +++ /dev/null @@ -1,76 +0,0 @@ -$NetBSD: patch-ad,v 1.4 2004/12/04 03:50:40 taya Exp $ - -diff -ru ../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 2001-09-29 05:12:51.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp 2004-06-10 22:55:53.000000000 +0900 -@@ -132,6 +132,15 @@ - } - } - -+/* -+ * SYMBOL PREFIX must be "_" for aout symbols and "" for ELF -+ */ -+#ifndef __ELF__ -+#define SYMBOLPREFIX "_" -+#else -+#define SYMBOLPREFIX -+#endif -+ - XPTC_PUBLIC_API(nsresult) - XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, - PRUint32 paramCount, nsXPTCVariant* params) -@@ -139,30 +148,30 @@ - PRUint32 result; - - __asm__ __volatile__( -- "movl %4, sp@-\n\t" -- "movl %3, sp@-\n\t" -- "jbsr _invoke_count_words\n\t" /* count words */ -- "addql #8, sp\n\t" -- "lsll #2, d0\n\t" /* *= 4 */ -- "movl sp, a2\n\t" /* save original sp */ -- "subl d0, sp\n\t" /* make room for params */ -- "movl sp, a0\n\t" -- "movl %4, sp@-\n\t" -- "movl %3, sp@-\n\t" -- "movl a0, sp@-\n\t" -- "jbsr _invoke_copy_to_stack\n\t" /* copy params */ -- "addl #12, sp\n\t" -- "movl %1, a0\n\t" -- "movl a0@, a1\n\t" -- "movl %2, d0\n\t" /* function index */ -- "movl a0, d1\n\t" -- "movw a1@(8,d0:l:8), a0\n\t" -- "addl a0, d1\n\t" -- "movl a1@(12,d0:l:8), a1\n\t" -- "movl d1, sp@-\n\t" -- "jbsr a1@\n\t" -- "movl a2, sp\n\t" /* restore original sp */ -- "movl d0, %0\n\t" -+ "movl %4, %%sp@-\n\t" -+ "movl %3, %%sp@-\n\t" -+ "jbsr "SYMBOLPREFIX"invoke_count_words\n\t" /* count words */ -+ "addql #8, %%sp\n\t" -+ "lsll #2, %%d0\n\t" /* *= 4 */ -+ "movl %%sp, %%a2\n\t" /* save original sp */ -+ "subl %%d0, %%sp\n\t" /* make room for params */ -+ "movl %%sp, %%a0\n\t" -+ "movl %4, %%sp@-\n\t" -+ "movl %3, %%sp@-\n\t" -+ "movl %%a0, %%sp@-\n\t" -+ "jbsr "SYMBOLPREFIX"invoke_copy_to_stack\n\t" /* copy params */ -+ "addl #12, %%sp\n\t" -+ "movl %1, %%a0\n\t" -+ "movl %%a0@, %%a1\n\t" -+ "movl %2, %%d0\n\t" /* function index */ -+ "movl %%a0, %%d1\n\t" -+ "movw %%a1@(8,%%d0:l:8), %%a0\n\t" -+ "addl %%a0, %%d1\n\t" -+ "movl %%a1@(12,%%d0:l:8), %%a1\n\t" -+ "movl %%d1, %%sp@-\n\t" -+ "jbsr %%a1@\n\t" -+ "movl %%a2, %%sp\n\t" /* restore original sp */ -+ "movl %%d0, %0\n\t" - : "=g" (result) /* %0 */ - : "g" (that), /* %1 */ - "g" (methodIndex), /* %2 */ diff --git a/www/mozilla-stable/patches/patch-ae b/www/mozilla-stable/patches/patch-ae deleted file mode 100644 index 5a071daa107..00000000000 --- a/www/mozilla-stable/patches/patch-ae +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-ae,v 1.4 2004/12/04 03:50:40 taya Exp $ - -diff -ru ../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 2001-09-29 05:12:52.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp 2004-06-10 22:55:55.000000000 +0900 -@@ -123,17 +123,27 @@ - } - } - -+/* -+ * Beware: use % instead of %% for register identifiers in a preprocessor macro -+ * SYMBOL PREFIX must be "_" for aout and "" for ELF -+ */ -+#ifndef __ELF__ -+#define SYMBOLPREFIX "_" -+#else -+#define SYMBOLPREFIX -+#endif -+ - #define STUB_ENTRY(n) \ - __asm__( \ -- ".global _Stub"#n"__14nsXPTCStubBase\n\t" \ --"_Stub"#n"__14nsXPTCStubBase:\n\t" \ -- "link a6,#0 \n\t" \ -- "lea a6@(12), a0 \n\t" /* pointer to args */ \ -- "movl a0, sp@- \n\t" \ -- "movl #"#n", sp@- \n\t" /* method index */ \ -- "movl a6@(8), sp@- \n\t" /* this */ \ -- "jbsr _PrepareAndDispatch \n\t" \ -- "unlk a6 \n\t" \ -+ ".global "SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase\n\t" \ -+SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase:\n\t" \ -+ "link %a6,#0 \n\t" \ -+ "lea %a6@(12), %a0 \n\t" /* pointer to args */ \ -+ "movl %a0, %sp@- \n\t" \ -+ "movl #"#n", %sp@- \n\t" /* method index */ \ -+ "movl %a6@(8), %sp@- \n\t" /* this */ \ -+ "jbsr "SYMBOLPREFIX"PrepareAndDispatch\n\t" \ -+ "unlk %a6 \n\t" \ - "rts \n\t" \ - ); - diff --git a/www/mozilla-stable/patches/patch-af b/www/mozilla-stable/patches/patch-af deleted file mode 100644 index 494565561f9..00000000000 --- a/www/mozilla-stable/patches/patch-af +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-af,v 1.2 2004/12/04 03:50:40 taya Exp $ - -diff -ru ../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 2003-05-31 08:31:19.000000000 +0900 -+++ ./security/nss/lib/freebl/unix_rand.c 2004-06-10 22:55:57.000000000 +0900 -@@ -32,6 +32,7 @@ - */ - - #include <stdio.h> -+#include <fcntl.h> - #include <string.h> - #include <signal.h> - #include <unistd.h> -@@ -691,7 +692,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); -- close(0); -+ fd = open("/dev/null", O_RDONLY); -+ if (fd != 0) { -+ dup2(fd, 0); -+ close(fd); -+ } - for (fd = getdtablesize(); --fd > 2; close(fd)) - ; - diff --git a/www/mozilla-stable/patches/patch-ag b/www/mozilla-stable/patches/patch-ag deleted file mode 100644 index 2a169fa4843..00000000000 --- a/www/mozilla-stable/patches/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2004/12/04 03:50:40 taya Exp $ - -diff -ru ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h ./extensions/transformiix/source/base/ErrorObserver.h ---- ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h 2003-01-17 21:39:36.000000000 +0900 -+++ ./extensions/transformiix/source/base/ErrorObserver.h 2004-06-10 22:56:01.000000000 +0900 -@@ -28,7 +28,8 @@ - - #include "baseutils.h" - #include "txError.h" --#include <iostream.h> -+#include <iostream> -+using namespace std; - class nsAString; - - /** diff --git a/www/mozilla-stable/patches/patch-ah b/www/mozilla-stable/patches/patch-ah deleted file mode 100644 index 8e380e49d1e..00000000000 --- a/www/mozilla-stable/patches/patch-ah +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-ah,v 1.3 2005/01/04 11:03:01 taya Exp $ - -diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl ---- ../Orig/mozilla/gfx/idl/nsIFreeType2.idl 2004-04-16 10:09:33.000000000 +0900 -+++ ./gfx/idl/nsIFreeType2.idl 2004-06-11 00:32:42.000000000 +0900 -@@ -76,10 +76,11 @@ - native FT_Sfnt_Tag(FT_Sfnt_Tag); - native FT_Size(FT_Size); - --[ptr] native FTC_Image_Desc_p(FTC_Image_Desc); -+[ptr] native FTC_ImageType_p(FTC_ImageType); - native FTC_Face_Requester(FTC_Face_Requester); - native FTC_Font(FTC_Font); --native FTC_Image_Cache(FTC_Image_Cache); -+native FTC_FaceID(FTC_FaceID); -+native FTC_ImageCache(FTC_ImageCache); - native FTC_Manager(FTC_Manager); - - // #ifdef MOZ_SVG -@@ -99,7 +100,7 @@ - - readonly attribute FT_Library library; - readonly attribute FTC_Manager FTCacheManager; -- readonly attribute FTC_Image_Cache ImageCache; -+ readonly attribute FTC_ImageCache ImageCache; - - void doneFace(in FT_Face face); - void doneFreeType(in FT_Library lib); -@@ -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); -- void imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc, -+ void imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc, - in FT_UInt gindex, out FT_Glyph glyph); -- void managerLookupSize(in FTC_Manager manager, in FTC_Font font, -- out FT_Face face, out FT_Size size); -+ void managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id, -+ out FT_Face face); - void managerDone(in FTC_Manager manager); - void managerNew(in FT_Library lib, in FT_UInt max_faces, - in FT_UInt max_sizes, in FT_ULong max_bytes, - in FTC_Face_Requester requester, in FT_Pointer req_data, - out FTC_Manager manager); -- void imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache); -+ void imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache); - /* #ifdef MOZ_SVG */ - void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix, - in FT_Vector_p delta); diff --git a/www/mozilla-stable/patches/patch-ai b/www/mozilla-stable/patches/patch-ai deleted file mode 100644 index 3efd7304c3f..00000000000 --- a/www/mozilla-stable/patches/patch-ai +++ /dev/null @@ -1,63 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2004/12/04 03:50:40 taya Exp $ - -diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetricsPS.cpp ---- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp 2004-02-05 10:57:05.000000000 +0900 -+++ ./gfx/src/ps/nsFontMetricsPS.cpp 2004-06-10 23:00:08.000000000 +0900 -@@ -1141,10 +1141,10 @@ - - mPixelSize = NSToIntRound(app2dev * mFont->size); - -- mImageDesc.font.face_id = (void*)mEntry; -- mImageDesc.font.pix_width = mPixelSize; -- mImageDesc.font.pix_height = mPixelSize; -- mImageDesc.image_type = 0; -+ mImageDesc->face_id = (FTC_FaceID)&mEntry; -+ mImageDesc->width = mPixelSize; -+ mImageDesc->height = mPixelSize; -+ mImageDesc->flags = 0; - - nsresult rv; - mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv); -@@ -1190,7 +1190,7 @@ - if (!face) - return 0; - -- FTC_Image_Cache iCache; -+ FTC_ImageCache iCache; - nsresult rv = mFt2->GetImageCache(&iCache); - if (NS_FAILED(rv)) { - NS_ERROR("Failed to get Image Cache"); -@@ -1228,8 +1228,8 @@ - - FTC_Manager cManager; - mFt2->GetFTCacheManager(&cManager); -- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font, -- &face, nsnull); -+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id, -+ &face); - NS_ASSERTION(rv==0, "failed to get face/size"); - if (rv) - return nsnull; -@@ -1622,16 +1622,16 @@ - mEntry->GetFamilyName(fontName); - mEntry->GetStyleName(styleName); - -- mImageDesc.font.face_id = (void*)mEntry; -+ mImageDesc->face_id = (FTC_FaceID)&mEntry; - // TT glyph has no relation to size -- mImageDesc.font.pix_width = 16; -- mImageDesc.font.pix_height = 16; -- mImageDesc.image_type = 0; -+ mImageDesc->width = 16; -+ mImageDesc->height = 16; -+ mImageDesc->flags = 0; - FT_Face face = nsnull; - FTC_Manager cManager; - mFt2->GetFTCacheManager(&cManager); -- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font, -- &face, nsnull); -+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id, -+ &face); - if (NS_FAILED(rv)) - return; - diff --git a/www/mozilla-stable/patches/patch-aj b/www/mozilla-stable/patches/patch-aj deleted file mode 100644 index 387397c237e..00000000000 --- a/www/mozilla-stable/patches/patch-aj +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2004/12/04 03:50:40 taya Exp $ - -diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.h ./gfx/src/freetype/nsFreeType.h ---- ../Orig/mozilla/gfx/src/freetype/nsFreeType.h 2004-04-17 06:31:42.000000000 +0900 -+++ ./gfx/src/freetype/nsFreeType.h 2004-06-10 23:03:07.000000000 +0900 -@@ -104,13 +104,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) -- (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*); --typedef FT_Error (*FTC_Manager_Lookup_Size_t) -- (FTC_Manager, FTC_Font, FT_Face*, FT_Size*); -+ (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*); -+typedef FT_Error (*FTC_Manager_LookupFace_t) -+ (FTC_Manager, FTC_FaceID, FT_Face*); - typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager); - typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong, - FTC_Face_Requester, FT_Pointer, FTC_Manager*); --typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*); -+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*); - // #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 @@ - FT_Outline_Decompose_t nsFT_Outline_Decompose; - FT_Set_Charmap_t nsFT_Set_Charmap; - FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup; -- FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size; -+ FTC_Manager_LookupFace_t nsFTC_Manager_LookupFace; - 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 @@ - PRLibrary *mSharedLib; - FT_Library mFreeTypeLibrary; - FTC_Manager mFTCacheManager; -- FTC_Image_Cache mImageCache; -+ FTC_ImageCache mImageCache; - - static nsHashtable *sFontFamilies; - static nsHashtable *sRange1CharSetNames; diff --git a/www/mozilla-stable/patches/patch-ak b/www/mozilla-stable/patches/patch-ak deleted file mode 100644 index 4cb3f9ee305..00000000000 --- a/www/mozilla-stable/patches/patch-ak +++ /dev/null @@ -1,62 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2004/12/04 03:50:40 taya Exp $ - -diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFreeType.cpp ---- ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp 2004-02-08 00:22:30.000000000 +0900 -+++ ./gfx/src/freetype/nsFreeType.cpp 2004-06-10 23:05:42.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}, -- {"FTC_Image_Cache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE}, -- {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE}, -+ {"FTC_ImageCache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE}, -+ {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE}, - {"FTC_Manager_Done", NS_FT2_OFFSET(nsFTC_Manager_Done), PR_TRUE}, - {"FTC_Manager_New", NS_FT2_OFFSET(nsFTC_Manager_New), PR_TRUE}, -- {"FTC_Image_Cache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE}, -+ {"FTC_ImageCache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE}, - // #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 @@ - } - - NS_IMETHODIMP --nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc, -+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc, - FT_UInt glyphID, FT_Glyph *glyph) - { - // call the FreeType2 function via the function pointer -@@ -291,11 +291,11 @@ - } - - NS_IMETHODIMP --nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font, -- FT_Face *face, FT_Size *size) -+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id, -+ FT_Face *face) - { - // call the FreeType2 function via the function pointer -- FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size); -+ FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face); - return error ? NS_ERROR_FAILURE : NS_OK; - } - -@@ -320,7 +320,7 @@ - } - - NS_IMETHODIMP --nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache) -+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache) - { - // call the FreeType2 function via the function pointer - FT_Error error = nsFTC_Image_Cache_New(manager, cache); -@@ -389,7 +389,7 @@ - } - - NS_IMETHODIMP --nsFreeType2::GetImageCache(FTC_Image_Cache *aCache) -+nsFreeType2::GetImageCache(FTC_ImageCache *aCache) - { - *aCache = mImageCache; - return NS_OK; diff --git a/www/mozilla-stable/patches/patch-al b/www/mozilla-stable/patches/patch-al deleted file mode 100644 index 93a30018e31..00000000000 --- a/www/mozilla-stable/patches/patch-al +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-al,v 1.2 2004/12/04 03:50:40 taya Exp $ - -diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h ./gfx/src/ps/nsFontMetricsPS.h ---- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h 2003-04-23 01:25:09.000000000 +0900 -+++ ./gfx/src/ps/nsFontMetricsPS.h 2004-06-10 23:06:23.000000000 +0900 -@@ -320,7 +320,7 @@ - nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID; - nsCOMPtr<nsIFreeType2> mFt2; - PRUint16 mPixelSize; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - - - static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont, -@@ -363,7 +363,7 @@ - protected: - nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry; - nsCOMPtr<nsIFreeType2> mFt2; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - }; - #endif - diff --git a/www/mozilla-stable/patches/patch-an b/www/mozilla-stable/patches/patch-an deleted file mode 100644 index e673e52af7e..00000000000 --- a/www/mozilla-stable/patches/patch-an +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-an,v 1.2 2004/12/04 03:50:40 taya Exp $ - -diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h ./gfx/src/x11shared/nsFontFreeType.h ---- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h 2003-04-23 01:25:13.000000000 +0900 -+++ ./gfx/src/x11shared/nsFontFreeType.h 2004-06-10 23:06:35.000000000 +0900 -@@ -110,7 +110,7 @@ - XImage *GetXImage(PRUint32 width, PRUint32 height); - nsITrueTypeFontCatalogEntry *mFaceID; - PRUint16 mPixelSize; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - nsCOMPtr<nsIFreeType2> mFt2; - }; - diff --git a/www/mozilla-stable/patches/patch-ao b/www/mozilla-stable/patches/patch-ao deleted file mode 100644 index a27372cbf7c..00000000000 --- a/www/mozilla-stable/patches/patch-ao +++ /dev/null @@ -1,76 +0,0 @@ -$NetBSD: patch-ao,v 1.2 2004/12/04 03:50:40 taya Exp $ - -diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11shared/nsFontFreeType.cpp ---- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp 2003-12-25 17:24:52.000000000 +0900 -+++ ./gfx/src/x11shared/nsFontFreeType.cpp 2004-06-10 23:06:38.000000000 +0900 -@@ -177,7 +177,7 @@ - FTC_Manager mgr; - nsresult rv; - mFt2->GetFTCacheManager(&mgr); -- rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull); -+ rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face); - NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size"); - if (NS_FAILED(rv)) - return nsnull; -@@ -191,22 +191,15 @@ - PRBool embedded_bimap = PR_FALSE; - mFaceID = aFaceID; - mPixelSize = aPixelSize; -- mImageDesc.font.face_id = (void*)mFaceID; -- mImageDesc.font.pix_width = aPixelSize; -- mImageDesc.font.pix_height = aPixelSize; -- mImageDesc.image_type = 0; -+ mImageDesc->face_id = (FTC_FaceID)&mFaceID; -+ mImageDesc->width = aPixelSize; -+ mImageDesc->height = aPixelSize; -+ mImageDesc->flags = 0; - - if (aPixelSize < nsFreeType2::gAntiAliasMinimum) { -- mImageDesc.image_type |= ftc_image_mono; - anti_alias = PR_FALSE; - } - -- if (nsFreeType2::gFreeType2Autohinted) -- mImageDesc.image_type |= ftc_image_flag_autohinted; -- -- if (nsFreeType2::gFreeType2Unhinted) -- mImageDesc.image_type |= ftc_image_flag_unhinted; -- - PRUint32 num_embedded_bitmaps, i; - PRInt32* embedded_bitmapheights; - mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps, -@@ -218,7 +211,6 @@ - if (embedded_bitmapheights[i] == aPixelSize) { - embedded_bimap = PR_TRUE; - // unhinted must be set for embedded bitmaps to be used -- mImageDesc.image_type |= ftc_image_flag_unhinted; - break; - } - } -@@ -312,7 +304,7 @@ - if (!face) - return NS_ERROR_FAILURE; - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return NS_ERROR_FAILURE; -@@ -401,7 +393,7 @@ - if (!face) - return 0; - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return 0; -@@ -723,7 +715,7 @@ - if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2); - #endif - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return 0; diff --git a/www/mozilla-stable/patches/patch-aw b/www/mozilla-stable/patches/patch-aw deleted file mode 100644 index f7ac54e6245..00000000000 --- a/www/mozilla-stable/patches/patch-aw +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aw,v 1.4 2004/12/04 03:50:40 taya Exp $ - -diff -ru ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in ./widget/src/gtksuperwin/Makefile.in ---- ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in 2004-01-07 22:36:54.000000000 +0900 -+++ ./widget/src/gtksuperwin/Makefile.in 2004-06-10 23:06:44.000000000 +0900 -@@ -25,6 +25,7 @@ - MODULE = widget - LIBRARY_NAME = gtksuperwin - EXPORT_LIBRARY = 1 -+MKSHLIB = $(MKCSHLIB) - - PACKAGE_FILE = gtksuperwin.pkg - diff --git a/www/mozilla-stable/patches/patch-ax b/www/mozilla-stable/patches/patch-ax deleted file mode 100644 index f165c90a920..00000000000 --- a/www/mozilla-stable/patches/patch-ax +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ax,v 1.1 2004/12/04 03:50:40 taya Exp $ - -diff -ru ../Orig/mozilla/security/coreconf/SunOS5.mk ./security/coreconf/SunOS5.mk ---- ../Orig/mozilla/security/coreconf/SunOS5.mk 2003-05-16 04:12:10.000000000 +0900 -+++ ./security/coreconf/SunOS5.mk 2004-06-10 23:06:47.000000000 +0900 -@@ -165,6 +165,10 @@ - DSO_LDOPTS += -G -h $(notdir $@) - endif - -+ifdef LIBRUNPATH -+DSO_LDOPTS += -R$(LIBRUNPATH) -+endif -+ - # -KPIC generates position independent code for use in shared libraries. - # (Similarly for -fPIC in case of gcc.) - ifdef NS_USE_GCC diff --git a/www/mozilla-stable/patches/patch-ba b/www/mozilla-stable/patches/patch-ba deleted file mode 100644 index 266681bd178..00000000000 --- a/www/mozilla-stable/patches/patch-ba +++ /dev/null @@ -1,126 +0,0 @@ -$NetBSD: patch-ba,v 1.4 2004/12/04 03:50:40 taya Exp $ - -diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg ---- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg 2000-12-02 06:29:17.000000000 +0900 -+++ ./nsprpub/pr/include/md/_netbsd.cfg 2004-06-10 23:06:59.000000000 +0900 -@@ -45,7 +45,8 @@ - - #define PR_AF_INET6 24 /* same as AF_INET6 */ - --#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__) -+#if defined(__i386__) || defined(__arm32__) || defined(__ARMEL__) || \ -+ defined(__MIPSEL__) - - #define IS_LITTLE_ENDIAN 1 - #undef IS_BIG_ENDIAN -@@ -91,7 +92,53 @@ - #define PR_ALIGN_OF_DOUBLE 4 - #define PR_ALIGN_OF_POINTER 4 - --#elif defined(__sparc__) || defined(__MIPSEB__) -+#elif defined(__sparc_v9__) -+ -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+#define HAVE_LONG_LONG -+#define HAVE_ALIGNED_DOUBLES -+#define HAVE_ALIGNED_LONGLONGS -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 8 -+ -+#elif defined(__sparc__) || defined(__MIPSEB__) || defined(__ARMEB__) - - #undef IS_LITTLE_ENDIAN - #define IS_BIG_ENDIAN 1 -@@ -184,6 +231,55 @@ - #define PR_BYTES_PER_WORD_LOG2 3 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#elif defined(__amd64__) -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 8 -+#define PR_ALIGN_OF_WORD 8 -+ -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#define HAVE_LONG_LONG -+#define HAVE_ALIGNED_DOUBLES -+#define HAVE_ALIGNED_LONGLONGS -+ - #elif defined(__powerpc__) || defined(__m68k__) - - #undef IS_LITTLE_ENDIAN diff --git a/www/mozilla-stable/patches/patch-bb b/www/mozilla-stable/patches/patch-bb deleted file mode 100644 index 1c15dff6869..00000000000 --- a/www/mozilla-stable/patches/patch-bb +++ /dev/null @@ -1,73 +0,0 @@ -$NetBSD: patch-bb,v 1.6 2004/12/25 15:39:43 taya Exp $ - -diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md/_netbsd.h ---- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h 2003-09-12 02:24:53.000000000 +0900 -+++ ./nsprpub/pr/include/md/_netbsd.h 2004-06-10 23:07:02.000000000 +0900 -@@ -44,16 +44,26 @@ - #define _PR_SI_ARCHITECTURE "x86" - #elif defined(__alpha__) - #define _PR_SI_ARCHITECTURE "alpha" -+#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(__ARMEB__) -+#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 - #endif - -+#if __NetBSD_Version__ >= 106370000 -+/* NetBSD 1.6ZK */ -+#define _PR_HAVE_GETPROTO_R -+#define _PR_HAVE_GETPROTO_R_INT -+#endif -+ - #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/mozilla-stable/patches/patch-bm b/www/mozilla-stable/patches/patch-bm deleted file mode 100644 index dbe7c1bbb9e..00000000000 --- a/www/mozilla-stable/patches/patch-bm +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-bm,v 1.3 2004/12/04 03:50:40 taya Exp $ - -diff -ru ../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 2001-09-29 05:12:52.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp 2004-06-10 23:07:04.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. - */ -+#ifndef __ELF__ -+#define SYMBOLPREFIX "_" -+#else -+#define SYMBOLPREFIX -+#endif - - #define STUB_ENTRY(n) \ - __asm__( \ -- ".global _Stub"#n"__14nsXPTCStubBase\n\t" \ --"_Stub"#n"__14nsXPTCStubBase:\n\t" \ -+ ".global "SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase\n\t" \ -+SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase:\n\t" \ - "stmfd sp!, {r1, r2, r3} \n\t" \ - "mov ip, sp \n\t" \ - "stmfd sp!, {fp, ip, lr, pc} \n\t" \ - "sub fp, ip, #4 \n\t" \ - "mov r1, #"#n" \n\t" /* = methodIndex */ \ - "add r2, sp, #16 \n\t" \ -- "bl _PrepareAndDispatch__FP14nsXPTCStubBaseUiPUi \n\t" \ -+ "bl "SYMBOLPREFIX"PrepareAndDispatch__FP14nsXPTCStubBaseUiPUi \n\t" \ - "ldmea fp, {fp, sp, lr} \n\t" \ - "add sp, sp, #12 \n\t" \ - "mov pc, lr \n\t" \ diff --git a/www/mozilla-stable/patches/patch-bo b/www/mozilla-stable/patches/patch-bo deleted file mode 100644 index f4c8ef7020c..00000000000 --- a/www/mozilla-stable/patches/patch-bo +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bo,v 1.2 2004/12/04 03:50:41 taya Exp $ - ---- ../Orig/mozilla/nsprpub/configure.in 2004-04-17 07:28:02.000000000 +0900 -+++ ./nsprpub/configure.in 2004-07-27 01:25:32.000000000 +0900 -@@ -933,6 +933,9 @@ - DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' - MDCPUCFG_H=_freebsd.cfg - PR_MD_CSRCS=freebsd.c -+ if test "$LIBRUNPATH"; then -+ DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH" -+ fi - ;; - - *-hpux*) -@@ -1409,6 +1412,7 @@ - AC_DEFINE(XP_UNIX) - AC_DEFINE(NETBSD) - AC_DEFINE(HAVE_BSD_FLOCK) -+ AC_DEFINE(HAVE_SOCKLEN_T) - USE_NSPR_THREADS=1 - MDCPUCFG_H=_netbsd.cfg - PR_MD_CSRCS=netbsd.c diff --git a/www/mozilla-stable/patches/patch-bq b/www/mozilla-stable/patches/patch-bq deleted file mode 100644 index 15a841ea147..00000000000 --- a/www/mozilla-stable/patches/patch-bq +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-bq,v 1.3 2004/12/04 03:50:41 taya Exp $ - -diff -ru ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h ./xpcom/io/nsLocalFileUnix.h ---- ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h 2004-01-15 15:14:13.000000000 +0900 -+++ ./xpcom/io/nsLocalFileUnix.h 2004-06-10 23:07:36.000000000 +0900 -@@ -57,7 +57,7 @@ - #endif - - // so we can statfs on freebsd --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || (defined(__NetBSD__) && !defined(HAVE_STATVFS)) - #define HAVE_SYS_STATFS_H - #define STATFS statfs - #include <sys/param.h> diff --git a/www/mozilla-stable/patches/patch-br b/www/mozilla-stable/patches/patch-br deleted file mode 100644 index aebb664fc39..00000000000 --- a/www/mozilla-stable/patches/patch-br +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-br,v 1.1 2004/12/04 03:50:41 taya Exp $ - ---- nsprpub/pr/src/misc/prnetdb.c.orig 2004-04-28 22:00:17.000000000 +1000 -+++ nsprpub/pr/src/misc/prnetdb.c -@@ -2097,7 +2097,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf - */ - hints.ai_socktype = SOCK_STREAM; - -+/* NetBSD 2.0F */ -+#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 200060000 -+ LOCK_DNS(); -+#endif -+ - rv = GETADDRINFO(hostname, NULL, &hints, &res); -+ -+#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 200060000 -+ UNLOCK_DNS(); -+#endif -+ - if (rv == 0) - return (PRAddrInfo *) res; - diff --git a/www/mozilla-stable/patches/patch-bs b/www/mozilla-stable/patches/patch-bs deleted file mode 100644 index e5692eb91bf..00000000000 --- a/www/mozilla-stable/patches/patch-bs +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bs,v 1.1 2004/12/04 03:50:41 taya Exp $ - -diff -ru ../Orig/mozilla/config/mkdepend/imakemdep.h ./config/mkdepend/imakemdep.h ---- ../Orig/mozilla/config/mkdepend/imakemdep.h 1998-09-05 13:22:25.000000000 +0900 -+++ ./config/mkdepend/imakemdep.h 2004-06-10 23:07:44.000000000 +0900 -@@ -277,6 +277,9 @@ - # ifdef __i386__ - "-D__i386__", - # endif -+#if defined(__amd64__) || defined(__x86_64__) -+ "-D__amd64__ -D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", - # endif diff --git a/www/mozilla-stable/patches/patch-bt b/www/mozilla-stable/patches/patch-bt deleted file mode 100644 index c919d54663f..00000000000 --- a/www/mozilla-stable/patches/patch-bt +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-bt,v 1.1 2004/12/04 03:50:41 taya Exp $ - -diff -ru ../Orig/mozilla/nsprpub/pr/src/io/prprf.c ./nsprpub/pr/src/io/prprf.c ---- ../Orig/mozilla/nsprpub/pr/src/io/prprf.c 2004-03-09 12:18:19.000000000 +0900 -+++ ./nsprpub/pr/src/io/prprf.c 2004-06-10 23:42:04.000000000 +0900 -@@ -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/mozilla-stable/patches/patch-bu b/www/mozilla-stable/patches/patch-bu deleted file mode 100644 index e47a109ecfa..00000000000 --- a/www/mozilla-stable/patches/patch-bu +++ /dev/null @@ -1,179 +0,0 @@ -$NetBSD: patch-bu,v 1.1 2004/12/04 03:50:41 taya Exp $ - ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp.orig 2004-05-30 21:38:13.000000000 +0900 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp 2004-05-30 21:37:22.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 -+ -+#include "xptcprivate.h" -+ -+// 6 integral parameters are passed in registers -+const PRUint32 GPR_COUNT = 6; -+ -+// 8 floating point parameters are passed in SSE registers -+const PRUint32 FPR_COUNT = 8; -+ -+// Remember that these 'words' are 64-bit long -+static inline void -+invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s, -+ PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack) -+{ -+ nr_gpr = 1; // skip one GP register for 'that' -+ nr_fpr = 0; -+ nr_stack = 0; -+ -+ /* Compute number of eightbytes of class MEMORY. */ -+ for (uint32 i = 0; i < paramCount; i++, s++) { -+ if (!s->IsPtrData() -+ && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) { -+ if (nr_fpr < FPR_COUNT) -+ nr_fpr++; -+ else -+ nr_stack++; -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ nr_gpr++; -+ else -+ nr_stack++; -+ } -+ } -+} -+ -+static void -+invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s, -+ PRUint64 * gpregs, double * fpregs) -+{ -+ PRUint32 nr_gpr = 1; // skip one GP register for 'that' -+ PRUint32 nr_fpr = 0; -+ PRUint64 value; -+ -+ for (uint32 i = 0; i < paramCount; i++, s++) { -+ if (s->IsPtrData()) -+ value = (PRUint64) s->ptr; -+ else { -+ switch (s->type) { -+ case nsXPTType::T_FLOAT: break; -+ case nsXPTType::T_DOUBLE: break; -+ case nsXPTType::T_I8: value = s->val.i8; break; -+ case nsXPTType::T_I16: value = s->val.i16; break; -+ case nsXPTType::T_I32: value = s->val.i32; break; -+ case nsXPTType::T_I64: value = s->val.i64; break; -+ case nsXPTType::T_U8: value = s->val.u8; break; -+ case nsXPTType::T_U16: value = s->val.u16; break; -+ case nsXPTType::T_U32: value = s->val.u32; break; -+ case nsXPTType::T_U64: value = s->val.u64; break; -+ case nsXPTType::T_BOOL: value = s->val.b; break; -+ case nsXPTType::T_CHAR: value = s->val.c; break; -+ case nsXPTType::T_WCHAR: value = s->val.wc; break; -+ default: value = (PRUint64) s->val.p; break; -+ } -+ } -+ -+ if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) { -+ if (nr_fpr < FPR_COUNT) -+ fpregs[nr_fpr++] = s->val.d; -+ else { -+ *((double *)d) = s->val.d; -+ d++; -+ } -+ } -+ else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) { -+ if (nr_fpr < FPR_COUNT) -+ // The value in %xmm register is already prepared to -+ // be retrieved as a float. Therefore, we pass the -+ // value verbatim, as a double without conversion. -+ fpregs[nr_fpr++] = s->val.d; -+ else { -+ *((float *)d) = s->val.f; -+ d++; -+ } -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ gpregs[nr_gpr++] = value; -+ else -+ *d++ = value; -+ } -+ } -+} -+ -+extern "C" -+XPTC_PUBLIC_API(nsresult) -+XPTC_InvokeByIndex(nsISupports * that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant * params) -+{ -+ PRUint32 nr_gpr, nr_fpr, nr_stack; -+ invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack); -+ -+ // Stack, if used, must be 16-bytes aligned -+ if (nr_stack) -+ nr_stack = (nr_stack + 1) & ~1; -+ -+ // Load parameters to stack, if necessary -+ PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8); -+ PRUint64 gpregs[GPR_COUNT]; -+ double fpregs[FPR_COUNT]; -+ invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs); -+ -+ // Load FPR registers from fpregs[] -+ register double d0 asm("xmm0"); -+ register double d1 asm("xmm1"); -+ register double d2 asm("xmm2"); -+ register double d3 asm("xmm3"); -+ register double d4 asm("xmm4"); -+ register double d5 asm("xmm5"); -+ register double d6 asm("xmm6"); -+ register double d7 asm("xmm7"); -+ -+ switch (nr_fpr) { -+#define ARG_FPR(N) \ -+ case N+1: d##N = fpregs[N]; -+ ARG_FPR(7); -+ ARG_FPR(6); -+ ARG_FPR(5); -+ ARG_FPR(4); -+ ARG_FPR(3); -+ ARG_FPR(2); -+ ARG_FPR(1); -+ ARG_FPR(0); -+ case 0:; -+#undef ARG_FPR -+ } -+ -+ // Load GPR registers from gpregs[] -+ register PRUint64 a0 asm("rdi"); -+ register PRUint64 a1 asm("rsi"); -+ register PRUint64 a2 asm("rdx"); -+ register PRUint64 a3 asm("rcx"); -+ register PRUint64 a4 asm("r8"); -+ register PRUint64 a5 asm("r9"); -+ -+ switch (nr_gpr) { -+#define ARG_GPR(N) \ -+ case N+1: a##N = gpregs[N]; -+ ARG_GPR(5); -+ ARG_GPR(4); -+ ARG_GPR(3); -+ ARG_GPR(2); -+ ARG_GPR(1); -+ case 1: a0 = (PRUint64) that; -+ case 0:; -+#undef ARG_GPR -+ } -+ -+ // Ensure that assignments to SSE registers won't be optimized away -+ asm("" :: -+ "x" (d0), "x" (d1), "x" (d2), "x" (d3), -+ "x" (d4), "x" (d5), "x" (d6), "x" (d7)); -+ -+ // Get pointer to method -+ PRUint64 methodAddress = *((PRUint64 *)that); -+ methodAddress += 8 * methodIndex; -+ methodAddress = *((PRUint64 *)methodAddress); -+ -+ typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64); -+ PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5); -+ return result; -+} diff --git a/www/mozilla-stable/patches/patch-bv b/www/mozilla-stable/patches/patch-bv deleted file mode 100644 index fdd30629738..00000000000 --- a/www/mozilla-stable/patches/patch-bv +++ /dev/null @@ -1,211 +0,0 @@ -$NetBSD: patch-bv,v 1.1 2004/12/04 03:50:41 taya Exp $ - ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp.orig 2004-05-30 21:38:22.000000000 +0900 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp 2004-05-30 21:37:22.000000000 +0900 -@@ -0,0 +1,206 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+ -+// Implement shared vtbl methods. -+ -+#include "xptcprivate.h" -+ -+// The Linux/x86-64 ABI passes the first 6 integral parameters and the -+// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx, -+// r8, r9 and xmm0-xmm7), no stack space is allocated for these by the -+// caller. The rest of the parameters are passed in the callers stack -+// area. -+ -+const PRUint32 PARAM_BUFFER_COUNT = 16; -+const PRUint32 GPR_COUNT = 6; -+const PRUint32 FPR_COUNT = 8; -+ -+// PrepareAndDispatch() is called by SharedStub() and calls the actual method. -+// -+// - 'args[]' contains the arguments passed on stack -+// - 'gpregs[]' contains the arguments passed in integer registers -+// - 'fpregs[]' contains the arguments passed in floating point registers -+// -+// The parameters are mapped into an array of type 'nsXPTCMiniVariant' -+// and then the method gets called. -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex, -+ PRUint64 * args, PRUint64 * gpregs, double *fpregs) -+{ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint32 paramCount; -+ PRUint32 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ if (! iface_info) -+ return NS_ERROR_UNEXPECTED; -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no method info"); -+ if (! info) -+ return NS_ERROR_UNEXPECTED; -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ if (! dispatchParams) -+ return NS_ERROR_OUT_OF_MEMORY; -+ -+ PRUint64* ap = args; -+ PRUint32 nr_gpr = 1; // skip one GPR register for 'that' -+ PRUint32 nr_fpr = 0; -+ PRUint64 value; -+ -+ for(i = 0; i < paramCount; i++) { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if (!param.IsOut() && type == nsXPTType::T_DOUBLE) { -+ if (nr_fpr < FPR_COUNT) -+ dp->val.d = fpregs[nr_fpr++]; -+ else -+ dp->val.d = *(double*) ap++; -+ continue; -+ } -+ else if (!param.IsOut() && type == nsXPTType::T_FLOAT) { -+ if (nr_fpr < FPR_COUNT) -+ // The value in %xmm register is already prepared to -+ // be retrieved as a float. Therefore, we pass the -+ // value verbatim, as a double without conversion. -+ dp->val.d = *(double*) ap++; -+ else -+ dp->val.f = *(float*) ap++; -+ continue; -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ value = gpregs[nr_gpr++]; -+ else -+ value = *ap++; -+ } -+ -+ if (param.IsOut() || !type.IsArithmetic()) { -+ dp->val.p = (void*) value; -+ continue; -+ } -+ -+ switch (type) { -+ case nsXPTType::T_I8: dp->val.i8 = (PRInt8) value; break; -+ case nsXPTType::T_I16: dp->val.i16 = (PRInt16) value; break; -+ case nsXPTType::T_I32: dp->val.i32 = (PRInt32) value; break; -+ case nsXPTType::T_I64: dp->val.i64 = (PRInt64) value; break; -+ case nsXPTType::T_U8: dp->val.u8 = (PRUint8) value; break; -+ case nsXPTType::T_U16: dp->val.u16 = (PRUint16) value; break; -+ case nsXPTType::T_U32: dp->val.u32 = (PRUint32) value; break; -+ case nsXPTType::T_U64: dp->val.u64 = (PRUint64) value; break; -+ case nsXPTType::T_BOOL: dp->val.b = (PRBool) value; break; -+ case nsXPTType::T_CHAR: dp->val.c = (char) value; break; -+ case nsXPTType::T_WCHAR: dp->val.wc = (wchar_t) value; break; -+ -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if (dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+// Linux/x86-64 uses gcc >= 3.1 -+#define STUB_ENTRY(n) \ -+asm(".section \".text\"\n\t" \ -+ ".align 2\n\t" \ -+ ".if " #n " < 10\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \ -+ ".elseif " #n " < 100\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \ -+ ".elseif " #n " < 1000\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \ -+ ".else\n\t" \ -+ ".err \"stub number " #n " >= 1000 not yet supported\"\n\t" \ -+ ".endif\n\t" \ -+ "movl $" #n ", %eax\n\t" \ -+ "jmp SharedStub\n\t" \ -+ ".if " #n " < 10\n\t" \ -+ ".size _ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \ -+ ".elseif " #n " < 100\n\t" \ -+ ".size _ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \ -+ ".else\n\t" \ -+ ".size _ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \ -+ ".endif"); -+ -+// static nsresult SharedStub(PRUint32 methodIndex) -+asm(".section \".text\"\n\t" -+ ".align 2\n\t" -+ ".type SharedStub,@function\n\t" -+ "SharedStub:\n\t" -+ // make room for gpregs (48), fpregs (64) -+ "pushq %rbp\n\t" -+ "movq %rsp,%rbp\n\t" -+ "subq $112,%rsp\n\t" -+ // save GP registers -+ "movq %rdi,-112(%rbp)\n\t" -+ "movq %rsi,-104(%rbp)\n\t" -+ "movq %rdx, -96(%rbp)\n\t" -+ "movq %rcx, -88(%rbp)\n\t" -+ "movq %r8 , -80(%rbp)\n\t" -+ "movq %r9 , -72(%rbp)\n\t" -+ "leaq -112(%rbp),%rcx\n\t" -+ // save FP registers -+ "movsd %xmm0,-64(%rbp)\n\t" -+ "movsd %xmm1,-56(%rbp)\n\t" -+ "movsd %xmm2,-48(%rbp)\n\t" -+ "movsd %xmm3,-40(%rbp)\n\t" -+ "movsd %xmm4,-32(%rbp)\n\t" -+ "movsd %xmm5,-24(%rbp)\n\t" -+ "movsd %xmm6,-16(%rbp)\n\t" -+ "movsd %xmm7, -8(%rbp)\n\t" -+ "leaq -64(%rbp),%r8\n\t" -+ // rdi has the 'self' pointer already -+ "movl %eax,%esi\n\t" -+ "leaq 16(%rbp),%rdx\n\t" -+ "call PrepareAndDispatch\n\t" -+ "leave\n\t" -+ "ret\n\t" -+ ".size SharedStub,.-SharedStub"); -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#else -+#error "can't find a compiler to use" -+#endif /* __GNUC__ */ diff --git a/www/mozilla-stable/patches/patch-bw b/www/mozilla-stable/patches/patch-bw deleted file mode 100644 index a658d76fb74..00000000000 --- a/www/mozilla-stable/patches/patch-bw +++ /dev/null @@ -1,64 +0,0 @@ -$NetBSD: patch-bw,v 1.1 2004/12/04 03:50:41 taya Exp $ - -diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp ---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp 2001-09-29 05:12:52.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp 2004-05-11 16:29:31.000000000 +0900 -@@ -188,6 +188,50 @@ - * 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 @@ - "br $31,$SharedStub..ng\n\t" \ - ".end Stub"#n"__14nsXPTCStubBase" \ - ); -+#endif - - #define SENTINEL_ENTRY(n) \ - nsresult nsXPTCStubBase::Sentinel##n() \ diff --git a/www/mozilla-stable/patches/patch-bx b/www/mozilla-stable/patches/patch-bx deleted file mode 100644 index b8cabda8095..00000000000 --- a/www/mozilla-stable/patches/patch-bx +++ /dev/null @@ -1,84 +0,0 @@ -$NetBSD: patch-bx,v 1.1 2004/12/04 03:50:41 taya Exp $ - ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp.orig 2001-09-28 22:12:53.000000000 +0200 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp -@@ -119,8 +119,10 @@ PrepareAndDispatch(nsXPTCStubBase* self, - if ((PRUint32) ap & 4) ap++; // doubles are 8-byte aligned on stack - dp->val.d = *(double*) ap; - ap += 2; -+#if __GXX_ABI_VERSION < 100 - if (gpr < GPR_COUNT) - gpr += 2; -+#endif - } - continue; - } -@@ -130,8 +132,10 @@ PrepareAndDispatch(nsXPTCStubBase* self, - else { - dp->val.f = *(float*) ap; - ap += 1; -+#if __GXX_ABI_VERSION < 100 - if (gpr < GPR_COUNT) - gpr += 1; -+#endif - } - continue; - } -@@ -195,7 +199,9 @@ PrepareAndDispatch(nsXPTCStubBase* self, - // however, it's quick, dirty, and'll break when the ABI changes on - // us, which is what we want ;-). - --#define STUB_ENTRY(n) \ -+#if __GXX_ABI_VERSION < 100 -+// gcc-2 version -+# define STUB_ENTRY(n) \ - __asm__ ( \ - ".section \".text\" \n\t" \ - ".align 2 \n\t" \ -@@ -206,6 +212,46 @@ __asm__ ( - "li 11,"#n" \n\t" \ - "b SharedStub@local \n" \ - ); -+#else -+// gcc-3 version -+// -+// As G++3 ABI contains the length of the functionname in the mangled -+// name, it is difficult to get a generic assembler mechanism like -+// in the G++ 2.95 case. -+// Create names would be like: -+// _ZN14nsXPTCStubBase5Stub1Ev -+// _ZN14nsXPTCStubBase6Stub12Ev -+// _ZN14nsXPTCStubBase7Stub123Ev -+// _ZN14nsXPTCStubBase8Stub1234Ev -+// etc. -+// Use assembler directives to get the names right... -+ -+# define STUB_ENTRY(n) \ -+__asm__ ( \ -+ ".align 2 \n\t" \ -+ ".if "#n" < 10 \n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \ -+ ".type _ZN14nsXPTCStubBase5Stub"#n"Ev,@function \n\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t" \ -+ \ -+ ".elseif "#n" < 100 \n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev \n\t" \ -+ ".type _ZN14nsXPTCStubBase6Stub"#n"Ev,@function \n\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t" \ -+ \ -+ ".elseif "#n" < 1000 \n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev \n\t" \ -+ ".type _ZN14nsXPTCStubBase7Stub"#n"Ev,@function \n\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t" \ -+ \ -+ ".else \n\t" \ -+ ".err \"stub number "#n" >= 1000 not yet supported\"\n" \ -+ ".endif \n\t" \ -+ \ -+ "li 11,"#n" \n\t" \ -+ "b SharedStub@local \n" \ -+); -+#endif - - #define SENTINEL_ENTRY(n) \ - nsresult nsXPTCStubBase::Sentinel##n() \ diff --git a/www/mozilla-stable/patches/patch-by b/www/mozilla-stable/patches/patch-by deleted file mode 100644 index a1e6c05ec7b..00000000000 --- a/www/mozilla-stable/patches/patch-by +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-by,v 1.1 2004/12/04 03:50:41 taya Exp $ - -diff -ru ../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-03-19 10:36:16.000000000 +0900 -+++ ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp 2004-07-04 22:59:19.000000000 +0900 -@@ -155,15 +155,15 @@ - - static NS_NAMED_LITERAL_STRING(arial, "arial"); - nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("helvetica"), -- &arial); -+ (nsDependentString *)&arial); - - static NS_NAMED_LITERAL_STRING(courier, "courier new"); - nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("courier"), -- &courier); -+ (nsDependentString *)&courier); - - static NS_NAMED_LITERAL_STRING(times, "times new roman"); - nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("times"), -- ×); -+ (nsDependentString *)×); - } - - void NS_FreeSVGLibartGlyphMetricsFTGlobals() -@@ -440,19 +440,19 @@ - return; - } - -- FTC_Image_Desc imageDesc; -- imageDesc.font.face_id=(void*)font_data.font_entry.get(); // XXX do we need to addref? -+ FTC_ImageType imageDesc; -+ imageDesc->face_id = (FTC_FaceID)font_data.font_entry.get(); // XXX do we need to addref? - float twipstopixel = GetTwipsToPixels(); - float scale = GetPixelScale(); -- imageDesc.font.pix_width = (int)((float)(font_data.font.size)*twipstopixel/scale); -- imageDesc.font.pix_height = (int)((float)(font_data.font.size)*twipstopixel/scale); -- imageDesc.image_type |= ftc_image_grays; -+ imageDesc->width = (int)((float)(font_data.font.size)*twipstopixel/scale); -+ imageDesc->height = (int)((float)(font_data.font.size)*twipstopixel/scale); -+ imageDesc->flags = 0; - - // get the face - nsresult rv; - FTC_Manager mgr; - nsSVGLibartFreetype::ft2->GetFTCacheManager(&mgr); -- rv = nsSVGLibartFreetype::ft2->ManagerLookupSize(mgr, &imageDesc.font, &mFace, nsnull); -+ rv = nsSVGLibartFreetype::ft2->ManagerLookupFace(mgr, imageDesc->face_id, &mFace); - NS_ASSERTION(mFace, "failed to get face/size"); - } - diff --git a/www/mozilla-stable/patches/patch-bz b/www/mozilla-stable/patches/patch-bz deleted file mode 100644 index 7763ce1b6a3..00000000000 --- a/www/mozilla-stable/patches/patch-bz +++ /dev/null @@ -1,122 +0,0 @@ -$NetBSD: patch-bz,v 1.1 2004/12/04 03:50:41 taya Exp $ - ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s.orig 2001-03-11 18:22:22.000000000 +0100 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s -@@ -1,27 +1,27 @@ --# -*- Mode: Asm -*- --# --# The contents of this file are subject to the Netscape Public --# License Version 1.1 (the "License"); you may not use this file --# except in compliance with the License. You may obtain a copy of --# the License at http://www.mozilla.org/NPL/ --# --# Software distributed under the License is distributed on an "AS --# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or --# implied. See the License for the specific language governing --# rights and limitations under the License. --# --# The Original Code is mozilla.org code. --# --# The Initial Developer of the Original Code is Netscape --# Communications Corporation. Portions created by Netscape are --# Copyright (C) 1999 Netscape Communications Corporation. All --# Rights Reserved. --# --# Contributor(s): --# Franz.Sirl-kernel@lauterbach.com (Franz Sirl) --# beard@netscape.com (Patrick Beard) --# waterson@netscape.com (Chris Waterson) --# -+// -*- Mode: Asm -*- -+// -+// The contents of this file are subject to the Netscape Public -+// License Version 1.1 (the "License"); you may not use this file -+// except in compliance with the License. You may obtain a copy of -+// the License at http://www.mozilla.org/NPL/ -+// -+// Software distributed under the License is distributed on an "AS -+// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+// implied. See the License for the specific language governing -+// rights and limitations under the License. -+// -+// The Original Code is mozilla.org code. -+// -+// The Initial Developer of the Original Code is Netscape -+// Communications Corporation. Portions created by Netscape are -+// Copyright (C) 1999 Netscape Communications Corporation. All -+// Rights Reserved. -+// -+// Contributor(s): -+// Franz.Sirl-kernel@lauterbach.com (Franz Sirl) -+// beard@netscape.com (Patrick Beard) -+// waterson@netscape.com (Chris Waterson) -+// - - .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4 - .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9 -@@ -44,23 +44,23 @@ - .type SharedStub,@function - - SharedStub: -- stwu sp,-112(sp) # room for -- # linkage (8), -- # gprData (32), -- # fprData (64), -- # stack alignment(8) -+ stwu sp,-112(sp) // room for -+ // linkage (8), -+ // gprData (32), -+ // fprData (64), -+ // stack alignment(8) - mflr r0 -- stw r0,116(sp) # save LR backchain -+ stw r0,116(sp) // save LR backchain - -- stw r4,12(sp) # save GP registers -- stw r5,16(sp) # (n.b. that we don't save r3 -- stw r6,20(sp) # because PrepareAndDispatch() is savvy) -+ stw r4,12(sp) // save GP registers -+ stw r5,16(sp) // (n.b. that we don't save r3 -+ stw r6,20(sp) // because PrepareAndDispatch() is savvy) - stw r7,24(sp) - stw r8,28(sp) - stw r9,32(sp) - stw r10,36(sp) - -- stfd f1,40(sp) # save FP registers -+ stfd f1,40(sp) // save FP registers - stfd f2,48(sp) - stfd f3,56(sp) - stfd f4,64(sp) -@@ -69,21 +69,20 @@ SharedStub: - stfd f7,88(sp) - stfd f8,96(sp) - -- # r3 has the 'self' pointer already -+ // r3 has the 'self' pointer already - -- mr r4,r11 # r4 <= methodIndex selector, passed -- # via r11 in the nsXPTCStubBase::StubXX() call -+ mr r4,r11 // r4 <= methodIndex selector, passed -+ // via r11 in the nsXPTCStubBase::StubXX() call - -- addi r5,sp,120 # r5 <= pointer to callers args area, -- # beyond r3-r10/f1-f8 mapped range -+ addi r5,sp,120 // r5 <= pointer to callers args area, -+ // beyond r3-r10/f1-f8 mapped range - -- addi r6,sp,8 # r6 <= gprData -- addi r7,sp,40 # r7 <= fprData -+ addi r6,sp,8 // r6 <= gprData -+ addi r7,sp,40 // r7 <= fprData - -- bl PrepareAndDispatch@local # Go! -+ bl PrepareAndDispatch@local // Go! - -- lwz r0,116(sp) # restore LR -+ lwz r0,116(sp) // restore LR - mtlr r0 -- la sp,112(sp) # clean up the stack -+ la sp,112(sp) // clean up the stack - blr -- diff --git a/www/mozilla-stable/patches/patch-ca b/www/mozilla-stable/patches/patch-ca deleted file mode 100644 index 006313db3bb..00000000000 --- a/www/mozilla-stable/patches/patch-ca +++ /dev/null @@ -1,166 +0,0 @@ -$NetBSD: patch-ca,v 1.1 2004/12/04 03:50:41 taya Exp $ - ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig 2001-03-11 18:22:17.000000000 +0100 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s -@@ -1,27 +1,28 @@ --# -*- Mode: Asm -*- --# --# The contents of this file are subject to the Netscape Public --# License Version 1.1 (the "License"); you may not use this file --# except in compliance with the License. You may obtain a copy of --# the License at http://www.mozilla.org/NPL/ --# --# Software distributed under the License is distributed on an "AS --# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or --# implied. See the License for the specific language governing --# rights and limitations under the License. --# --# The Original Code is mozilla.org code. --# --# The Initial Developer of the Original Code is Netscape --# Communications Corporation. Portions created by Netscape are --# Copyright (C) 1999 Netscape Communications Corporation. All --# Rights Reserved. --# --# Contributor(s): --# Franz.Sirl-kernel@lauterbach.com (Franz Sirl) --# beard@netscape.com (Patrick Beard) --# waterson@netscape.com (Chris Waterson) --# -+// -*- Mode: Asm -*- -+// -+// The contents of this file are subject to the Netscape Public -+// License Version 1.1 (the "License"); you may not use this file -+// except in compliance with the License. You may obtain a copy of -+// the License at http://www.mozilla.org/NPL/ -+// -+// Software distributed under the License is distributed on an "AS -+// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+// implied. See the License for the specific language governing -+// rights and limitations under the License. -+// -+// The Original Code is mozilla.org code. -+// -+// The Initial Developer of the Original Code is Netscape -+// Communications Corporation. Portions created by Netscape are -+// Copyright (C) 1999 Netscape Communications Corporation. All -+// Rights Reserved. -+// -+// Contributor(s): -+// Franz.Sirl-kernel@lauterbach.com (Franz Sirl) -+// beard@netscape.com (Patrick Beard) -+// waterson@netscape.com (Chris Waterson) -+// -+ - .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4 - .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9 - .set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14 -@@ -42,38 +43,38 @@ - .globl XPTC_InvokeByIndex - .type XPTC_InvokeByIndex,@function - --# --# XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, --# PRUint32 paramCount, nsXPTCVariant* params) --# -+// -+// XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+// PRUint32 paramCount, nsXPTCVariant* params) -+// - - XPTC_InvokeByIndex: -- stwu sp,-32(sp) # setup standard stack frame -- mflr r0 # save LR -- stw r3,8(sp) # r3 <= that -- stw r4,12(sp) # r4 <= methodIndex -+ stwu sp,-32(sp) // setup standard stack frame -+ mflr r0 // save LR -+ stw r3,8(sp) // r3 <= that -+ stw r4,12(sp) // r4 <= methodIndex - stw r30,16(sp) - stw r31,20(sp) - -- stw r0,36(sp) # store LR backchain -+ stw r0,36(sp) // store LR backchain - mr r31,sp - -- rlwinm r10,r5,3,0,27 # r10 = (ParamCount * 2 * 4) & ~0x0f -- addi r0,r10,96 # reserve stack for GPR and FPR register save area r0 = r10 + 96 -- lwz r9,0(sp) # r9 = backchain -+ rlwinm r10,r5,3,0,27 // r10 = (ParamCount * 2 * 4) & ~0x0f -+ addi r0,r10,96 // reserve stack for GPR and FPR register save area r0 = r10 + 96 -+ lwz r9,0(sp) // r9 = backchain - neg r0,r0 -- stwux r9,sp,r0 # reserve stack sapce and save SP backchain -- -- addi r3,sp,8 # r3 <= args -- mr r4,r5 # r4 <= paramCount -- mr r5,r6 # r5 <= params -- add r6,r3,r10 # r6 <= gpregs ( == args + r10 ) -- mr r30,r6 # store in r30 for use later... -- addi r7,r6,32 # r7 <= fpregs ( == gpregs + 32 ) -+ stwux r9,sp,r0 // reserve stack space and save SP backchain -+ -+ addi r3,sp,8 // r3 <= args -+ mr r4,r5 // r4 <= paramCount -+ mr r5,r6 // r5 <= params -+ add r6,r3,r10 // r6 <= gpregs ( == args + r10 ) -+ mr r30,r6 // store in r30 for use later... -+ addi r7,r6,32 // r7 <= fpregs ( == gpregs + 32 ) - -- bl invoke_copy_to_stack@local # (args, paramCount, params, gpregs, fpregs) -+ bl invoke_copy_to_stack@local // (args, paramCount, params, gpregs, fpregs) - -- lfd f1,32(r30) # load FP registers with method parameters -+ lfd f1,32(r30) // load FP registers with method parameters - lfd f2,40(r30) - lfd f3,48(r30) - lfd f4,56(r30) -@@ -82,18 +83,18 @@ XPTC_InvokeByIndex: - lfd f7,80(r30) - lfd f8,88(r30) - -- lwz r3,8(r31) # r3 <= that -- lwz r4,12(r31) # r4 <= methodIndex -- lwz r5,0(r3) # r5 <= vtable ( == *that ) -- slwi r4,r4,3 # convert to offset ( *= 8 ) -- addi r4,r4,8 # skip first two vtable entries -- add r4,r4,r5 -- lhz r0,0(r4) # virtual base offset -- extsh r0,r0 -- add r3,r3,r0 -- lwz r0,4(r4) # r0 <= methodpointer ( == vtable + offset ) -+ lwz r3,8(r31) // r3 <= that -+ lwz r4,12(r31) // r4 <= methodIndex -+ lwz r5,0(r3) // r5 <= vtable ( == *that ) -+#if !((__GNUC__ == 3 && __GNUC_MINOR__ < 2) || __GXX_ABI_VERSION >= 100) // G++ pre-V3 ABI is like that of AIX under NetBSD -+ slwi r4,r4,3 // convert to offset ( *= 8 ) -+ addi r4,r4,8 // skip garbage before vtable -+#else -+ slwi r4,r4,2 // convert to offset ( *= 4 ) -+#endif -+ lwzx r0,r5,r4 // r0 <= methodpointer ( == vtable + offset ) - -- lwz r4,4(r30) # load GP regs with method parameters -+ lwz r4,4(r30) // load GP regs with method parameters - lwz r5,8(r30) - lwz r6,12(r30) - lwz r7,16(r30) -@@ -101,13 +102,13 @@ XPTC_InvokeByIndex: - lwz r9,24(r30) - lwz r10,28(r30) - -- mtlr r0 # copy methodpointer to LR -- blrl # call method -+ mtlr r0 // copy methodpointer to LR -+ blrl // call method - -- lwz r30,16(r31) # restore r30 & r31 -+ lwz r30,16(r31) // restore r30 & r31 - lwz r31,20(r31) - -- lwz r11,0(sp) # clean up the stack -+ lwz r11,0(sp) // clean up the stack - lwz r0,4(r11) - mtlr r0 - mr sp,r11 diff --git a/www/mozilla-stable/patches/patch-cb b/www/mozilla-stable/patches/patch-cb deleted file mode 100644 index c63c55e5250..00000000000 --- a/www/mozilla-stable/patches/patch-cb +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-cb,v 1.1 2004/12/04 03:50:41 taya Exp $ - ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp.orig 2001-09-28 22:12:52.000000000 +0200 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp -@@ -104,8 +104,10 @@ invoke_copy_to_stack(PRUint32* d, - if ((PRUint32) d & 4) d++; // doubles are 8-byte aligned on stack - *((double*) d) = s->val.d; - d += 2; -+#if __GXX_ABI_VERSION < 100 - if (gpr < GPR_COUNT) - gpr += 2; -+#endif - } - } - else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) { -@@ -114,8 +116,10 @@ invoke_copy_to_stack(PRUint32* d, - else { - *((float*) d) = s->val.f; - d += 1; -+#if __GXX_ABI_VERSION < 100 - if (gpr < GPR_COUNT) - gpr += 1; -+#endif - } - } - else if (!s->IsPtrData() && (s->type == nsXPTType::T_I64 diff --git a/www/mozilla-stable/patches/patch-cc b/www/mozilla-stable/patches/patch-cc deleted file mode 100644 index e33f8f7b469..00000000000 --- a/www/mozilla-stable/patches/patch-cc +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-cc,v 1.1 2004/12/04 03:50:41 taya Exp $ - ---- /mnt/local/src/mozilla-1.7rc3/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp 2004-08-13 01:24:00.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp 2004-08-13 01:23:35.000000000 +0900 -@@ -163,7 +163,11 @@ - "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 */ |