cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to nspr 4.9.5.

Browse Source 
After two years of discussion in bug #634793 and countless hours lost on
filing followup bugs at each type mismatch, nspr upstream finally got
convinced that on OpenBSD uint64_t was unsigned long long, and there was
no reason at all to define PRUint64 as unsigned long, happily raping the
principle of least surprise. So now that upstream behaves correctly,
remove the two pr{long,types}.h patches.

And there was much rejoicing.

Tested on sparc64/ppc/hppa/amd64, went in a bunch of bulk builds.
This commit is contained in:
landry 2013-03-18 20:30:31 +00:00
parent 5bf21f5978
commit 0cd765881e
5 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/nspr/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.46 2013/03/11 10:50:12 espie Exp $
# $OpenBSD: Makefile,v 1.47 2013/03/18 20:30:31 landry Exp $
ONLY_FOR_ARCHS= alpha amd64 arm i386 mips64 mips64el powerpc sparc sparc64 hppa
SHARED_ONLY = Yes
COMMENT = Netscape Portable Runtime
VER= 4.9.4
VER= 4.9.5
DISTNAME= nspr-${VER}
SO_VERSION= 22.2

4
devel/nspr/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (nspr-4.9.4.tar.gz) = dJBGx1vhfy+LOHTSiIc9M1XO3LN6vntut7O8N0RA1KQ=
SIZE (nspr-4.9.4.tar.gz) = 1160641
SHA256 (nspr-4.9.5.tar.gz) = YWq2XISRVcntDl9QJTCiQcyRCOJ4J1qkSLQXrmMsdgQ=
SIZE (nspr-4.9.5.tar.gz) = 1156396

8
devel/nspr/patches/patch-mozilla_nsprpub_configure_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_nsprpub_configure_in,v 1.15 2012/12/29 19:58:22 landry Exp $
--- mozilla/nsprpub/configure.in.orig Thu Oct 25 00:19:07 2012
+++ mozilla/nsprpub/configure.in Thu Dec 27 22:37:48 2012
@@ -2117,9 +2117,11 @@ tools are selected during the Xcode/Developer Tools in
$OpenBSD: patch-mozilla_nsprpub_configure_in,v 1.16 2013/03/18 20:30:31 landry Exp $
--- mozilla/nsprpub/configure.in.orig Wed Dec 19 20:21:31 2012
+++ mozilla/nsprpub/configure.in Sun Feb 24 19:04:01 2013
@@ -2128,9 +2128,11 @@ tools are selected during the Xcode/Developer Tools in
AC_DEFINE(OPENBSD)
AC_DEFINE(HAVE_BSD_FLOCK)
AC_DEFINE(HAVE_SOCKLEN_T)

13
devel/nspr/patches/patch-mozilla_nsprpub_pr_include_prlong_h
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-mozilla_nsprpub_pr_include_prlong_h,v 1.2 2012/09/17 20:00:09 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=634793
--- mozilla/nsprpub/pr/include/prlong.h.orig Tue Mar 6 14:13:46 2012
+++ mozilla/nsprpub/pr/include/prlong.h Sun Sep 2 00:30:56 2012
@@ -35,7 +35,7 @@ NSPR_API(PRUint64) LL_MaxUint(void);
#if defined(HAVE_LONG_LONG)
/* Keep this in sync with prtypes.h. */
-#if PR_BYTES_PER_LONG == 8 && !defined(__APPLE__)
+#if PR_BYTES_PER_LONG == 8 && !defined(__APPLE__) && !defined(__OpenBSD__)
#define LL_MAXINT 9223372036854775807L
#define LL_MININT (-LL_MAXINT - 1L)
#define LL_ZERO 0L

13
devel/nspr/patches/patch-mozilla_nsprpub_pr_include_prtypes_h
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-mozilla_nsprpub_pr_include_prtypes_h,v 1.4 2012/09/17 20:00:09 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=634793
--- mozilla/nsprpub/pr/include/prtypes.h.orig Tue Mar 6 14:13:49 2012
+++ mozilla/nsprpub/pr/include/prtypes.h Sun Sep 2 01:17:24 2012
@@ -336,7 +336,7 @@ typedef long PRInt32;
* match uint64_t, otherwise our uint64 typedef conflicts with the uint64
* typedef in cssmconfig.h, which CoreServices.h includes indirectly.
*/
-#if PR_BYTES_PER_LONG == 8 && !defined(__APPLE__)
+#if PR_BYTES_PER_LONG == 8 && !defined(__APPLE__) && !defined(__OpenBSD__)
typedef long PRInt64;
typedef unsigned long PRUint64;
#define PR_INT64(x) x ## L