Fix compilation on alpha #57057. Mark stable on x86 and alpha #59419.

4 files changed, 167 insertions, 16 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 8aab7fbde5a5..4eb514c01787 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.22 2004/08/05 19:42:52 squash Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.23 2004/08/06 02:18:24 agriffis Exp $
+
+  05 Aug 2004; <agriffis@gentoo.org>
+  +files/mozilla-alpha-xpcom-subs-fix.patch, mozilla-thunderbird-0.7.3.ebuild:
+  Fix compilation on alpha #57057.  Mark stable on x86 and alpha #59419.
 
   05 Aug 2004; Josh Grebe <squash@gentoo.org>
   mozilla-thunderbird-0.7.3.ebuild:
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index 18d9088c8098..b39a10918e50 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -1,22 +1,23 @@
-MD5 84ada914e9e9df6ea016e7923514f475 ChangeLog 693
-MD5 5dd0418c191830dfcfd74400e3f9608c metadata.xml 182
-MD5 7bb30b61e2e9161924ef4716efaa9ccf mozilla-thunderbird-0.6-r1.ebuild 8173
 MD5 581fe6cf90a85277fa118f7461b82612 mozilla-thunderbird-0.6-r2.ebuild 8561
-MD5 658015fd2e271c24a6133a1f4525d22c mozilla-thunderbird-0.7.1-r1.ebuild 8943
-MD5 b4f35fd5c0f308d527d81ec8c6446a1e mozilla-thunderbird-0.7.1.ebuild 8937
-MD5 72458cc5e27a04478156d0c1605d8ac4 mozilla-thunderbird-0.7.3.ebuild 4634
 MD5 0c306f55804cc4922b77c9012c691818 mozilla-thunderbird-0.7.ebuild 9379
-MD5 1adb062c6ed356e75ec53d1e35c9d350 files/MozillaThunderbird 302
+MD5 b4f35fd5c0f308d527d81ec8c6446a1e mozilla-thunderbird-0.7.1.ebuild 8937
+MD5 7bb30b61e2e9161924ef4716efaa9ccf mozilla-thunderbird-0.6-r1.ebuild 8173
+MD5 b0d6c3bdc4729662556ecee0d956e3ce mozilla-thunderbird-0.7.3.ebuild 4820
+MD5 658015fd2e271c24a6133a1f4525d22c mozilla-thunderbird-0.7.1-r1.ebuild 8943
+MD5 7acf8f3a5fb6010d4b6d88ca0037b0b0 ChangeLog 885
+MD5 5dd0418c191830dfcfd74400e3f9608c metadata.xml 182
+MD5 b8e2d94130909e157cb9797c7bad7807 files/digest-mozilla-thunderbird-0.7.1-r1 207
 MD5 0f0c19fd0806629d146784983456665e files/digest-mozilla-thunderbird-0.6-r1 205
 MD5 0f0c19fd0806629d146784983456665e files/digest-mozilla-thunderbird-0.6-r2 205
+MD5 1adb062c6ed356e75ec53d1e35c9d350 files/MozillaThunderbird 302
+MD5 1adb062c6ed356e75ec53d1e35c9d350 files/thunderbird 302
+MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
+MD5 2f72a8b70f733c46b922c38c3d9afb46 files/ipc-1.0.6-nsPipeChannel.patch 614
 MD5 01baaec335e2ea398d435042e5f32f88 files/digest-mozilla-thunderbird-0.7 208
+MD5 f014f20584305e86670ed50e990745db files/thunderbird-0.7-init.tar.bz2 3345
 MD5 6efbd38338dcc7e43d21b85ae1990422 files/digest-mozilla-thunderbird-0.7.1 207
-MD5 b8e2d94130909e157cb9797c7bad7807 files/digest-mozilla-thunderbird-0.7.1-r1 207
 MD5 63e247da983ffc7766b795be757e00e6 files/digest-mozilla-thunderbird-0.7.3 207
-MD5 2f72a8b70f733c46b922c38c3d9afb46 files/ipc-1.0.6-nsPipeChannel.patch 614
-MD5 1adb062c6ed356e75ec53d1e35c9d350 files/thunderbird 302
-MD5 f014f20584305e86670ed50e990745db files/thunderbird-0.7-init.tar.bz2 3345
+MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
+MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184
 MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560
 MD5 68a7617a6d3f0f37904cd6aaa90fe1ba files/enigmail/Makefile-ipc 1596
-MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184
-MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
diff --git a/mail-client/mozilla-thunderbird/files/mozilla-alpha-xpcom-subs-fix.patch b/mail-client/mozilla-thunderbird/files/mozilla-alpha-xpcom-subs-fix.patch
new file mode 100644
index 000000000000..c7f95467438a
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/mozilla-alpha-xpcom-subs-fix.patch
@@ -0,0 +1,139 @@
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp	2002-04-10 05:37:38.000000000 +0200
++++ mozilla-alpha/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp	2002-10-06 10:44:59.000000000 +0200
+@@ -20,6 +20,7 @@
+  * the Initial Developer. All Rights Reserved.
+  *
+  * Contributor(s):
++ *   Glen Nakamura <glen@imodulo.com>
+  *
+  * Alternatively, the contents of this file may be used under the terms of
+  * either the GNU General Public License Version 2 or later (the "GPL"), or 
+@@ -37,16 +38,14 @@
+ 
+ /* Platform specific code to invoke XPCOM methods on native objects */
+ 
+-/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
+-
+ #include "xptcprivate.h"
+ 
+ /* Prototype specifies unmangled function name and disables unused warning */
+-static void
++void
+ invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
+ __asm__("invoke_copy_to_stack") __attribute__((unused));
+ 
+-static void
++void
+ invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
+ {
+     const PRUint8 NUM_ARG_REGS = 6-1;        // -1 for "this" pointer
+@@ -163,7 +162,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,$31,$2\n\t"  /* vtable index = "methodIndex" * 8 */
++#else /* not G++ V3 ABI */
+     "s8addq $2,16,$2\n\t"   /* vtable index = "methodIndex" * 8 + 16 */
++#endif /* G++ V3 ABI */
+     "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 */
+@@ -176,4 +179,3 @@
+     "ret $31,($26),1\n\t"
+     ".end XPTC_InvokeByIndex"
+     );
+-
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp	2002-04-10 05:37:42.000000000 +0200
++++ mozilla-alpha/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp	2002-10-06 10:45:10.000000000 +0200
+@@ -20,6 +20,7 @@
+  * the Initial Developer. All Rights Reserved.
+  *
+  * Contributor(s):
++ *   Glen Nakamura <glen@imodulo.com>
+  *
+  * Alternatively, the contents of this file may be used under the terms of
+  * either the GNU General Public License Version 2 or later (the "GPL"), or 
+@@ -37,16 +38,14 @@
+ 
+ /* Implement shared vtbl methods. */
+ 
+-/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
+-
+ #include "xptcprivate.h"
+ 
+ /* Prototype specifies unmangled function name and disables unused warning */
+-static nsresult
++nsresult
+ PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
+ __asm__("PrepareAndDispatch") __attribute__((unused));
+ 
+-static nsresult
++nsresult
+ PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
+ {
+     const PRUint8 PARAM_BUFFER_COUNT = 16;
+@@ -188,23 +187,45 @@
+  * nsresult nsXPTCStubBase::Stub##n()
+  *  Sets register $1 to "methodIndex" and jumps to SharedStub.
+  */
++#define STUB_MANGLED_ENTRY(n, symbol) \
++    "#### Stub"#n" ####"      "\n\t" \
++    ".text"                   "\n\t" \
++    ".align 5"                "\n\t" \
++    ".globl " symbol          "\n\t" \
++    ".ent " symbol            "\n"   \
++symbol ":"                    "\n\t" \
++    ".frame $30,0,$26,0"      "\n\t" \
++    "ldgp $29,0($27)"         "\n"   \
++"$" symbol "..ng:"            "\n\t" \
++    ".prologue 1"             "\n\t" \
++    "lda $1,"#n               "\n\t" \
++    "br $31,$SharedStub..ng"  "\n\t" \
++    ".end " symbol
++
++#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
++
++#define STUB_ENTRY(n) \
++__asm__( \
++    ".if "#n" < 10"                                              "\n\t" \
++        STUB_MANGLED_ENTRY(n, "_ZN14nsXPTCStubBase5Stub"#n"Ev")  "\n\t" \
++    ".elseif "#n" < 100"                                         "\n\t" \
++        STUB_MANGLED_ENTRY(n, "_ZN14nsXPTCStubBase6Stub"#n"Ev")  "\n\t" \
++    ".elseif "#n" < 1000"                                        "\n\t" \
++        STUB_MANGLED_ENTRY(n, "_ZN14nsXPTCStubBase7Stub"#n"Ev")  "\n\t" \
++    ".else"                                                      "\n\t" \
++    ".err \"Stub"#n" >= 1000 not yet supported.\""               "\n\t" \
++    ".endif" \
++    );
++
++#else /* not G++ V3 ABI */
++
+ #define STUB_ENTRY(n) \
+ __asm__( \
+-    "#### Stub"#n" ####\n" \
+-".text\n\t" \
+-    ".align 5\n\t" \
+-    ".globl Stub"#n"__14nsXPTCStubBase\n\t" \
+-    ".ent Stub"#n"__14nsXPTCStubBase\n" \
+-"Stub"#n"__14nsXPTCStubBase:\n\t" \
+-    ".frame $30,0,$26,0\n\t" \
+-    "ldgp $29,0($27)\n" \
+-"$Stub"#n"__14nsXPTCStubBase..ng:\n\t" \
+-    ".prologue 1\n\t" \
+-    "lda $1,"#n"\n\t" \
+-    "br $31,$SharedStub..ng\n\t" \
+-    ".end Stub"#n"__14nsXPTCStubBase" \
++    STUB_MANGLED_ENTRY(n, "Stub"#n"__14nsXPTCStubBase") \
+     );
+ 
++#endif /* G++ V3 ABI */
++
+ #define SENTINEL_ENTRY(n) \
+ nsresult nsXPTCStubBase::Sentinel##n() \
+ { \
+@@ -213,4 +234,3 @@
+ }
+ 
+ #include "xptcstubsdef.inc"
+-
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.3.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.3.ebuild
index d841eceb7eb7..ad0ecc01469c 100644
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.3.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.3.ebuild,v 1.2 2004/08/05 19:42:52 squash Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.3.ebuild,v 1.3 2004/08/06 02:18:24 agriffis Exp $
 
 IUSE="crypt gtk2"
 
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/thund
 	 crypt? ( http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
 	   		  http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz )"
 
-KEYWORDS="~x86 ~ppc sparc ~alpha ~amd64 ~ia64"
+KEYWORDS="x86 ~ppc sparc alpha ~amd64 ~ia64"
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
 
@@ -34,6 +34,13 @@ src_unpack() {
 	unpack ${A} || die "unpack failed"
 	cd ${S} || die
 
+	if [[ $(gcc-major-version) -eq 3 ]]; then
+		# ABI Patch for alpha/xpcom for gcc-3.x
+		if [[ ${ARCH} == alpha ]]; then
+			epatch ${FILESDIR}/mozilla-alpha-xpcom-subs-fix.patch
+		fi
+	fi
+
 	# Unpack the enigmail plugin
 	if use crypt; then
 		for x in ipc enigmail; do