Update to nspr 4.8.7, required by ffx4.0b8 and later, and

soon-to-be-required by stable releases in other mozilla branches.
ok sthen@ martynas@
This commit is contained in:
landry 2011-01-15 16:58:28 +00:00
parent cda8ae9bae
commit 32a276b54e
5 changed files with 29 additions and 28 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.33 2011/01/03 13:21:04 landry Exp $
# $OpenBSD: Makefile,v 1.34 2011/01/15 16:58:28 landry Exp $
# $FreeBSD: /repoman/r/pcvs/ports/devel/nspr/Makefile,v 1.13 2003/12/13 21:30:19 peter Exp $
ONLY_FOR_ARCHS= alpha amd64 arm i386 mips64 mips64el powerpc sparc sparc64 hppa
@ -6,10 +6,9 @@ ONLY_FOR_ARCHS= alpha amd64 arm i386 mips64 mips64el powerpc sparc sparc64 hppa
COMMENT-main= Netscape Portable Runtime
COMMENT-docs= HTML Documentation for NSPR
VER= 4.8.6
VER= 4.8.7
DISTNAME= nspr-${VER}
PKGNAME-main= ${DISTNAME}
REVISION-main= 0
PKGNAME-docs= nspr-docs-${VER}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
nspr-reference${EXTRACT_SUFX}:0

View File

@ -1,10 +1,10 @@
MD5 (nspr-4.8.6.tar.gz) = WSwnVyjCnRk/26gAkWWZCw==
MD5 (nspr-4.8.7.tar.gz) = l+MJiaVquBNFO3EmGEnCAA==
MD5 (nspr-reference.tar.gz) = jZRQOnk+OzIiUnYci0jz4A==
RMD160 (nspr-4.8.6.tar.gz) = Md5u7s1MwjFc+4TQLLlzDNPAlyk=
RMD160 (nspr-4.8.7.tar.gz) = ubcfrTmZSbufqvqGPXJIPDZ43cM=
RMD160 (nspr-reference.tar.gz) = 4eQ4pZI64spNagflIfhYo+D3wcY=
SHA1 (nspr-4.8.6.tar.gz) = VMo8vhTMiipZy0jUlhA0zjXI8iM=
SHA1 (nspr-4.8.7.tar.gz) = NNnrdbR6PRm1fvHtWu8gBOebX8Q=
SHA1 (nspr-reference.tar.gz) = mihC1ynB3kmPoYRmevtjk5qdcec=
SHA256 (nspr-4.8.6.tar.gz) = 2QQLsBU2+mOIHEI8T6gx6kWWlrMtIJf2FIQvgk4an20=
SHA256 (nspr-4.8.7.tar.gz) = 65RZwx1D0QAPsTBPHgztqwvaw8VMcZiCWcGsEMH+FqM=
SHA256 (nspr-reference.tar.gz) = zhhZrKNh2VTVMaJ+qR7AzZwW8lssI0mT1E5+d1gHiwo=
SIZE (nspr-4.8.6.tar.gz) = 1202257
SIZE (nspr-4.8.7.tar.gz) = 1244150
SIZE (nspr-reference.tar.gz) = 195121

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_nsprpub_configure_in,v 1.10 2010/08/30 20:12:55 landry Exp $
--- mozilla/nsprpub/configure.in.orig Fri Jul 9 04:30:36 2010
+++ mozilla/nsprpub/configure.in Sun Aug 1 13:16:27 2010
@@ -1987,9 +1987,11 @@ mips-sony-newsos*)
$OpenBSD: patch-mozilla_nsprpub_configure_in,v 1.11 2011/01/15 16:58:29 landry Exp $
--- mozilla/nsprpub/configure.in.orig Fri Oct 15 17:35:59 2010
+++ mozilla/nsprpub/configure.in Thu Jan 13 14:04:27 2011
@@ -2003,9 +2003,11 @@ mips-sony-newsos*)
AC_DEFINE(OPENBSD)
AC_DEFINE(HAVE_BSD_FLOCK)
AC_DEFINE(HAVE_SOCKLEN_T)
@ -14,7 +14,7 @@ $OpenBSD: patch-mozilla_nsprpub_configure_in,v 1.10 2010/08/30 20:12:55 landry E
DSO_CFLAGS=-fPIC
MDCPUCFG_H=_openbsd.cfg
PR_MD_CSRCS=openbsd.c
@@ -3087,6 +3089,7 @@ config/autoconf.mk
@@ -3123,6 +3125,7 @@ config/autoconf.mk
config/nsprincl.mk
config/nsprincl.sh
config/nspr-config

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.6 2010/08/30 20:12:55 landry Exp $
--- mozilla/nsprpub/pr/src/misc/prdtoa.c.orig Sun Mar 28 20:26:57 2010
+++ mozilla/nsprpub/pr/src/misc/prdtoa.c Wed Aug 4 21:23:17 2010
@@ -48,42 +48,14 @@
$OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.7 2011/01/15 16:58:29 landry Exp $
--- mozilla/nsprpub/pr/src/misc/prdtoa.c.orig Sat Aug 7 07:33:14 2010
+++ mozilla/nsprpub/pr/src/misc/prdtoa.c Sat Jan 15 11:39:05 2011
@@ -48,44 +48,14 @@
#include "primpl.h"
#include "prbit.h"
@ -40,11 +40,13 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.6 2010/08/30 20:12:55 l
-#define Long PRInt32
-#define ULong PRUint32
-#define NO_LONG_LONG
-
-#define No_Hex_NaN
-
/****************************************************************
*
* The author of this software is David M. Gay.
@@ -103,3326 +75,82 @@ void _PR_CleanupDtoa(void)
@@ -105,3326 +75,82 @@ void _PR_CleanupDtoa(void)
*
***************************************************************/
@ -3407,7 +3409,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.6 2010/08/30 20:12:55 l
PR_IMPLEMENT(PRStatus)
PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits,
@@ -3438,7 +166,7 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits,
@@ -3440,7 +166,7 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits,
PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
return rv;
}
@ -3416,7 +3418,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.6 2010/08/30 20:12:55 l
if (!result) {
PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
return rv;
@@ -3453,7 +181,7 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits,
@@ -3455,7 +181,7 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits,
}
rv = PR_SUCCESS;
}
@ -3425,7 +3427,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.6 2010/08/30 20:12:55 l
return rv;
}
@@ -3475,9 +203,9 @@ PR_cnvtf(char *buf, int bufsz, int prcsn, double dfval
@@ -3477,9 +203,9 @@ PR_cnvtf(char *buf, int bufsz, int prcsn, double dfval
char *num, *nump;
char *bufp = buf;
char *endnum;
@ -3437,7 +3439,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.6 2010/08/30 20:12:55 l
/* If anything fails, we store an empty string in 'buf' */
num = (char*)PR_MALLOC(bufsz);
if (num == NULL) {
@@ -3485,7 +213,7 @@ PR_cnvtf(char *buf, int bufsz, int prcsn, double dfval
@@ -3487,7 +213,7 @@ PR_cnvtf(char *buf, int bufsz, int prcsn, double dfval
return;
}
/* XXX Why use mode 1? */

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prinit_c,v 1.6 2010/08/30 20:12:55 landry Exp $
--- mozilla/nsprpub/pr/src/misc/prinit.c.orig Sun Jul 11 19:14:38 2010
+++ mozilla/nsprpub/pr/src/misc/prinit.c Sun Aug 1 13:16:28 2010
@@ -416,8 +416,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
$OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prinit_c,v 1.7 2011/01/15 16:58:29 landry Exp $
--- mozilla/nsprpub/pr/src/misc/prinit.c.orig Sat Aug 28 03:33:09 2010
+++ mozilla/nsprpub/pr/src/misc/prinit.c Thu Jan 13 14:04:28 2011
@@ -412,8 +412,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
_PR_CleanupDtoa();
_PR_CleanupCallOnce();
_PR_ShutdownLinker();
@ -10,7 +10,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prinit_c,v 1.6 2010/08/30 20:12:55 l
/* Release the primordial thread's private data, etc. */
_PR_CleanupThread(me);
@@ -428,6 +426,12 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
@@ -424,6 +422,12 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
_PR_LogCleanup();
/*
@ -23,7 +23,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prinit_c,v 1.6 2010/08/30 20:12:55 l
* This part should look like the end of _PR_NativeRunThread
* and _PR_UserRunThread.
*/
@@ -439,6 +443,7 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
@@ -435,6 +439,7 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
PR_DELETE(me->stack);
PR_DELETE(me);
}