diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2005-04-26 10:06:22 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2005-04-26 10:06:22 +0000 |
| commit | a33926e14474a8fc49e2fc0dcb67121a0aa4ac5f (patch) | |
| tree | a8f8b6b14c7b9245c17ac3bc6b06a96239f209ae /net-libs/gecko-sdk | |
| parent | closing bug #90429 (diff) | |
| download | gentoo-2-a33926e14474a8fc49e2fc0dcb67121a0aa4ac5f.tar.gz gentoo-2-a33926e14474a8fc49e2fc0dcb67121a0aa4ac5f.tar.bz2 gentoo-2-a33926e14474a8fc49e2fc0dcb67121a0aa4ac5f.zip | |
Fix building with gcc4. Patch from halcy0n's overlay.
(Portage version: 2.0.51.20-r4)
Diffstat (limited to 'net-libs/gecko-sdk')
| -rw-r--r-- | net-libs/gecko-sdk/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/gecko-sdk/files/gecko-sdk-1.7.5-gcc4.patch | 46 | ||||
| -rw-r--r-- | net-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild | 5 |
3 files changed, 55 insertions, 2 deletions
diff --git a/net-libs/gecko-sdk/ChangeLog b/net-libs/gecko-sdk/ChangeLog index 2692abd7861c..e520dc2cfd30 100644 --- a/net-libs/gecko-sdk/ChangeLog +++ b/net-libs/gecko-sdk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/gecko-sdk # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/ChangeLog,v 1.9 2005/04/16 13:14:40 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/ChangeLog,v 1.10 2005/04/26 10:06:22 azarah Exp $ + + 26 Apr 2005; Martin Schlemmer <azarah@gentoo.org> + +files/gecko-sdk-1.7.5-gcc4.patch, gecko-sdk-1.7.5.ebuild: + Fix building with gcc4. Patch from halcy0n's overlay. 15 Apr 2005; Joseph Jezak <josejx@gentoo.org> -gecko-sdk-1.7.3.ebuild, gecko-sdk-1.7.5.ebuild: diff --git a/net-libs/gecko-sdk/files/gecko-sdk-1.7.5-gcc4.patch b/net-libs/gecko-sdk/files/gecko-sdk-1.7.5-gcc4.patch new file mode 100644 index 000000000000..2d0a04949072 --- /dev/null +++ b/net-libs/gecko-sdk/files/gecko-sdk-1.7.5-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/net-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild b/net-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild index 5e429c345818..8791fc7fd66c 100644 --- a/net-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild +++ b/net-libs/gecko-sdk/gecko-sdk-1.7.5.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/net-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild,v 1.4 2005/04/16 13:14:40 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild,v 1.5 2005/04/26 10:06:22 azarah Exp $ unset ALLOWED_FLAGS # stupid extra-functions.sh ... bug 49179 inherit flag-o-matic gcc eutils nsplugins mozilla-launcher mozconfig makeedit multilib @@ -77,6 +77,9 @@ src_unpack() { epatch ${PORTDIR}/www-client/mozilla/files/svg-cairo-0.3.0-fix.patch fi + # Fix building with gcc4 + epatch ${FILESDIR}/${P}-gcc4.patch + # Fix scripts that call for /usr/local/bin/perl #51916 ebegin "Patching smime to call perl from /usr/bin" sed -i -e '1s,usr/local/bin,usr/bin,' security/nss/cmd/smimetools/smime |