summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2005-04-25 09:36:59 +0000
committerMartin Schlemmer <azarah@gentoo.org>2005-04-25 09:36:59 +0000
commit51190334d067d1f265328ab676cd43cedc4a8e8c (patch)
tree9fc394ad9e75fed30915a5f94b9e8983dab25a85 /dev-libs/nss/files
parentversion bump (diff)
downloadgentoo-2-51190334d067d1f265328ab676cd43cedc4a8e8c.tar.gz
gentoo-2-51190334d067d1f265328ab676cd43cedc4a8e8c.tar.bz2
gentoo-2-51190334d067d1f265328ab676cd43cedc4a8e8c.zip
Fix to build with gcc4. Patch from halcy0n's overlay.
(Portage version: 2.0.51.20-r4)
Diffstat (limited to 'dev-libs/nss/files')
-rw-r--r--dev-libs/nss/files/digest-nss-3.9.2-r31
-rw-r--r--dev-libs/nss/files/nss-3.9.2-gcc4.patch46
2 files changed, 47 insertions, 0 deletions
diff --git a/dev-libs/nss/files/digest-nss-3.9.2-r3 b/dev-libs/nss/files/digest-nss-3.9.2-r3
new file mode 100644
index 000000000000..c8fd29d3966d
--- /dev/null
+++ b/dev-libs/nss/files/digest-nss-3.9.2-r3
@@ -0,0 +1 @@
+MD5 c10b5100510dab1e3c94b76a4d7b1f23 nss-3.9.2.tar.gz 4734817
diff --git a/dev-libs/nss/files/nss-3.9.2-gcc4.patch b/dev-libs/nss/files/nss-3.9.2-gcc4.patch
new file mode 100644
index 000000000000..2d0a04949072
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.9.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;
+