diff options
author | taya <taya> | 2004-12-04 02:16:03 +0000 |
---|---|---|
committer | taya <taya> | 2004-12-04 02:16:03 +0000 |
commit | 5428650741f9614aae9f8f26b2b4624f268e52c6 (patch) | |
tree | 56efe9fd14fcda71fb727abf3caa6f8ad6e62e9a /mail | |
parent | a90dc0c455e6e69bba03d954a3607825fd738265 (diff) | |
download | pkgsrc-5428650741f9614aae9f8f26b2b4624f268e52c6.tar.gz |
1)Generate extension directory at installation time.
2)sync patches from www/mozilla.
- update patch-ab
from commit log
>> date: 2004/08/31 02:37:57; author: danw; state: Exp; lines: +13 -6
>> darwin fixes (tested against firefox-gtk2)
- update patch-ac
- update patch-bx
- add patch-bz
- add patch-ca
- add patch-cb
from commit log
>> date: 2004/07/07 09:08:31; author: aymeric; state: Exp; lines: +14 -7
>> . on PowerPC, update files so that Mozilla works properly when compiled with
>> gcc version 3+.
>> . generally reduce diffs to Linux version
>> . retain compatibility with older ABI (AIX-like) thanks to useful comments
>> from Charles Hannum
>>
>> Thanks to Matthew Green for the fruitful discussion. This should address
>> PR#23240 as far as mozilla is concerned.
- remove patch-bn
enable HAVE_SOCKLEN_T
- update patch-br
from commit log
>> date: 2004/10/04 11:52:45; author: grant; state: Exp; lines: +10 -6
>> bring across a patch in Firefox for using thread-safe resolver library
>> functions on NetBSD >=2.0F.
- update patch-cc
make mozilla work on NetBSD-current/alpha
3)bump PKGREVISION
Diffstat (limited to 'mail')
-rw-r--r-- | mail/thunderbird-gtk2/PLIST | 4 | ||||
-rw-r--r-- | mail/thunderbird/Makefile-thunderbird.common | 8 | ||||
-rw-r--r-- | mail/thunderbird/PLIST | 4 | ||||
-rw-r--r-- | mail/thunderbird/distinfo | 15 | ||||
-rw-r--r-- | mail/thunderbird/patches/patch-ab | 21 | ||||
-rw-r--r-- | mail/thunderbird/patches/patch-ac | 23 | ||||
-rw-r--r-- | mail/thunderbird/patches/patch-bn | 18 | ||||
-rw-r--r-- | mail/thunderbird/patches/patch-br | 18 | ||||
-rw-r--r-- | mail/thunderbird/patches/patch-bx | 53 | ||||
-rw-r--r-- | mail/thunderbird/patches/patch-bz | 122 | ||||
-rw-r--r-- | mail/thunderbird/patches/patch-ca | 166 | ||||
-rw-r--r-- | mail/thunderbird/patches/patch-cb | 26 | ||||
-rw-r--r-- | mail/thunderbird/patches/patch-cc | 16 |
13 files changed, 428 insertions, 66 deletions
diff --git a/mail/thunderbird-gtk2/PLIST b/mail/thunderbird-gtk2/PLIST index e37af5499b5..e4b87eee9fe 100644 --- a/mail/thunderbird-gtk2/PLIST +++ b/mail/thunderbird-gtk2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2004/11/14 23:38:20 taya Exp $ +@comment $NetBSD: PLIST,v 1.6 2004/12/04 02:16:03 taya Exp $ bin/${MOZILLA} @comment begin PROGRAMS lib/${MOZILLA}/${MOZILLA_BIN} @@ -2587,6 +2587,7 @@ include/${MOZILLA}/zlib/zlib.h @comment end INCLUDE @exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom @exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regchrome +@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/${MOZILLA_BIN} -register @unexec ${RM} %D/lib/${MOZILLA}/chrome/chrome.rdf @unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/browser/content/overlays.rdf @unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/communicator/content/overlays.rdf @@ -2636,7 +2637,6 @@ include/${MOZILLA}/zlib/zlib.h @dirrm lib/${MOZILLA}/chrome/icons/default @dirrm lib/${MOZILLA}/chrome/icons @dirrm lib/${MOZILLA}/chrome -@dirrm lib/${MOZILLA} @dirrm include/${MOZILLA}/zlib @dirrm include/${MOZILLA}/xultmpl @dirrm include/${MOZILLA}/xuldoc diff --git a/mail/thunderbird/Makefile-thunderbird.common b/mail/thunderbird/Makefile-thunderbird.common index 56ad42d4c16..c8b2aac934a 100644 --- a/mail/thunderbird/Makefile-thunderbird.common +++ b/mail/thunderbird/Makefile-thunderbird.common @@ -1,7 +1,8 @@ -# $NetBSD: Makefile-thunderbird.common,v 1.3 2004/11/14 23:38:20 taya Exp $ +# $NetBSD: Makefile-thunderbird.common,v 1.4 2004/12/04 02:16:03 taya Exp $ MOZILLA_BIN= thunderbird-bin MOZ_VER= 0.9 +PKGREVISION= 1 EXTRACT_SUFX= .tar.bz2 DISTNAME= thunderbird-${MOZ_VER}-source MASTER_SITES= http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${MOZ_VER}/ \ @@ -24,4 +25,9 @@ pre-install: ${MV} ${WRKSRC}/dist/bin/extensions/installed-extensions.txt \ ${WRKSRC}/dist/bin/extensions/installed-extensions-processed.txt +post-install: + cd ${PREFIX}/lib/${MOZILLA} && \ + ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. HOME=${WRKSRC} \ + ./${MOZILLA_BIN} -register + .include "../../www/mozilla/Makefile.common" diff --git a/mail/thunderbird/PLIST b/mail/thunderbird/PLIST index 5f738c3ebfe..5cc955c80f2 100644 --- a/mail/thunderbird/PLIST +++ b/mail/thunderbird/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2004/11/14 23:38:20 taya Exp $ +@comment $NetBSD: PLIST,v 1.7 2004/12/04 02:16:03 taya Exp $ bin/${MOZILLA} @comment begin PROGRAMS lib/${MOZILLA}/${MOZILLA_BIN} @@ -2575,6 +2575,7 @@ include/${MOZILLA}/zlib/zlib.h @comment end INCLUDE @exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom @exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regchrome +@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/${MOZILLA_BIN} -register @unexec ${RM} %D/lib/${MOZILLA}/chrome/chrome.rdf @unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/browser/content/overlays.rdf @unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/communicator/content/overlays.rdf @@ -2624,7 +2625,6 @@ include/${MOZILLA}/zlib/zlib.h @dirrm lib/${MOZILLA}/chrome/icons/default @dirrm lib/${MOZILLA}/chrome/icons @dirrm lib/${MOZILLA}/chrome -@dirrm lib/${MOZILLA} @dirrm include/${MOZILLA}/zlib @dirrm include/${MOZILLA}/xultmpl @dirrm include/${MOZILLA}/xuldoc diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index 354c5eb9e11..650eeb5ca96 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.9 2004/11/14 23:38:20 taya Exp $ +$NetBSD: distinfo,v 1.10 2004/12/04 02:16:03 taya Exp $ SHA1 (thunderbird-0.9-source.tar.bz2) = a818a1f471935379da1e364c5da3457446c1d53a Size (thunderbird-0.9-source.tar.bz2) = 33197138 bytes SHA1 (patch-aa) = 9225a7a2c9b4545e800008169d4d88452c85d1a9 -SHA1 (patch-ab) = 0c1f2d6cca09b4dd6b168ed29d84d245967a3369 -SHA1 (patch-ac) = e9bc27529cf595ab6f120d9021dd7d6c49112084 +SHA1 (patch-ab) = 77038a3dee47573782d912a928327d046c6d3c7f +SHA1 (patch-ac) = 32aa4b92eea19aca07077a292cb759d074026642 SHA1 (patch-ad) = 19afc8dfaf9f14439d747e42ee2f64a9c1a9dc3d SHA1 (patch-ae) = 364b91f0bf51e49bb140e13dfb775a89ea38bb28 SHA1 (patch-af) = 6addfc2bd0b3e3aaefff6cce6836384ca44baf30 @@ -21,14 +21,17 @@ SHA1 (patch-ax) = 2421096cf84bd174cfe576db855cca2338615495 SHA1 (patch-ba) = a0d70d713d2d4746d9128724c382b019f353f5af SHA1 (patch-bb) = 9ba4bcd86e581496bbc6b40b3a3f062dfd5e416f SHA1 (patch-bm) = 6bd7bf1262cec43b0324693d43929497c3fb3991 -SHA1 (patch-bn) = d31d2b2c3712abdd766e9fa0cee147d7c8936cd4 SHA1 (patch-bo) = 357c4cacdc179191d6fe263b4eb62cc56b7ec25f SHA1 (patch-bq) = 3b8a951828b0e6906e4352027b4d36c9b1f8aaae -SHA1 (patch-br) = aa48e974306fdbfc1e71b5fd9c1f5d18771143f5 +SHA1 (patch-br) = 52d5b595f1e25ac5d6664864ab0cbe5e14012168 SHA1 (patch-bs) = 81065130c96bf966b22e6abb767a5b674dcb52cb SHA1 (patch-bt) = 6e3ceb31866dfb0dba81c93446db2b21e1df9baa SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860 SHA1 (patch-bw) = fc3a518d3762be6e85104a6dc7fffd5ae1a463c8 -SHA1 (patch-bx) = 721c58f89c829ec3dfd72a311d49c211833b107c +SHA1 (patch-bx) = 046e19c9c4b431369411658373b14c1822841d85 SHA1 (patch-by) = 643185af7a0df7030b2b96447ee4031dc9c82f88 +SHA1 (patch-bz) = 6f854d74a9d1d1174ce8eff7d65f8024a7da4711 +SHA1 (patch-ca) = 479ef14631ae019ae5ca1c08a2f786294f3e972b +SHA1 (patch-cb) = fd0f033d63be066ce5c47057d72c48a085718908 +SHA1 (patch-cc) = cb08d4b7330c9e471d172c11772c840e613ceb76 diff --git a/mail/thunderbird/patches/patch-ab b/mail/thunderbird/patches/patch-ab index 0116bc12431..f4f4226db19 100644 --- a/mail/thunderbird/patches/patch-ab +++ b/mail/thunderbird/patches/patch-ab @@ -1,9 +1,16 @@ -$NetBSD: patch-ab,v 1.3 2004/06/24 23:09:55 taya Exp $ +$NetBSD: patch-ab,v 1.4 2004/12/04 02:16:03 taya Exp $ -diff -ru ../Orig/mozilla/configure.in ./configure.in ---- ../Orig/mozilla/configure.in 2004-05-14 06:57:46.000000000 +0900 -+++ ./configure.in 2004-06-15 23:55:39.000000000 +0900 -@@ -1017,6 +1017,9 @@ +--- 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 @@ -13,7 +20,7 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in ;; *-hpux*) -@@ -1308,6 +1311,13 @@ +@@ -1308,6 +1310,13 @@ case "$target" in if test "$LIBRUNPATH"; then DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" fi @@ -27,7 +34,7 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in ;; *-nto*) -@@ -1531,7 +1541,7 @@ +@@ -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='' diff --git a/mail/thunderbird/patches/patch-ac b/mail/thunderbird/patches/patch-ac index 28a1d297626..9450018df2d 100644 --- a/mail/thunderbird/patches/patch-ac +++ b/mail/thunderbird/patches/patch-ac @@ -1,9 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2004/06/24 23:09:55 taya Exp $ +$NetBSD: patch-ac,v 1.4 2004/12/04 02:16:03 taya Exp $ -diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/reflect/xptcall/src/md/unix/Makefile.in ---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2004-04-23 05:50:05.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in 2004-06-15 23:55:43.000000000 +0900 -@@ -49,6 +49,9 @@ +--- 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 @@ -13,7 +12,7 @@ diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/r endif # # New code for Linux, et. al., with gcc -@@ -140,7 +143,7 @@ +@@ -140,7 +143,7 @@ endif # NetBSD/ARM # ifeq ($(OS_ARCH),NetBSD) @@ -22,7 +21,7 @@ diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/r CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp endif endif -@@ -174,7 +177,7 @@ +@@ -174,7 +177,7 @@ endif # NetBSD/m68k # ifeq ($(OS_ARCH),NetBSD) @@ -31,7 +30,15 @@ diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/r CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp endif endif -@@ -305,6 +308,13 @@ +@@ -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 diff --git a/mail/thunderbird/patches/patch-bn b/mail/thunderbird/patches/patch-bn deleted file mode 100644 index 03df32a4669..00000000000 --- a/mail/thunderbird/patches/patch-bn +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-bn,v 1.3 2004/06/24 23:09:56 taya Exp $ - -diff -ru ../Orig/mozilla/xpcom/io/nsNativeCharsetUtils.cpp ./xpcom/io/nsNativeCharsetUtils.cpp ---- ../Orig/mozilla/xpcom/io/nsNativeCharsetUtils.cpp 2004-05-28 03:55:10.000000000 +0900 -+++ ./xpcom/io/nsNativeCharsetUtils.cpp 2004-06-15 23:56:38.000000000 +0900 -@@ -295,7 +295,12 @@ - { - const char *blank_list[] = { "", NULL }; - const char **native_charset_list = blank_list; -+#ifdef CODESET - const char *native_charset = nl_langinfo(CODESET); -+#else -+ const char *native_charset = nsnull; -+#endif -+ - if (native_charset == nsnull) { - NS_ERROR("native charset is unknown"); - // fallback to ISO-8859-1 diff --git a/mail/thunderbird/patches/patch-br b/mail/thunderbird/patches/patch-br index 5ab290769df..ade9658ea16 100644 --- a/mail/thunderbird/patches/patch-br +++ b/mail/thunderbird/patches/patch-br @@ -1,17 +1,21 @@ -$NetBSD: patch-br,v 1.3 2004/06/24 23:09:56 taya Exp $ +$NetBSD: patch-br,v 1.4 2004/12/04 02:16:03 taya Exp $ -diff -ru ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c ./nsprpub/pr/src/misc/prnetdb.c ---- ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c 2004-01-23 07:22:37.000000000 +0900 -+++ ./nsprpub/pr/src/misc/prnetdb.c 2004-06-15 23:56:46.000000000 +0900 -@@ -2094,7 +2094,12 @@ +--- 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; -+ LOCK_DNS(); ++/* NetBSD 2.0F */ ++#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 200060000 ++ LOCK_DNS(); ++#endif + rv = GETADDRINFO(hostname, NULL, &hints, &res); + -+ UNLOCK_DNS(); ++#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 200060000 ++ UNLOCK_DNS(); ++#endif + if (rv == 0) return (PRAddrInfo *) res; diff --git a/mail/thunderbird/patches/patch-bx b/mail/thunderbird/patches/patch-bx index 78b813996bc..33599cd0713 100644 --- a/mail/thunderbird/patches/patch-bx +++ b/mail/thunderbird/patches/patch-bx @@ -1,13 +1,45 @@ -$NetBSD: patch-bx,v 1.1 2004/06/24 23:09:56 taya Exp $ +$NetBSD: patch-bx,v 1.2 2004/12/04 02:16:03 taya Exp $ -diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp ---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp 2001-09-29 05:12:53.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp 2004-06-15 23:56:59.000000000 +0900 -@@ -195,6 +195,47 @@ +--- 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 ;-). -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ +-#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 @@ -23,7 +55,6 @@ diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd. + +# define STUB_ENTRY(n) \ +__asm__ ( \ -+ ".section \".text\" \n\t" \ + ".align 2 \n\t" \ + ".if "#n" < 10 \n\t" \ + ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \ @@ -47,14 +78,6 @@ diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd. + "li 11,"#n" \n\t" \ + "b SharedStub@local \n" \ +); -+#else - #define STUB_ENTRY(n) \ - __asm__ ( \ - ".section \".text\" \n\t" \ -@@ -206,6 +247,7 @@ - "li 11,"#n" \n\t" \ - "b SharedStub@local \n" \ - ); +#endif #define SENTINEL_ENTRY(n) \ diff --git a/mail/thunderbird/patches/patch-bz b/mail/thunderbird/patches/patch-bz new file mode 100644 index 00000000000..40091b2f76e --- /dev/null +++ b/mail/thunderbird/patches/patch-bz @@ -0,0 +1,122 @@ +$NetBSD: patch-bz,v 1.1 2004/12/04 02:16:03 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/mail/thunderbird/patches/patch-ca b/mail/thunderbird/patches/patch-ca new file mode 100644 index 00000000000..89e433dc1b8 --- /dev/null +++ b/mail/thunderbird/patches/patch-ca @@ -0,0 +1,166 @@ +$NetBSD: patch-ca,v 1.1 2004/12/04 02:16:03 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/mail/thunderbird/patches/patch-cb b/mail/thunderbird/patches/patch-cb new file mode 100644 index 00000000000..78e1f5f9b57 --- /dev/null +++ b/mail/thunderbird/patches/patch-cb @@ -0,0 +1,26 @@ +$NetBSD: patch-cb,v 1.1 2004/12/04 02:16:03 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/mail/thunderbird/patches/patch-cc b/mail/thunderbird/patches/patch-cc new file mode 100644 index 00000000000..c0d4b1cfc7e --- /dev/null +++ b/mail/thunderbird/patches/patch-cc @@ -0,0 +1,16 @@ +$NetBSD: patch-cc,v 1.1 2004/12/04 02:16:03 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 */ |