diff options
51 files changed, 825 insertions, 717 deletions
diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile index f1cf0c4ce557..d8ff3407aafa 100644 --- a/www/mozilla-devel/Makefile +++ b/www/mozilla-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mozilla -PORTVERSION= 1.4b +PORTVERSION= 1.5a PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES?= www @@ -28,7 +28,6 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ freetype.9:${PORTSDIR}/print/freetype2 WRKSRC= ${WRKDIR}/${PORTNAME} -IGNORE= "www/mozilla has been updated to 1.4" MOZILLA?= mozilla-devel MOZ_SUFX= -devel diff --git a/www/mozilla-devel/distinfo b/www/mozilla-devel/distinfo index 5c3c1602b908..b9eab8b758f7 100644 --- a/www/mozilla-devel/distinfo +++ b/www/mozilla-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (mozilla-source-1.4b.tar.bz2) = 63c591ea36ed3864a1ccd4cc4f59d009 +MD5 (mozilla-source-1.5a.tar.bz2) = f75e8bba12a7142fe90ed4108a55fe09 MD5 (libart_lgpl.tar.bz2) = f332c3c026adc1c2c0ceb3ac5847d5f5 diff --git a/www/mozilla-devel/files/patch-Double.cpp b/www/mozilla-devel/files/patch-Double.cpp index 3dabc0260c14..ea09affc26e4 100644 --- a/www/mozilla-devel/files/patch-Double.cpp +++ b/www/mozilla-devel/files/patch-Double.cpp @@ -1,11 +1,16 @@ ---- extensions/transformiix/source/base/Double.cpp.orig Wed May 21 04:42:05 2003 -+++ extensions/transformiix/source/base/Double.cpp Wed May 21 04:42:24 2003 -@@ -51,7 +51,7 @@ +--- extensions/transformiix/source/base/Double.cpp.orig Thu Jan 30 00:26:46 2003 ++++ extensions/transformiix/source/base/Double.cpp Tue Jun 24 23:30:10 2003 +@@ -51,10 +51,10 @@ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. #ifdef __FreeBSD__ #include <ieeefp.h> -#ifdef __alpha__ -+#if defined(__alpha__) || defined(__sparc64__) - fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; - #else +-fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; +-#else ++#if defined(__i386__) fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; ++#else ++fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; + #endif + fp_except_t oldmask = fpsetmask(~allmask); + #endif diff --git a/www/mozilla-devel/files/patch-alpha b/www/mozilla-devel/files/patch-alpha index f8c1b081c9fa..29631a98e61e 100644 --- a/www/mozilla-devel/files/patch-alpha +++ b/www/mozilla-devel/files/patch-alpha @@ -1,36 +1,3 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Mon Jan 27 22:52:51 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Tue May 27 01:41:12 2003 -@@ -100,9 +100,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # ---- config/rules.mk.orig Mon May 5 21:04:55 2003 -+++ config/rules.mk Tue May 27 01:33:11 2003 -@@ -444,7 +444,11 @@ - - ifeq ($(OS_ARCH),FreeBSD) - ifdef IS_COMPONENT -+ifneq (,$(filter alpha,$(OS_TEST))) -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc -+else - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+endif - endif - endif - --- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 @@ -0,0 +1,184 @@ diff --git a/www/mozilla-devel/files/patch-config::rules.mk b/www/mozilla-devel/files/patch-config::rules.mk new file mode 100644 index 000000000000..4dda22752411 --- /dev/null +++ b/www/mozilla-devel/files/patch-config::rules.mk @@ -0,0 +1,14 @@ +--- config/rules.mk.orig Sun May 18 16:10:18 2003 ++++ config/rules.mk Sun Jul 20 18:07:26 2003 +@@ -448,7 +448,11 @@ + + ifeq ($(OS_ARCH),FreeBSD) + ifdef IS_COMPONENT ++ifeq (,$(filter i386,$(OS_TEST))) ++EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc ++else + EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic ++endif + endif + endif + diff --git a/www/mozilla-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/mozilla-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp deleted file mode 100644 index 0071f169c0e2..000000000000 --- a/www/mozilla-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp +++ /dev/null @@ -1,55 +0,0 @@ ---- gfx/src/gtk/nsFontMetricsXft.cpp.orig Tue Mar 25 16:13:01 2003 -+++ gfx/src/gtk/nsFontMetricsXft.cpp Mon Apr 14 10:21:18 2003 -@@ -90,6 +90,7 @@ - FcPattern *mPattern; - FcPattern *mFontName; - FcCharSet *mCharset; -+ int mNotXft; - }; - - struct MozXftLangGroup { -@@ -772,7 +773,7 @@ - // font in our loaded list that supports the character - for (PRInt32 i = 0, end = mLoadedFonts.Count(); i < end; ++i) { - nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(i); -- if (FcCharSetHasChar(font->mCharset, aChar)) -+ if (FcCharSetHasChar(font->mCharset, aChar) && font->GetXftFont()) - return font; - } - -@@ -1194,7 +1195,7 @@ - for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) { - nsFontXft *font; - font = (nsFontXft *)mLoadedFonts.ElementAt(j); -- if (FcCharSetHasChar(font->mCharset, c)) { -+ if (FcCharSetHasChar(font->mCharset, c) && font->GetXftFont()) { - foundFont = font; - break; - } -@@ -1503,6 +1504,7 @@ - FcPatternReference(mFontName); - - mXftFont = nsnull; -+ mNotXft = 0; - - // set up our charset - mCharset = nsnull; -@@ -1529,14 +1531,16 @@ - XftFont * - nsFontXft::GetXftFont(void) - { -- if (!mXftFont) { -+ if (!mXftFont && !mNotXft) { - FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName); - if (!pat) - return nsnull; - - mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat); -- if (!mXftFont) -+ if (!mXftFont) { - FcPatternDestroy(pat); -+ mNotXft = 1; -+ } - } - - return mXftFont; diff --git a/www/mozilla-devel/files/patch-jsfun.c b/www/mozilla-devel/files/patch-jsfun.c deleted file mode 100644 index 69aacb9b54cd..000000000000 --- a/www/mozilla-devel/files/patch-jsfun.c +++ /dev/null @@ -1,29 +0,0 @@ ---- js/src/jsfun.c.orig Fri May 30 20:55:38 2003 -+++ js/src/jsfun.c Fri May 30 20:54:24 2003 -@@ -1081,7 +1081,7 @@ - JSString *atomstr; - char *propname; - JSScopeProperty *sprop; -- jsid userid; -+ uint32 userid; - JSAtom *atom; - uintN i, n, dupflag; - uint32 type; -@@ -1157,7 +1157,7 @@ - userid = INT_TO_JSVAL(sprop->shortid); - propname = ATOM_BYTES((JSAtom *)sprop->id); - if (!JS_XDRUint32(xdr, &type) || -- !JS_XDRUint32(xdr, (uint32 *)&userid) || -+ !JS_XDRUint32(xdr, &userid) || - !JS_XDRCString(xdr, &propname)) { - if (mark) - JS_ARENA_RELEASE(&cx->tempPool, mark); -@@ -1173,7 +1173,7 @@ - uintN attrs = JSPROP_ENUMERATE | JSPROP_PERMANENT; - - if (!JS_XDRUint32(xdr, &type) || -- !JS_XDRUint32(xdr, (uint32 *)&userid) || -+ !JS_XDRUint32(xdr, &userid) || - !JS_XDRCString(xdr, &propname)) { - return JS_FALSE; - } diff --git a/www/mozilla-devel/files/patch-nsprpub::pr::include::md::_freebsd.cfg b/www/mozilla-devel/files/patch-nsprpub::pr::include::md::_freebsd.cfg new file mode 100644 index 000000000000..733993f2fd0a --- /dev/null +++ b/www/mozilla-devel/files/patch-nsprpub::pr::include::md::_freebsd.cfg @@ -0,0 +1,103 @@ +--- nsprpub/pr/include/md/_freebsd.cfg.orig Wed Jan 2 18:38:25 2002 ++++ nsprpub/pr/include/md/_freebsd.cfg Tue Jun 24 23:11:54 2003 +@@ -138,6 +138,100 @@ + #define PR_ALIGN_OF_DOUBLE 8 + #define PR_ALIGN_OF_POINTER 8 + ++#elif defined(__sparc__) ++ ++#undef IS_LITTLE_ENDIAN ++#define IS_BIG_ENDIAN 1 ++#define HAVE_LONG_LONG ++#define HAVE_ALIGNED_DOUBLES ++#define HAVE_ALIGNED_LONGLONGS ++#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_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(__ia64__) ++ ++#define IS_LITTLE_ENDIAN 1 ++#undef IS_BIG_ENDIAN ++#define HAVE_LONG_LONG ++#define HAVE_ALIGNED_DOUBLES ++#define HAVE_ALIGNED_LONGLONGS ++#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_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 ++ + #else + + #error "Unknown CPU architecture" diff --git a/www/mozilla-devel/files/patch-nsprpub::pr::include::md::_freebsd.h b/www/mozilla-devel/files/patch-nsprpub::pr::include::md::_freebsd.h new file mode 100644 index 000000000000..fb5de98ab9ff --- /dev/null +++ b/www/mozilla-devel/files/patch-nsprpub::pr::include::md::_freebsd.h @@ -0,0 +1,13 @@ +--- nsprpub/pr/include/md/_freebsd.h.orig Thu Jan 16 15:09:12 2003 ++++ nsprpub/pr/include/md/_freebsd.h Tue Jun 24 23:12:04 2003 +@@ -48,6 +48,10 @@ + #define _PR_SI_ARCHITECTURE "x86" + #elif defined(__alpha) + #define _PR_SI_ARCHITECTURE "alpha" ++#elif defined(__sparc__) ++#define _PR_SI_ARCHITECTURE "sparc" ++#elif defined(__ia64__) ++#define _PR_SI_ARCHITECTURE "ia64" + #else + #error "Unknown CPU architecture" + #endif diff --git a/www/mozilla-devel/files/patch-nsprpub::pr::src::pthreads::ptio.c b/www/mozilla-devel/files/patch-nsprpub::pr::src::pthreads::ptio.c index 4a965d4c7440..4243bc8a8193 100644 --- a/www/mozilla-devel/files/patch-nsprpub::pr::src::pthreads::ptio.c +++ b/www/mozilla-devel/files/patch-nsprpub::pr::src::pthreads::ptio.c @@ -1,22 +1,29 @@ -Index: nsprpub/pr/src/pthreads/ptio.c -diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c ---- nsprpub/pr/src/pthreads/ptio.c.orig Fri Apr 12 03:14:39 2002 -+++ nsprpub/pr/src/pthreads/ptio.c Tue Jul 30 18:52:11 2002 -@@ -3414,6 +3414,17 @@ +--- nsprpub/pr/src/pthreads/ptio.c.orig Tue Jul 8 23:37:46 2003 ++++ nsprpub/pr/src/pthreads/ptio.c Wed Jul 23 00:53:15 2003 +@@ -3370,7 +3370,7 @@ + PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd); + #if defined(_PR_INET6_PROBE) + PR_EXTERN(PRBool) _pr_ipv6_is_present; +-#ifdef DARWIN ++#if defined(DARWIN) || defined(FREEBSD) + static PRBool _pr_ipv6_v6only_on_by_default; + #endif + PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket() +@@ -3385,7 +3385,7 @@ + */ + osfd = socket(AF_INET6, SOCK_STREAM, 0); + if (osfd != -1) { +-#ifdef DARWIN ++#if defined(DARWIN) || defined(FREEBSD) + /* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option + * is turned on by default, contrary to what RFC 3493, Section + * 5.3 says. So we have to turn it off. Find out whether we +@@ -3452,7 +3452,7 @@ if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno); else { -+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \ -+ defined(__FreeBSD__) && defined(IPV6_V6ONLY) -+ if (domain == PR_AF_INET6) { -+ int opt = 0; -+ if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY, -+ &opt, sizeof(opt))) { -+ close(osfd); -+ return NULL; -+ } -+ } -+#endif - fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE); - if (fd == NULL) close(osfd); - } +-#ifdef DARWIN ++#if defined(DARWIN) || defined(FREEBSD) + if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default) + { + int on = 0; diff --git a/www/mozilla-devel/files/patch-nsprpub_pr_src_misc_prtime.c b/www/mozilla-devel/files/patch-nsprpub_pr_src_misc_prtime.c index 30f067cfaf56..f13ae2faa20e 100644 --- a/www/mozilla-devel/files/patch-nsprpub_pr_src_misc_prtime.c +++ b/www/mozilla-devel/files/patch-nsprpub_pr_src_misc_prtime.c @@ -1,11 +1,11 @@ --- nsprpub/pr/src/misc/prtime.c.orig Wed Feb 26 19:01:02 2003 -+++ nsprpub/pr/src/misc/prtime.c Sun Apr 6 19:22:10 2003 ++++ nsprpub/pr/src/misc/prtime.c Mon Jun 30 23:18:29 2003 @@ -1666,7 +1666,7 @@ */ #if defined(SUNOS4) || (__GLIBC__ >= 2) || defined(XP_BEOS) \ - || defined(NETBSD) -+ || defined(NETBSD) || defined(__FreeBSD__) ++ || defined(NETBSD) || defined(FREEBSD) a.tm_zone = NULL; a.tm_gmtoff = tm->tm_params.tp_gmt_offset + tm->tm_params.tp_dst_offset; #endif diff --git a/www/mozilla-devel/files/patch-qt b/www/mozilla-devel/files/patch-qt index 27f44eaa4cdb..b91018e33c15 100644 --- a/www/mozilla-devel/files/patch-qt +++ b/www/mozilla-devel/files/patch-qt @@ -1,14 +1,14 @@ ---- configure.orig Sat May 3 16:18:13 2003 -+++ configure Fri May 16 15:22:46 2003 -@@ -11851,9 +11851,9 @@ +--- configure.orig Wed Jul 9 17:58:01 2003 ++++ configure Wed Jul 23 00:42:51 2003 +@@ -11845,9 +11845,9 @@ -MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices" +MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector universalchardet typeaheadfind webservices" --MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm access-builtin datetime finger cview" -+MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm access-builtin datetime finger cview" +-MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm datetime finger cview layout-debug" ++MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm datetime finger cview layout-debug" # Check whether --enable-extensions or --disable-extensions was given. if test "${enable_extensions+set}" = set; then diff --git a/www/mozilla-devel/files/patch-sparc64 b/www/mozilla-devel/files/patch-sparc64 deleted file mode 100644 index b9cb83058235..000000000000 --- a/www/mozilla-devel/files/patch-sparc64 +++ /dev/null @@ -1,69 +0,0 @@ -diff -ru ./nsprpub/pr/include/md/_freebsd.cfg ../../work~/mozilla/nsprpub/pr/include/md/_freebsd.cfg ---- ./nsprpub/pr/include/md/_freebsd.cfg Wed Jan 2 18:38:25 2002 -+++ ../../work~/mozilla/nsprpub/pr/include/md/_freebsd.cfg Tue May 20 21:27:31 2003 -@@ -138,6 +138,53 @@ - #define PR_ALIGN_OF_DOUBLE 8 - #define PR_ALIGN_OF_POINTER 8 - -+#elif defined(__sparc__) -+ -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+#define HAVE_LONG_LONG -+#define HAVE_ALIGNED_DOUBLES -+#define HAVE_ALIGNED_LONGLONGS -+#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_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 -+ - #else - - #error "Unknown CPU architecture" -diff -ru ./nsprpub/pr/include/md/_freebsd.h ../../work~/mozilla/nsprpub/pr/include/md/_freebsd.h ---- ./nsprpub/pr/include/md/_freebsd.h Thu Jan 16 15:09:12 2003 -+++ ../../work~/mozilla/nsprpub/pr/include/md/_freebsd.h Tue May 20 21:27:13 2003 -@@ -48,6 +48,8 @@ - #define _PR_SI_ARCHITECTURE "x86" - #elif defined(__alpha) - #define _PR_SI_ARCHITECTURE "alpha" -+#elif defined(__sparc__) -+#define _PR_SI_ARCHITECTURE "sparc" - #else - #error "Unknown CPU architecture" - #endif diff --git a/www/mozilla-devel/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc b/www/mozilla-devel/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc new file mode 100644 index 000000000000..ed281efd9234 --- /dev/null +++ b/www/mozilla-devel/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc @@ -0,0 +1,11 @@ +--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Sun Jul 20 11:45:41 2003 ++++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Sun Jul 20 11:49:09 2003 +@@ -8,7 +8,7 @@ + * 1 is AddRef + * 2 is Release + */ +-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) ++#if !defined(__ia64) + XPTC_EXPORT NS_IMETHOD Stub3(); + XPTC_EXPORT NS_IMETHOD Stub4(); + XPTC_EXPORT NS_IMETHOD Stub5(); diff --git a/www/mozilla-devel/files/patch-xpcom::reflect::xptcall::src::md::unix::Makefile.in b/www/mozilla-devel/files/patch-xpcom::reflect::xptcall::src::md::unix::Makefile.in new file mode 100644 index 000000000000..5b911d47b2f9 --- /dev/null +++ b/www/mozilla-devel/files/patch-xpcom::reflect::xptcall::src::md::unix::Makefile.in @@ -0,0 +1,50 @@ +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Sun Jul 20 18:16:25 2003 ++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Jul 20 11:58:05 2003 +@@ -59,13 +59,11 @@ + CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp + endif + endif +-# IA64 Linux +-ifneq (,$(filter Linux,$(OS_ARCH))) ++# IA64 Linux & FreeBSD + ifneq (,$(findstring ia64,$(OS_TEST))) + CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp + ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s + endif +-endif + # + # BeOS/Intel (uses the same unixish_x86 code) + # +@@ -106,9 +104,15 @@ + ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s + endif + # ++# FreeBSD/Alpha ++# ++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) ++CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp ++endif ++# + # Linux/Alpha + # +-ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) ++ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp + endif + # +@@ -292,6 +296,15 @@ + 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 ++# ++# FreeBSD/SPARC64 ++# ++ifeq ($(OS_ARCH),FreeBSD) ++ifneq (,$(findstring sparc,$(OS_TEST))) ++CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp ++ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s ++endif + endif + # + # Solaris/SPARC diff --git a/www/mozilla-devel/files/patch-xptcall-ia64 b/www/mozilla-devel/files/patch-xptcall-ia64 new file mode 100644 index 000000000000..9cd07f7ddbb2 --- /dev/null +++ b/www/mozilla-devel/files/patch-xptcall-ia64 @@ -0,0 +1,38 @@ +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig Sun Jul 20 00:05:32 2003 ++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s Sun Jul 20 00:06:37 2003 +@@ -8,6 +8,7 @@ + // Section has executable code + .section .text, "ax","progbits" + // procedure named 'XPTC_InvokeByIndex' ++ .global XPTC_InvokeByIndex + .proc XPTC_InvokeByIndex + // manual bundling + .explicit +@@ -24,7 +25,7 @@ + + // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, + // PRUint32 paramCount, nsXPTCVariant* params); +-XPTC_InvokeByIndex:: ++XPTC_InvokeByIndex: + .prologue + .save ar.pfs, r37 + // allocate 4 input args, 6 local args, and 8 output args +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Sun Jul 20 00:02:02 2003 ++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Sun Jul 20 00:02:40 2003 +@@ -6,6 +6,7 @@ + // Section has executable code + .section .text, "ax","progbits" + // procedure named 'SharedStub' ++ .global SharedStub + .proc SharedStub + // manual bundling + .explicit +@@ -14,7 +15,7 @@ + // .exclass PrepareAndDispatch, @fullyvisible + .type PrepareAndDispatch,@function + +-SharedStub:: ++SharedStub: + // 9 arguments, first 8 are the input arguments of previous + // function call. The last one is methodIndex, and is passed in memory + .prologue diff --git a/www/mozilla-devel/files/patch-xptcall-sparc64 b/www/mozilla-devel/files/patch-xptcall-sparc64 index ea2773ced7d9..9599a8a71336 100644 --- a/www/mozilla-devel/files/patch-xptcall-sparc64 +++ b/www/mozilla-devel/files/patch-xptcall-sparc64 @@ -1,21 +1,3 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Mon May 26 13:26:01 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Mon May 26 13:30:04 2003 -@@ -287,6 +287,15 @@ - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s - endif - # -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s -+endif -+endif -+# - # Solaris/SPARC - # - ifeq ($(OS_ARCH),SunOS) --- /dev/null Mon May 26 13:22:00 2003 +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 @@ -0,0 +1,123 @@ diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index f1cf0c4ce557..d8ff3407aafa 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mozilla -PORTVERSION= 1.4b +PORTVERSION= 1.5a PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES?= www @@ -28,7 +28,6 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ freetype.9:${PORTSDIR}/print/freetype2 WRKSRC= ${WRKDIR}/${PORTNAME} -IGNORE= "www/mozilla has been updated to 1.4" MOZILLA?= mozilla-devel MOZ_SUFX= -devel diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo index 5c3c1602b908..b9eab8b758f7 100644 --- a/www/seamonkey/distinfo +++ b/www/seamonkey/distinfo @@ -1,2 +1,2 @@ -MD5 (mozilla-source-1.4b.tar.bz2) = 63c591ea36ed3864a1ccd4cc4f59d009 +MD5 (mozilla-source-1.5a.tar.bz2) = f75e8bba12a7142fe90ed4108a55fe09 MD5 (libart_lgpl.tar.bz2) = f332c3c026adc1c2c0ceb3ac5847d5f5 diff --git a/www/seamonkey/files/patch-Double.cpp b/www/seamonkey/files/patch-Double.cpp index 3dabc0260c14..ea09affc26e4 100644 --- a/www/seamonkey/files/patch-Double.cpp +++ b/www/seamonkey/files/patch-Double.cpp @@ -1,11 +1,16 @@ ---- extensions/transformiix/source/base/Double.cpp.orig Wed May 21 04:42:05 2003 -+++ extensions/transformiix/source/base/Double.cpp Wed May 21 04:42:24 2003 -@@ -51,7 +51,7 @@ +--- extensions/transformiix/source/base/Double.cpp.orig Thu Jan 30 00:26:46 2003 ++++ extensions/transformiix/source/base/Double.cpp Tue Jun 24 23:30:10 2003 +@@ -51,10 +51,10 @@ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. #ifdef __FreeBSD__ #include <ieeefp.h> -#ifdef __alpha__ -+#if defined(__alpha__) || defined(__sparc64__) - fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; - #else +-fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; +-#else ++#if defined(__i386__) fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; ++#else ++fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; + #endif + fp_except_t oldmask = fpsetmask(~allmask); + #endif diff --git a/www/seamonkey/files/patch-alpha b/www/seamonkey/files/patch-alpha index f8c1b081c9fa..29631a98e61e 100644 --- a/www/seamonkey/files/patch-alpha +++ b/www/seamonkey/files/patch-alpha @@ -1,36 +1,3 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Mon Jan 27 22:52:51 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Tue May 27 01:41:12 2003 -@@ -100,9 +100,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # ---- config/rules.mk.orig Mon May 5 21:04:55 2003 -+++ config/rules.mk Tue May 27 01:33:11 2003 -@@ -444,7 +444,11 @@ - - ifeq ($(OS_ARCH),FreeBSD) - ifdef IS_COMPONENT -+ifneq (,$(filter alpha,$(OS_TEST))) -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc -+else - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+endif - endif - endif - --- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 @@ -0,0 +1,184 @@ diff --git a/www/seamonkey/files/patch-config::rules.mk b/www/seamonkey/files/patch-config::rules.mk new file mode 100644 index 000000000000..4dda22752411 --- /dev/null +++ b/www/seamonkey/files/patch-config::rules.mk @@ -0,0 +1,14 @@ +--- config/rules.mk.orig Sun May 18 16:10:18 2003 ++++ config/rules.mk Sun Jul 20 18:07:26 2003 +@@ -448,7 +448,11 @@ + + ifeq ($(OS_ARCH),FreeBSD) + ifdef IS_COMPONENT ++ifeq (,$(filter i386,$(OS_TEST))) ++EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc ++else + EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic ++endif + endif + endif + diff --git a/www/seamonkey/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/seamonkey/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp deleted file mode 100644 index 0071f169c0e2..000000000000 --- a/www/seamonkey/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp +++ /dev/null @@ -1,55 +0,0 @@ ---- gfx/src/gtk/nsFontMetricsXft.cpp.orig Tue Mar 25 16:13:01 2003 -+++ gfx/src/gtk/nsFontMetricsXft.cpp Mon Apr 14 10:21:18 2003 -@@ -90,6 +90,7 @@ - FcPattern *mPattern; - FcPattern *mFontName; - FcCharSet *mCharset; -+ int mNotXft; - }; - - struct MozXftLangGroup { -@@ -772,7 +773,7 @@ - // font in our loaded list that supports the character - for (PRInt32 i = 0, end = mLoadedFonts.Count(); i < end; ++i) { - nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(i); -- if (FcCharSetHasChar(font->mCharset, aChar)) -+ if (FcCharSetHasChar(font->mCharset, aChar) && font->GetXftFont()) - return font; - } - -@@ -1194,7 +1195,7 @@ - for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) { - nsFontXft *font; - font = (nsFontXft *)mLoadedFonts.ElementAt(j); -- if (FcCharSetHasChar(font->mCharset, c)) { -+ if (FcCharSetHasChar(font->mCharset, c) && font->GetXftFont()) { - foundFont = font; - break; - } -@@ -1503,6 +1504,7 @@ - FcPatternReference(mFontName); - - mXftFont = nsnull; -+ mNotXft = 0; - - // set up our charset - mCharset = nsnull; -@@ -1529,14 +1531,16 @@ - XftFont * - nsFontXft::GetXftFont(void) - { -- if (!mXftFont) { -+ if (!mXftFont && !mNotXft) { - FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName); - if (!pat) - return nsnull; - - mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat); -- if (!mXftFont) -+ if (!mXftFont) { - FcPatternDestroy(pat); -+ mNotXft = 1; -+ } - } - - return mXftFont; diff --git a/www/seamonkey/files/patch-jsfun.c b/www/seamonkey/files/patch-jsfun.c deleted file mode 100644 index 69aacb9b54cd..000000000000 --- a/www/seamonkey/files/patch-jsfun.c +++ /dev/null @@ -1,29 +0,0 @@ ---- js/src/jsfun.c.orig Fri May 30 20:55:38 2003 -+++ js/src/jsfun.c Fri May 30 20:54:24 2003 -@@ -1081,7 +1081,7 @@ - JSString *atomstr; - char *propname; - JSScopeProperty *sprop; -- jsid userid; -+ uint32 userid; - JSAtom *atom; - uintN i, n, dupflag; - uint32 type; -@@ -1157,7 +1157,7 @@ - userid = INT_TO_JSVAL(sprop->shortid); - propname = ATOM_BYTES((JSAtom *)sprop->id); - if (!JS_XDRUint32(xdr, &type) || -- !JS_XDRUint32(xdr, (uint32 *)&userid) || -+ !JS_XDRUint32(xdr, &userid) || - !JS_XDRCString(xdr, &propname)) { - if (mark) - JS_ARENA_RELEASE(&cx->tempPool, mark); -@@ -1173,7 +1173,7 @@ - uintN attrs = JSPROP_ENUMERATE | JSPROP_PERMANENT; - - if (!JS_XDRUint32(xdr, &type) || -- !JS_XDRUint32(xdr, (uint32 *)&userid) || -+ !JS_XDRUint32(xdr, &userid) || - !JS_XDRCString(xdr, &propname)) { - return JS_FALSE; - } diff --git a/www/seamonkey/files/patch-nsprpub::pr::include::md::_freebsd.cfg b/www/seamonkey/files/patch-nsprpub::pr::include::md::_freebsd.cfg new file mode 100644 index 000000000000..733993f2fd0a --- /dev/null +++ b/www/seamonkey/files/patch-nsprpub::pr::include::md::_freebsd.cfg @@ -0,0 +1,103 @@ +--- nsprpub/pr/include/md/_freebsd.cfg.orig Wed Jan 2 18:38:25 2002 ++++ nsprpub/pr/include/md/_freebsd.cfg Tue Jun 24 23:11:54 2003 +@@ -138,6 +138,100 @@ + #define PR_ALIGN_OF_DOUBLE 8 + #define PR_ALIGN_OF_POINTER 8 + ++#elif defined(__sparc__) ++ ++#undef IS_LITTLE_ENDIAN ++#define IS_BIG_ENDIAN 1 ++#define HAVE_LONG_LONG ++#define HAVE_ALIGNED_DOUBLES ++#define HAVE_ALIGNED_LONGLONGS ++#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_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(__ia64__) ++ ++#define IS_LITTLE_ENDIAN 1 ++#undef IS_BIG_ENDIAN ++#define HAVE_LONG_LONG ++#define HAVE_ALIGNED_DOUBLES ++#define HAVE_ALIGNED_LONGLONGS ++#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_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 ++ + #else + + #error "Unknown CPU architecture" diff --git a/www/seamonkey/files/patch-nsprpub::pr::include::md::_freebsd.h b/www/seamonkey/files/patch-nsprpub::pr::include::md::_freebsd.h new file mode 100644 index 000000000000..fb5de98ab9ff --- /dev/null +++ b/www/seamonkey/files/patch-nsprpub::pr::include::md::_freebsd.h @@ -0,0 +1,13 @@ +--- nsprpub/pr/include/md/_freebsd.h.orig Thu Jan 16 15:09:12 2003 ++++ nsprpub/pr/include/md/_freebsd.h Tue Jun 24 23:12:04 2003 +@@ -48,6 +48,10 @@ + #define _PR_SI_ARCHITECTURE "x86" + #elif defined(__alpha) + #define _PR_SI_ARCHITECTURE "alpha" ++#elif defined(__sparc__) ++#define _PR_SI_ARCHITECTURE "sparc" ++#elif defined(__ia64__) ++#define _PR_SI_ARCHITECTURE "ia64" + #else + #error "Unknown CPU architecture" + #endif diff --git a/www/seamonkey/files/patch-nsprpub::pr::src::pthreads::ptio.c b/www/seamonkey/files/patch-nsprpub::pr::src::pthreads::ptio.c index 4a965d4c7440..4243bc8a8193 100644 --- a/www/seamonkey/files/patch-nsprpub::pr::src::pthreads::ptio.c +++ b/www/seamonkey/files/patch-nsprpub::pr::src::pthreads::ptio.c @@ -1,22 +1,29 @@ -Index: nsprpub/pr/src/pthreads/ptio.c -diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c ---- nsprpub/pr/src/pthreads/ptio.c.orig Fri Apr 12 03:14:39 2002 -+++ nsprpub/pr/src/pthreads/ptio.c Tue Jul 30 18:52:11 2002 -@@ -3414,6 +3414,17 @@ +--- nsprpub/pr/src/pthreads/ptio.c.orig Tue Jul 8 23:37:46 2003 ++++ nsprpub/pr/src/pthreads/ptio.c Wed Jul 23 00:53:15 2003 +@@ -3370,7 +3370,7 @@ + PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd); + #if defined(_PR_INET6_PROBE) + PR_EXTERN(PRBool) _pr_ipv6_is_present; +-#ifdef DARWIN ++#if defined(DARWIN) || defined(FREEBSD) + static PRBool _pr_ipv6_v6only_on_by_default; + #endif + PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket() +@@ -3385,7 +3385,7 @@ + */ + osfd = socket(AF_INET6, SOCK_STREAM, 0); + if (osfd != -1) { +-#ifdef DARWIN ++#if defined(DARWIN) || defined(FREEBSD) + /* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option + * is turned on by default, contrary to what RFC 3493, Section + * 5.3 says. So we have to turn it off. Find out whether we +@@ -3452,7 +3452,7 @@ if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno); else { -+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \ -+ defined(__FreeBSD__) && defined(IPV6_V6ONLY) -+ if (domain == PR_AF_INET6) { -+ int opt = 0; -+ if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY, -+ &opt, sizeof(opt))) { -+ close(osfd); -+ return NULL; -+ } -+ } -+#endif - fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE); - if (fd == NULL) close(osfd); - } +-#ifdef DARWIN ++#if defined(DARWIN) || defined(FREEBSD) + if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default) + { + int on = 0; diff --git a/www/seamonkey/files/patch-nsprpub_pr_src_misc_prtime.c b/www/seamonkey/files/patch-nsprpub_pr_src_misc_prtime.c index 30f067cfaf56..f13ae2faa20e 100644 --- a/www/seamonkey/files/patch-nsprpub_pr_src_misc_prtime.c +++ b/www/seamonkey/files/patch-nsprpub_pr_src_misc_prtime.c @@ -1,11 +1,11 @@ --- nsprpub/pr/src/misc/prtime.c.orig Wed Feb 26 19:01:02 2003 -+++ nsprpub/pr/src/misc/prtime.c Sun Apr 6 19:22:10 2003 ++++ nsprpub/pr/src/misc/prtime.c Mon Jun 30 23:18:29 2003 @@ -1666,7 +1666,7 @@ */ #if defined(SUNOS4) || (__GLIBC__ >= 2) || defined(XP_BEOS) \ - || defined(NETBSD) -+ || defined(NETBSD) || defined(__FreeBSD__) ++ || defined(NETBSD) || defined(FREEBSD) a.tm_zone = NULL; a.tm_gmtoff = tm->tm_params.tp_gmt_offset + tm->tm_params.tp_dst_offset; #endif diff --git a/www/seamonkey/files/patch-qt b/www/seamonkey/files/patch-qt index 27f44eaa4cdb..b91018e33c15 100644 --- a/www/seamonkey/files/patch-qt +++ b/www/seamonkey/files/patch-qt @@ -1,14 +1,14 @@ ---- configure.orig Sat May 3 16:18:13 2003 -+++ configure Fri May 16 15:22:46 2003 -@@ -11851,9 +11851,9 @@ +--- configure.orig Wed Jul 9 17:58:01 2003 ++++ configure Wed Jul 23 00:42:51 2003 +@@ -11845,9 +11845,9 @@ -MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices" +MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector universalchardet typeaheadfind webservices" --MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm access-builtin datetime finger cview" -+MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm access-builtin datetime finger cview" +-MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm datetime finger cview layout-debug" ++MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm datetime finger cview layout-debug" # Check whether --enable-extensions or --disable-extensions was given. if test "${enable_extensions+set}" = set; then diff --git a/www/seamonkey/files/patch-sparc64 b/www/seamonkey/files/patch-sparc64 deleted file mode 100644 index b9cb83058235..000000000000 --- a/www/seamonkey/files/patch-sparc64 +++ /dev/null @@ -1,69 +0,0 @@ -diff -ru ./nsprpub/pr/include/md/_freebsd.cfg ../../work~/mozilla/nsprpub/pr/include/md/_freebsd.cfg ---- ./nsprpub/pr/include/md/_freebsd.cfg Wed Jan 2 18:38:25 2002 -+++ ../../work~/mozilla/nsprpub/pr/include/md/_freebsd.cfg Tue May 20 21:27:31 2003 -@@ -138,6 +138,53 @@ - #define PR_ALIGN_OF_DOUBLE 8 - #define PR_ALIGN_OF_POINTER 8 - -+#elif defined(__sparc__) -+ -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+#define HAVE_LONG_LONG -+#define HAVE_ALIGNED_DOUBLES -+#define HAVE_ALIGNED_LONGLONGS -+#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_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 -+ - #else - - #error "Unknown CPU architecture" -diff -ru ./nsprpub/pr/include/md/_freebsd.h ../../work~/mozilla/nsprpub/pr/include/md/_freebsd.h ---- ./nsprpub/pr/include/md/_freebsd.h Thu Jan 16 15:09:12 2003 -+++ ../../work~/mozilla/nsprpub/pr/include/md/_freebsd.h Tue May 20 21:27:13 2003 -@@ -48,6 +48,8 @@ - #define _PR_SI_ARCHITECTURE "x86" - #elif defined(__alpha) - #define _PR_SI_ARCHITECTURE "alpha" -+#elif defined(__sparc__) -+#define _PR_SI_ARCHITECTURE "sparc" - #else - #error "Unknown CPU architecture" - #endif diff --git a/www/seamonkey/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc b/www/seamonkey/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc new file mode 100644 index 000000000000..ed281efd9234 --- /dev/null +++ b/www/seamonkey/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc @@ -0,0 +1,11 @@ +--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Sun Jul 20 11:45:41 2003 ++++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Sun Jul 20 11:49:09 2003 +@@ -8,7 +8,7 @@ + * 1 is AddRef + * 2 is Release + */ +-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) ++#if !defined(__ia64) + XPTC_EXPORT NS_IMETHOD Stub3(); + XPTC_EXPORT NS_IMETHOD Stub4(); + XPTC_EXPORT NS_IMETHOD Stub5(); diff --git a/www/seamonkey/files/patch-xpcom::reflect::xptcall::src::md::unix::Makefile.in b/www/seamonkey/files/patch-xpcom::reflect::xptcall::src::md::unix::Makefile.in new file mode 100644 index 000000000000..5b911d47b2f9 --- /dev/null +++ b/www/seamonkey/files/patch-xpcom::reflect::xptcall::src::md::unix::Makefile.in @@ -0,0 +1,50 @@ +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Sun Jul 20 18:16:25 2003 ++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Jul 20 11:58:05 2003 +@@ -59,13 +59,11 @@ + CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp + endif + endif +-# IA64 Linux +-ifneq (,$(filter Linux,$(OS_ARCH))) ++# IA64 Linux & FreeBSD + ifneq (,$(findstring ia64,$(OS_TEST))) + CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp + ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s + endif +-endif + # + # BeOS/Intel (uses the same unixish_x86 code) + # +@@ -106,9 +104,15 @@ + ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s + endif + # ++# FreeBSD/Alpha ++# ++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) ++CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp ++endif ++# + # Linux/Alpha + # +-ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) ++ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp + endif + # +@@ -292,6 +296,15 @@ + 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 ++# ++# FreeBSD/SPARC64 ++# ++ifeq ($(OS_ARCH),FreeBSD) ++ifneq (,$(findstring sparc,$(OS_TEST))) ++CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp ++ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s ++endif + endif + # + # Solaris/SPARC diff --git a/www/seamonkey/files/patch-xptcall-ia64 b/www/seamonkey/files/patch-xptcall-ia64 new file mode 100644 index 000000000000..9cd07f7ddbb2 --- /dev/null +++ b/www/seamonkey/files/patch-xptcall-ia64 @@ -0,0 +1,38 @@ +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig Sun Jul 20 00:05:32 2003 ++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s Sun Jul 20 00:06:37 2003 +@@ -8,6 +8,7 @@ + // Section has executable code + .section .text, "ax","progbits" + // procedure named 'XPTC_InvokeByIndex' ++ .global XPTC_InvokeByIndex + .proc XPTC_InvokeByIndex + // manual bundling + .explicit +@@ -24,7 +25,7 @@ + + // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, + // PRUint32 paramCount, nsXPTCVariant* params); +-XPTC_InvokeByIndex:: ++XPTC_InvokeByIndex: + .prologue + .save ar.pfs, r37 + // allocate 4 input args, 6 local args, and 8 output args +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Sun Jul 20 00:02:02 2003 ++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Sun Jul 20 00:02:40 2003 +@@ -6,6 +6,7 @@ + // Section has executable code + .section .text, "ax","progbits" + // procedure named 'SharedStub' ++ .global SharedStub + .proc SharedStub + // manual bundling + .explicit +@@ -14,7 +15,7 @@ + // .exclass PrepareAndDispatch, @fullyvisible + .type PrepareAndDispatch,@function + +-SharedStub:: ++SharedStub: + // 9 arguments, first 8 are the input arguments of previous + // function call. The last one is methodIndex, and is passed in memory + .prologue diff --git a/www/seamonkey/files/patch-xptcall-sparc64 b/www/seamonkey/files/patch-xptcall-sparc64 index ea2773ced7d9..9599a8a71336 100644 --- a/www/seamonkey/files/patch-xptcall-sparc64 +++ b/www/seamonkey/files/patch-xptcall-sparc64 @@ -1,21 +1,3 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Mon May 26 13:26:01 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Mon May 26 13:30:04 2003 -@@ -287,6 +287,15 @@ - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s - endif - # -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s -+endif -+endif -+# - # Solaris/SPARC - # - ifeq ($(OS_ARCH),SunOS) --- /dev/null Mon May 26 13:22:00 2003 +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 @@ -0,0 +1,123 @@ diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile index f1cf0c4ce557..d8ff3407aafa 100644 --- a/www/seamonkey2/Makefile +++ b/www/seamonkey2/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mozilla -PORTVERSION= 1.4b +PORTVERSION= 1.5a PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES?= www @@ -28,7 +28,6 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ freetype.9:${PORTSDIR}/print/freetype2 WRKSRC= ${WRKDIR}/${PORTNAME} -IGNORE= "www/mozilla has been updated to 1.4" MOZILLA?= mozilla-devel MOZ_SUFX= -devel diff --git a/www/seamonkey2/distinfo b/www/seamonkey2/distinfo index 5c3c1602b908..b9eab8b758f7 100644 --- a/www/seamonkey2/distinfo +++ b/www/seamonkey2/distinfo @@ -1,2 +1,2 @@ -MD5 (mozilla-source-1.4b.tar.bz2) = 63c591ea36ed3864a1ccd4cc4f59d009 +MD5 (mozilla-source-1.5a.tar.bz2) = f75e8bba12a7142fe90ed4108a55fe09 MD5 (libart_lgpl.tar.bz2) = f332c3c026adc1c2c0ceb3ac5847d5f5 diff --git a/www/seamonkey2/files/patch-Double.cpp b/www/seamonkey2/files/patch-Double.cpp index 3dabc0260c14..ea09affc26e4 100644 --- a/www/seamonkey2/files/patch-Double.cpp +++ b/www/seamonkey2/files/patch-Double.cpp @@ -1,11 +1,16 @@ ---- extensions/transformiix/source/base/Double.cpp.orig Wed May 21 04:42:05 2003 -+++ extensions/transformiix/source/base/Double.cpp Wed May 21 04:42:24 2003 -@@ -51,7 +51,7 @@ +--- extensions/transformiix/source/base/Double.cpp.orig Thu Jan 30 00:26:46 2003 ++++ extensions/transformiix/source/base/Double.cpp Tue Jun 24 23:30:10 2003 +@@ -51,10 +51,10 @@ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. #ifdef __FreeBSD__ #include <ieeefp.h> -#ifdef __alpha__ -+#if defined(__alpha__) || defined(__sparc64__) - fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; - #else +-fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; +-#else ++#if defined(__i386__) fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; ++#else ++fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; + #endif + fp_except_t oldmask = fpsetmask(~allmask); + #endif diff --git a/www/seamonkey2/files/patch-alpha b/www/seamonkey2/files/patch-alpha index f8c1b081c9fa..29631a98e61e 100644 --- a/www/seamonkey2/files/patch-alpha +++ b/www/seamonkey2/files/patch-alpha @@ -1,36 +1,3 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Mon Jan 27 22:52:51 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Tue May 27 01:41:12 2003 -@@ -100,9 +100,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # ---- config/rules.mk.orig Mon May 5 21:04:55 2003 -+++ config/rules.mk Tue May 27 01:33:11 2003 -@@ -444,7 +444,11 @@ - - ifeq ($(OS_ARCH),FreeBSD) - ifdef IS_COMPONENT -+ifneq (,$(filter alpha,$(OS_TEST))) -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc -+else - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+endif - endif - endif - --- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 @@ -0,0 +1,184 @@ diff --git a/www/seamonkey2/files/patch-config::rules.mk b/www/seamonkey2/files/patch-config::rules.mk new file mode 100644 index 000000000000..4dda22752411 --- /dev/null +++ b/www/seamonkey2/files/patch-config::rules.mk @@ -0,0 +1,14 @@ +--- config/rules.mk.orig Sun May 18 16:10:18 2003 ++++ config/rules.mk Sun Jul 20 18:07:26 2003 +@@ -448,7 +448,11 @@ + + ifeq ($(OS_ARCH),FreeBSD) + ifdef IS_COMPONENT ++ifeq (,$(filter i386,$(OS_TEST))) ++EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc ++else + EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic ++endif + endif + endif + diff --git a/www/seamonkey2/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/seamonkey2/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp deleted file mode 100644 index 0071f169c0e2..000000000000 --- a/www/seamonkey2/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp +++ /dev/null @@ -1,55 +0,0 @@ ---- gfx/src/gtk/nsFontMetricsXft.cpp.orig Tue Mar 25 16:13:01 2003 -+++ gfx/src/gtk/nsFontMetricsXft.cpp Mon Apr 14 10:21:18 2003 -@@ -90,6 +90,7 @@ - FcPattern *mPattern; - FcPattern *mFontName; - FcCharSet *mCharset; -+ int mNotXft; - }; - - struct MozXftLangGroup { -@@ -772,7 +773,7 @@ - // font in our loaded list that supports the character - for (PRInt32 i = 0, end = mLoadedFonts.Count(); i < end; ++i) { - nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(i); -- if (FcCharSetHasChar(font->mCharset, aChar)) -+ if (FcCharSetHasChar(font->mCharset, aChar) && font->GetXftFont()) - return font; - } - -@@ -1194,7 +1195,7 @@ - for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) { - nsFontXft *font; - font = (nsFontXft *)mLoadedFonts.ElementAt(j); -- if (FcCharSetHasChar(font->mCharset, c)) { -+ if (FcCharSetHasChar(font->mCharset, c) && font->GetXftFont()) { - foundFont = font; - break; - } -@@ -1503,6 +1504,7 @@ - FcPatternReference(mFontName); - - mXftFont = nsnull; -+ mNotXft = 0; - - // set up our charset - mCharset = nsnull; -@@ -1529,14 +1531,16 @@ - XftFont * - nsFontXft::GetXftFont(void) - { -- if (!mXftFont) { -+ if (!mXftFont && !mNotXft) { - FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName); - if (!pat) - return nsnull; - - mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat); -- if (!mXftFont) -+ if (!mXftFont) { - FcPatternDestroy(pat); -+ mNotXft = 1; -+ } - } - - return mXftFont; diff --git a/www/seamonkey2/files/patch-jsfun.c b/www/seamonkey2/files/patch-jsfun.c deleted file mode 100644 index 69aacb9b54cd..000000000000 --- a/www/seamonkey2/files/patch-jsfun.c +++ /dev/null @@ -1,29 +0,0 @@ ---- js/src/jsfun.c.orig Fri May 30 20:55:38 2003 -+++ js/src/jsfun.c Fri May 30 20:54:24 2003 -@@ -1081,7 +1081,7 @@ - JSString *atomstr; - char *propname; - JSScopeProperty *sprop; -- jsid userid; -+ uint32 userid; - JSAtom *atom; - uintN i, n, dupflag; - uint32 type; -@@ -1157,7 +1157,7 @@ - userid = INT_TO_JSVAL(sprop->shortid); - propname = ATOM_BYTES((JSAtom *)sprop->id); - if (!JS_XDRUint32(xdr, &type) || -- !JS_XDRUint32(xdr, (uint32 *)&userid) || -+ !JS_XDRUint32(xdr, &userid) || - !JS_XDRCString(xdr, &propname)) { - if (mark) - JS_ARENA_RELEASE(&cx->tempPool, mark); -@@ -1173,7 +1173,7 @@ - uintN attrs = JSPROP_ENUMERATE | JSPROP_PERMANENT; - - if (!JS_XDRUint32(xdr, &type) || -- !JS_XDRUint32(xdr, (uint32 *)&userid) || -+ !JS_XDRUint32(xdr, &userid) || - !JS_XDRCString(xdr, &propname)) { - return JS_FALSE; - } diff --git a/www/seamonkey2/files/patch-nsprpub::pr::include::md::_freebsd.cfg b/www/seamonkey2/files/patch-nsprpub::pr::include::md::_freebsd.cfg new file mode 100644 index 000000000000..733993f2fd0a --- /dev/null +++ b/www/seamonkey2/files/patch-nsprpub::pr::include::md::_freebsd.cfg @@ -0,0 +1,103 @@ +--- nsprpub/pr/include/md/_freebsd.cfg.orig Wed Jan 2 18:38:25 2002 ++++ nsprpub/pr/include/md/_freebsd.cfg Tue Jun 24 23:11:54 2003 +@@ -138,6 +138,100 @@ + #define PR_ALIGN_OF_DOUBLE 8 + #define PR_ALIGN_OF_POINTER 8 + ++#elif defined(__sparc__) ++ ++#undef IS_LITTLE_ENDIAN ++#define IS_BIG_ENDIAN 1 ++#define HAVE_LONG_LONG ++#define HAVE_ALIGNED_DOUBLES ++#define HAVE_ALIGNED_LONGLONGS ++#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_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(__ia64__) ++ ++#define IS_LITTLE_ENDIAN 1 ++#undef IS_BIG_ENDIAN ++#define HAVE_LONG_LONG ++#define HAVE_ALIGNED_DOUBLES ++#define HAVE_ALIGNED_LONGLONGS ++#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_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 ++ + #else + + #error "Unknown CPU architecture" diff --git a/www/seamonkey2/files/patch-nsprpub::pr::include::md::_freebsd.h b/www/seamonkey2/files/patch-nsprpub::pr::include::md::_freebsd.h new file mode 100644 index 000000000000..fb5de98ab9ff --- /dev/null +++ b/www/seamonkey2/files/patch-nsprpub::pr::include::md::_freebsd.h @@ -0,0 +1,13 @@ +--- nsprpub/pr/include/md/_freebsd.h.orig Thu Jan 16 15:09:12 2003 ++++ nsprpub/pr/include/md/_freebsd.h Tue Jun 24 23:12:04 2003 +@@ -48,6 +48,10 @@ + #define _PR_SI_ARCHITECTURE "x86" + #elif defined(__alpha) + #define _PR_SI_ARCHITECTURE "alpha" ++#elif defined(__sparc__) ++#define _PR_SI_ARCHITECTURE "sparc" ++#elif defined(__ia64__) ++#define _PR_SI_ARCHITECTURE "ia64" + #else + #error "Unknown CPU architecture" + #endif diff --git a/www/seamonkey2/files/patch-nsprpub::pr::src::pthreads::ptio.c b/www/seamonkey2/files/patch-nsprpub::pr::src::pthreads::ptio.c index 4a965d4c7440..4243bc8a8193 100644 --- a/www/seamonkey2/files/patch-nsprpub::pr::src::pthreads::ptio.c +++ b/www/seamonkey2/files/patch-nsprpub::pr::src::pthreads::ptio.c @@ -1,22 +1,29 @@ -Index: nsprpub/pr/src/pthreads/ptio.c -diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c ---- nsprpub/pr/src/pthreads/ptio.c.orig Fri Apr 12 03:14:39 2002 -+++ nsprpub/pr/src/pthreads/ptio.c Tue Jul 30 18:52:11 2002 -@@ -3414,6 +3414,17 @@ +--- nsprpub/pr/src/pthreads/ptio.c.orig Tue Jul 8 23:37:46 2003 ++++ nsprpub/pr/src/pthreads/ptio.c Wed Jul 23 00:53:15 2003 +@@ -3370,7 +3370,7 @@ + PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd); + #if defined(_PR_INET6_PROBE) + PR_EXTERN(PRBool) _pr_ipv6_is_present; +-#ifdef DARWIN ++#if defined(DARWIN) || defined(FREEBSD) + static PRBool _pr_ipv6_v6only_on_by_default; + #endif + PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket() +@@ -3385,7 +3385,7 @@ + */ + osfd = socket(AF_INET6, SOCK_STREAM, 0); + if (osfd != -1) { +-#ifdef DARWIN ++#if defined(DARWIN) || defined(FREEBSD) + /* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option + * is turned on by default, contrary to what RFC 3493, Section + * 5.3 says. So we have to turn it off. Find out whether we +@@ -3452,7 +3452,7 @@ if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno); else { -+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \ -+ defined(__FreeBSD__) && defined(IPV6_V6ONLY) -+ if (domain == PR_AF_INET6) { -+ int opt = 0; -+ if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY, -+ &opt, sizeof(opt))) { -+ close(osfd); -+ return NULL; -+ } -+ } -+#endif - fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE); - if (fd == NULL) close(osfd); - } +-#ifdef DARWIN ++#if defined(DARWIN) || defined(FREEBSD) + if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default) + { + int on = 0; diff --git a/www/seamonkey2/files/patch-nsprpub_pr_src_misc_prtime.c b/www/seamonkey2/files/patch-nsprpub_pr_src_misc_prtime.c index 30f067cfaf56..f13ae2faa20e 100644 --- a/www/seamonkey2/files/patch-nsprpub_pr_src_misc_prtime.c +++ b/www/seamonkey2/files/patch-nsprpub_pr_src_misc_prtime.c @@ -1,11 +1,11 @@ --- nsprpub/pr/src/misc/prtime.c.orig Wed Feb 26 19:01:02 2003 -+++ nsprpub/pr/src/misc/prtime.c Sun Apr 6 19:22:10 2003 ++++ nsprpub/pr/src/misc/prtime.c Mon Jun 30 23:18:29 2003 @@ -1666,7 +1666,7 @@ */ #if defined(SUNOS4) || (__GLIBC__ >= 2) || defined(XP_BEOS) \ - || defined(NETBSD) -+ || defined(NETBSD) || defined(__FreeBSD__) ++ || defined(NETBSD) || defined(FREEBSD) a.tm_zone = NULL; a.tm_gmtoff = tm->tm_params.tp_gmt_offset + tm->tm_params.tp_dst_offset; #endif diff --git a/www/seamonkey2/files/patch-qt b/www/seamonkey2/files/patch-qt index 27f44eaa4cdb..b91018e33c15 100644 --- a/www/seamonkey2/files/patch-qt +++ b/www/seamonkey2/files/patch-qt @@ -1,14 +1,14 @@ ---- configure.orig Sat May 3 16:18:13 2003 -+++ configure Fri May 16 15:22:46 2003 -@@ -11851,9 +11851,9 @@ +--- configure.orig Wed Jul 9 17:58:01 2003 ++++ configure Wed Jul 23 00:42:51 2003 +@@ -11845,9 +11845,9 @@ -MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices" +MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector universalchardet typeaheadfind webservices" --MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm access-builtin datetime finger cview" -+MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm access-builtin datetime finger cview" +-MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm datetime finger cview layout-debug" ++MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm datetime finger cview layout-debug" # Check whether --enable-extensions or --disable-extensions was given. if test "${enable_extensions+set}" = set; then diff --git a/www/seamonkey2/files/patch-sparc64 b/www/seamonkey2/files/patch-sparc64 deleted file mode 100644 index b9cb83058235..000000000000 --- a/www/seamonkey2/files/patch-sparc64 +++ /dev/null @@ -1,69 +0,0 @@ -diff -ru ./nsprpub/pr/include/md/_freebsd.cfg ../../work~/mozilla/nsprpub/pr/include/md/_freebsd.cfg ---- ./nsprpub/pr/include/md/_freebsd.cfg Wed Jan 2 18:38:25 2002 -+++ ../../work~/mozilla/nsprpub/pr/include/md/_freebsd.cfg Tue May 20 21:27:31 2003 -@@ -138,6 +138,53 @@ - #define PR_ALIGN_OF_DOUBLE 8 - #define PR_ALIGN_OF_POINTER 8 - -+#elif defined(__sparc__) -+ -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+#define HAVE_LONG_LONG -+#define HAVE_ALIGNED_DOUBLES -+#define HAVE_ALIGNED_LONGLONGS -+#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_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 -+ - #else - - #error "Unknown CPU architecture" -diff -ru ./nsprpub/pr/include/md/_freebsd.h ../../work~/mozilla/nsprpub/pr/include/md/_freebsd.h ---- ./nsprpub/pr/include/md/_freebsd.h Thu Jan 16 15:09:12 2003 -+++ ../../work~/mozilla/nsprpub/pr/include/md/_freebsd.h Tue May 20 21:27:13 2003 -@@ -48,6 +48,8 @@ - #define _PR_SI_ARCHITECTURE "x86" - #elif defined(__alpha) - #define _PR_SI_ARCHITECTURE "alpha" -+#elif defined(__sparc__) -+#define _PR_SI_ARCHITECTURE "sparc" - #else - #error "Unknown CPU architecture" - #endif diff --git a/www/seamonkey2/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc b/www/seamonkey2/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc new file mode 100644 index 000000000000..ed281efd9234 --- /dev/null +++ b/www/seamonkey2/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc @@ -0,0 +1,11 @@ +--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Sun Jul 20 11:45:41 2003 ++++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Sun Jul 20 11:49:09 2003 +@@ -8,7 +8,7 @@ + * 1 is AddRef + * 2 is Release + */ +-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) ++#if !defined(__ia64) + XPTC_EXPORT NS_IMETHOD Stub3(); + XPTC_EXPORT NS_IMETHOD Stub4(); + XPTC_EXPORT NS_IMETHOD Stub5(); diff --git a/www/seamonkey2/files/patch-xpcom::reflect::xptcall::src::md::unix::Makefile.in b/www/seamonkey2/files/patch-xpcom::reflect::xptcall::src::md::unix::Makefile.in new file mode 100644 index 000000000000..5b911d47b2f9 --- /dev/null +++ b/www/seamonkey2/files/patch-xpcom::reflect::xptcall::src::md::unix::Makefile.in @@ -0,0 +1,50 @@ +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Sun Jul 20 18:16:25 2003 ++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Jul 20 11:58:05 2003 +@@ -59,13 +59,11 @@ + CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp + endif + endif +-# IA64 Linux +-ifneq (,$(filter Linux,$(OS_ARCH))) ++# IA64 Linux & FreeBSD + ifneq (,$(findstring ia64,$(OS_TEST))) + CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp + ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s + endif +-endif + # + # BeOS/Intel (uses the same unixish_x86 code) + # +@@ -106,9 +104,15 @@ + ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s + endif + # ++# FreeBSD/Alpha ++# ++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) ++CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp ++endif ++# + # Linux/Alpha + # +-ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) ++ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp + endif + # +@@ -292,6 +296,15 @@ + 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 ++# ++# FreeBSD/SPARC64 ++# ++ifeq ($(OS_ARCH),FreeBSD) ++ifneq (,$(findstring sparc,$(OS_TEST))) ++CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp ++ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s ++endif + endif + # + # Solaris/SPARC diff --git a/www/seamonkey2/files/patch-xptcall-ia64 b/www/seamonkey2/files/patch-xptcall-ia64 new file mode 100644 index 000000000000..9cd07f7ddbb2 --- /dev/null +++ b/www/seamonkey2/files/patch-xptcall-ia64 @@ -0,0 +1,38 @@ +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig Sun Jul 20 00:05:32 2003 ++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s Sun Jul 20 00:06:37 2003 +@@ -8,6 +8,7 @@ + // Section has executable code + .section .text, "ax","progbits" + // procedure named 'XPTC_InvokeByIndex' ++ .global XPTC_InvokeByIndex + .proc XPTC_InvokeByIndex + // manual bundling + .explicit +@@ -24,7 +25,7 @@ + + // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, + // PRUint32 paramCount, nsXPTCVariant* params); +-XPTC_InvokeByIndex:: ++XPTC_InvokeByIndex: + .prologue + .save ar.pfs, r37 + // allocate 4 input args, 6 local args, and 8 output args +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Sun Jul 20 00:02:02 2003 ++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Sun Jul 20 00:02:40 2003 +@@ -6,6 +6,7 @@ + // Section has executable code + .section .text, "ax","progbits" + // procedure named 'SharedStub' ++ .global SharedStub + .proc SharedStub + // manual bundling + .explicit +@@ -14,7 +15,7 @@ + // .exclass PrepareAndDispatch, @fullyvisible + .type PrepareAndDispatch,@function + +-SharedStub:: ++SharedStub: + // 9 arguments, first 8 are the input arguments of previous + // function call. The last one is methodIndex, and is passed in memory + .prologue diff --git a/www/seamonkey2/files/patch-xptcall-sparc64 b/www/seamonkey2/files/patch-xptcall-sparc64 index ea2773ced7d9..9599a8a71336 100644 --- a/www/seamonkey2/files/patch-xptcall-sparc64 +++ b/www/seamonkey2/files/patch-xptcall-sparc64 @@ -1,21 +1,3 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Mon May 26 13:26:01 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Mon May 26 13:30:04 2003 -@@ -287,6 +287,15 @@ - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s - endif - # -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s -+endif -+endif -+# - # Solaris/SPARC - # - ifeq ($(OS_ARCH),SunOS) --- /dev/null Mon May 26 13:22:00 2003 +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 @@ -0,0 +1,123 @@ |