CVS commit: pkgsrc/lang/mozjs60

["Rin Okuyama" <rin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rin
Date:           Thu May 14 08:42:22 UTC 2020

Modified Files:
        pkgsrc/lang/mozjs60: Makefile distinfo
Added Files:
        pkgsrc/lang/mozjs60/patches: patch-vm_JSONPrinter.cpp
            patch-vm_JSONPrinter.h

Log Message:
PR pkg/55255

Fix build for NetBSD/arm. Bump revision.

Tested by jun@. Thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/mozjs60/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/mozjs60/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/mozjs60/patches/patch-vm_JSONPrinter.cpp \
    pkgsrc/lang/mozjs60/patches/patch-vm_JSONPrinter.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/mozjs60/Makefile
diff -u pkgsrc/lang/mozjs60/Makefile:1.7 pkgsrc/lang/mozjs60/Makefile:1.8
--- pkgsrc/lang/mozjs60/Makefile:1.7    Thu Apr 30 11:47:45 2020
+++ pkgsrc/lang/mozjs60/Makefile        Thu May 14 08:42:22 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2020/04/30 11:47:45 maya Exp $
+# $NetBSD: Makefile,v 1.8 2020/05/14 08:42:22 rin Exp $
 
 DISTNAME=      mozjs60_60.8.0.orig
 PKGNAME=       ${DISTNAME:S/_/-/:S/.orig//}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    lang
 MASTER_SITES=  http://deb.debian.org/debian/pool/main/m/mozjs60/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/lang/mozjs60/distinfo
diff -u pkgsrc/lang/mozjs60/distinfo:1.4 pkgsrc/lang/mozjs60/distinfo:1.5
--- pkgsrc/lang/mozjs60/distinfo:1.4    Thu Apr 23 08:32:55 2020
+++ pkgsrc/lang/mozjs60/distinfo        Thu May 14 08:42:22 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2020/04/23 08:32:55 wiz Exp $
+$NetBSD: distinfo,v 1.5 2020/05/14 08:42:22 rin Exp $
 
 SHA1 (mozjs60_60.8.0.orig.tar.xz) = b66207ee477c110995029f173e6b026f2e013591
 RMD160 (mozjs60_60.8.0.orig.tar.xz) = fef033969a51dc56c84669d33401f60bd499de6d
@@ -11,6 +11,8 @@ SHA1 (patch-gc_Memory.cpp) = ba865bee4b9
 SHA1 (patch-jsdate.cpp) = f9314460476ffbc00fe85a75bddc964807d0153f
 SHA1 (patch-threading_posix_Thread.cpp) = c48a642fa98d8112c149142a4af4ac633d3ae332
 SHA1 (patch-util_NativeStack.cpp) = 68d2d80291a856c74bac2e6870317f143bb61355
+SHA1 (patch-vm_JSONPrinter.cpp) = 384f26d9602844a3a586184c8971d48a07453645
+SHA1 (patch-vm_JSONPrinter.h) = b92c335185886f79d15f2d9d348bf10e4a714c6e
 SHA1 (patch-vm_Time.cpp) = 5c08e7b3997055c50f40aadcaefb81628cf1133c
 SHA1 (patch-vm_Time.h) = 1dbc623a9b5e249d84bffd1b036feb7b6a54ce75
 SHA1 (patch-wasm_WasmSignalHandlers.cpp) = 9023ead4639414ab0ca6641191dcb1a9aab1298a

Added files:

Index: pkgsrc/lang/mozjs60/patches/patch-vm_JSONPrinter.cpp
diff -u /dev/null pkgsrc/lang/mozjs60/patches/patch-vm_JSONPrinter.cpp:1.1
--- /dev/null   Thu May 14 08:42:22 2020
+++ pkgsrc/lang/mozjs60/patches/patch-vm_JSONPrinter.cpp        Thu May 14 08:42:22 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-vm_JSONPrinter.cpp,v 1.1 2020/05/14 08:42:22 rin Exp $
+
+For NetBSD/arm, size_t is unsigned long, which is neither
+uint32_t (= unsigned int) nor uint64_t (= unsigned long long).
+
+--- vm/JSONPrinter.cpp.orig    2020-05-12 17:06:38.387691368 +0900
++++ vm/JSONPrinter.cpp 2020-05-12 17:10:20.842391283 +0900
+@@ -119,7 +119,8 @@ void JSONPrinter::property(const char* n
+   out_.printf("%" PRIu64, value);
+ }
+ 
+-#if defined(XP_DARWIN) || defined(__OpenBSD__)
++#if defined(XP_DARWIN) || defined(__OpenBSD__) || \
++    (defined(__NetBSD__) && defined(__arm__))
+ void JSONPrinter::property(const char* name, size_t value) {
+   propertyName(name);
+   out_.printf("%zu", value);
Index: pkgsrc/lang/mozjs60/patches/patch-vm_JSONPrinter.h
diff -u /dev/null pkgsrc/lang/mozjs60/patches/patch-vm_JSONPrinter.h:1.1
--- /dev/null   Thu May 14 08:42:22 2020
+++ pkgsrc/lang/mozjs60/patches/patch-vm_JSONPrinter.h  Thu May 14 08:42:22 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-vm_JSONPrinter.h,v 1.1 2020/05/14 08:42:22 rin Exp $
+
+For NetBSD/arm, size_t is unsigned long, which is neither
+uint32_t (= unsigned int) nor uint64_t (= unsigned long long).
+
+--- vm/JSONPrinter.h.orig      2020-05-12 17:06:42.908461670 +0900
++++ vm/JSONPrinter.h   2020-05-12 17:09:54.171126154 +0900
+@@ -45,7 +45,8 @@ class JSONPrinter {
+   void property(const char* name, uint32_t value);
+   void property(const char* name, int64_t value);
+   void property(const char* name, uint64_t value);
+-#if defined(XP_DARWIN) || defined(__OpenBSD__)
++#if defined(XP_DARWIN) || defined(__OpenBSD__) || \
++    (defined(__NetBSD__) && defined(__arm__))
+   // On OSX and OpenBSD, size_t is long unsigned, uint32_t is unsigned, and
+   // uint64_t is long long unsigned. Everywhere else, size_t matches either
+   // uint32_t or uint64_t.