From 56edb6b56d7c15d8ee4be48d09371f8b53843785 Mon Sep 17 00:00:00 2001 From: martynas Date: Tue, 10 Apr 2007 18:07:43 +0000 Subject: [PATCH] - regen patches; - remove useless patch-mozilla_nsprpub_pr_include_private_primpl_h; no pkg changes = no pkgname bump ok maintainer ajacoutot@, kurt@ --- ...patch-mozilla_nsprpub_pr_include_private_primpl_h | 11 ----------- .../patch-mozilla_nsprpub_pr_src_misc_prdtoa_c | 12 ++++++------ .../patch-mozilla_nsprpub_pr_src_misc_prnetdb_c | 6 +++--- 3 files changed, 9 insertions(+), 20 deletions(-) delete mode 100644 devel/nspr/patches/patch-mozilla_nsprpub_pr_include_private_primpl_h diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_private_primpl_h b/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_private_primpl_h deleted file mode 100644 index 8af1e69369a..00000000000 --- a/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_private_primpl_h +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-mozilla_nsprpub_pr_include_private_primpl_h,v 1.3 2007/03/01 22:37:48 robert Exp $ ---- mozilla/nsprpub/pr/include/private/primpl.h.orig Fri Dec 1 02:34:11 2006 -+++ mozilla/nsprpub/pr/include/private/primpl.h Wed Feb 7 13:14:08 2007 -@@ -1869,6 +1869,7 @@ extern void _PR_DestroyZones(void); - && !defined(DARWIN) \ - && !defined(NEXTSTEP) \ - && !defined(QNX) \ -+ && !defined(__OpenBSD__) \ - && !(defined (UNIXWARE) && defined (USE_SVR4_THREADS)) - #define _PR_OVERRIDE_MALLOC - #endif diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prdtoa_c b/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prdtoa_c index af1d427880f..fd99f2a429d 100644 --- a/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prdtoa_c +++ b/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prdtoa_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.2 2007/03/01 22:37:48 robert Exp $ +$OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.3 2007/04/10 18:07:43 martynas Exp $ --- mozilla/nsprpub/pr/src/misc/prdtoa.c.orig Fri Dec 22 00:45:54 2006 -+++ mozilla/nsprpub/pr/src/misc/prdtoa.c Wed Feb 7 15:06:43 2007 ++++ mozilla/nsprpub/pr/src/misc/prdtoa.c Tue Apr 10 21:03:50 2007 @@ -37,41 +37,14 @@ #include "primpl.h" @@ -3383,7 +3383,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.2 2007/03/01 22:37:48 r PR_IMPLEMENT(PRStatus) PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits, -@@ -3403,7 +155,7 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn +@@ -3403,7 +155,7 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits, PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); return rv; } @@ -3392,7 +3392,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.2 2007/03/01 22:37:48 r if (!result) { PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0); return rv; -@@ -3418,7 +170,7 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn +@@ -3418,7 +170,7 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits, } rv = PR_SUCCESS; } @@ -3401,7 +3401,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.2 2007/03/01 22:37:48 r return rv; } -@@ -3434,13 +186,15 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn +@@ -3434,13 +186,15 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits, ** '+' or '-' after the 'e' in scientific notation */ PR_IMPLEMENT(void) @@ -3418,7 +3418,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.2 2007/03/01 22:37:48 r /* If anything fails, we store an empty string in 'buf' */ num = (char*)PR_MALLOC(bufsz); if (num == NULL) { -@@ -3448,7 +202,7 @@ PR_cnvtf(char *buf,int bufsz, int prcsn, +@@ -3448,7 +202,7 @@ PR_cnvtf(char *buf,int bufsz, int prcsn,double fval) return; } /* XXX Why use mode 1? */ diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prnetdb_c b/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prnetdb_c index 43badf3e996..c214d980f47 100644 --- a/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prnetdb_c +++ b/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prnetdb_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prnetdb_c,v 1.3 2006/11/23 09:36:03 ajacoutot Exp $ +$OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prnetdb_c,v 1.4 2007/04/10 18:07:43 martynas Exp $ --- mozilla/nsprpub/pr/src/misc/prnetdb.c.orig Tue Nov 14 19:41:59 2006 -+++ mozilla/nsprpub/pr/src/misc/prnetdb.c Wed Nov 22 17:15:25 2006 -@@ -2115,7 +2115,12 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf ++++ mozilla/nsprpub/pr/src/misc/prnetdb.c Tue Apr 10 21:03:50 2007 +@@ -2115,7 +2115,12 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInfoByName(const */ hints.ai_socktype = SOCK_STREAM;