diff options
| author |   Mark Loeser <halcy0n@gentoo.org> | 2005-05-15 01:48:58 +0000 |
|---|---|---|
| committer | Mark Loeser <halcy0n@gentoo.org> | 2005-05-15 01:48:58 +0000 |
| commit | cf0195b814350ef93810b30d32d7a1b954045b99 (patch) | |
| tree | 2ca70395d0a3d47f5f577cc408f3e466d87508f7 /mail-client | |
| parent | gcc4 snapshot bump (diff) | |
| download | gentoo-2-cf0195b814350ef93810b30d32d7a1b954045b99.tar.gz gentoo-2-cf0195b814350ef93810b30d32d7a1b954045b99.tar.bz2 gentoo-2-cf0195b814350ef93810b30d32d7a1b954045b99.zip | |
gcc4 fix; bug #87800
(Portage version: 2.0.51.21-r1)
Diffstat (limited to 'mail-client')
4 files changed, 59 insertions, 4 deletions
diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog index 1988816b7282..e27b9696197a 100644 --- a/mail-client/mozilla-thunderbird/ChangeLog +++ b/mail-client/mozilla-thunderbird/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for mail-client/mozilla-thunderbird # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.56 2005/05/12 14:21:12 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.57 2005/05/15 01:48:57 halcy0n Exp $ + + 15 May 2005; Mark Loeser <halcy0n@gentoo.org> + +files/mozilla-thunderbird-1.0.2-gcc4.patch, + mozilla-thunderbird-1.0.2.ebuild: + Added GCC4 patch ; fixes bug #87800 12 May 2005; Aron Griffis <agriffis@gentoo.org> -files/ipc-1.0.6-nsPipeChannel.patch, -files/MozillaThunderbird, diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest index 2401d5f39e5f..96247703f5e1 100644 --- a/mail-client/mozilla-thunderbird/Manifest +++ b/mail-client/mozilla-thunderbird/Manifest @@ -1,9 +1,10 @@ -MD5 1a85324cfef54084ed0c4dbc5bc40284 mozilla-thunderbird-1.0.2.ebuild 6086 MD5 7ebefbb99172f118c0ca11611b2eb878 ChangeLog 6257 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160 +MD5 255020a6cc316737b852b4263ebe93e6 mozilla-thunderbird-1.0.2.ebuild 6159 +MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-thunderbird-1.0.2-gcc4.patch 1818 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953 MD5 e79634ee1e611182b6c227daa362b20d files/mozilla-thunderbird-0.9-4ft2.patch 22360 MD5 f014f20584305e86670ed50e990745db files/thunderbird-0.7-init.tar.bz2 3345 MD5 558a424a1a9905cedc4e7ef902e8c1c3 files/digest-mozilla-thunderbird-1.0.2 207 -MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499 MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184 +MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499 diff --git a/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.2-gcc4.patch b/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.2-gcc4.patch new file mode 100644 index 000000000000..2d0a04949072 --- /dev/null +++ b/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.2-gcc4.patch @@ -0,0 +1,46 @@ +diff -ur mozilla-orig/security/nss/lib/pki1/oiddata.h mozilla/security/nss/lib/pki1/oiddata.h +--- mozilla-orig/security/nss/lib/pki1/oiddata.h 2005-03-13 19:12:25.000000000 -0500 ++++ mozilla/security/nss/lib/pki1/oiddata.h 2005-03-13 19:15:19.000000000 -0500 +@@ -43,12 +43,6 @@ + #include "nsspki1t.h" + #endif /* NSSPKI1T_H */ + +-extern const NSSOID nss_builtin_oids[]; +-extern const PRUint32 nss_builtin_oid_count; +- +-/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/ +-/*extern const PRUint32 nss_attribute_type_alias_count;*/ +- + extern const NSSOID *NSS_OID_RFC1274_UID; + extern const NSSOID *NSS_OID_RFC1274_EMAIL; + extern const NSSOID *NSS_OID_RFC2247_DC; +diff -ur mozilla-orig/security/nss/lib/pki1/oidgen.perl mozilla/security/nss/lib/pki1/oidgen.perl +--- mozilla-orig/security/nss/lib/pki1/oidgen.perl 2005-03-13 19:12:25.000000000 -0500 ++++ mozilla/security/nss/lib/pki1/oidgen.perl 2005-03-13 19:15:19.000000000 -0500 +@@ -233,12 +233,6 @@ + #include "nsspki1t.h" + #endif /* NSSPKI1T_H */ + +-extern const NSSOID nss_builtin_oids[]; +-extern const PRUint32 nss_builtin_oid_count; +- +-/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/ +-/*extern const PRUint32 nss_attribute_type_alias_count;*/ +- + EOD + ; + +diff -ur mozilla-orig/security/nss/lib/pki1/pki1.h mozilla/security/nss/lib/pki1/pki1.h +--- mozilla-orig/security/nss/lib/pki1/pki1.h 2005-03-13 19:12:25.000000000 -0500 ++++ mozilla/security/nss/lib/pki1/pki1.h 2005-03-13 19:15:19.000000000 -0500 +@@ -55,7 +55,9 @@ + + PR_BEGIN_EXTERN_C + +-/* fgmr 19990505 moved these here from oiddata.h */ ++extern const NSSOID nss_builtin_oids[]; ++extern const PRUint32 nss_builtin_oid_count; ++ + extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[]; + extern const PRUint32 nss_attribute_type_alias_count; + diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2.ebuild index 33e1b39f88a7..483e523f8cd5 100644 --- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2.ebuild +++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2.ebuild,v 1.10 2005/04/15 19:44:24 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2.ebuild,v 1.11 2005/05/15 01:48:57 halcy0n Exp $ IUSE="crypt" @@ -46,6 +46,9 @@ src_unpack() { # https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65 epatch ${FILESDIR}/mozilla-thunderbird-0.9-4ft2.patch + # GCC 4 compile patch ; bug #87800 + epatch ${FILESDIR}/${P}-gcc4.patch + # Unpack the enigmail plugin if use crypt; then for x in ipc enigmail; do |