CVS commit: pkgsrc/lang/mozjs68

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

Module Name:    pkgsrc
Committed By:   rin
Date:           Thu May 14 08:44:48 UTC 2020

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

Log Message:
PR pkg/55255

Fix build for NetBSD/arm in the same manner as lang/mozjs60.
Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/mozjs68/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/mozjs68/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/mozjs68/patches/patch-vm_JSONPrinter.cpp \
    pkgsrc/lang/mozjs68/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/mozjs68/Makefile
diff -u pkgsrc/lang/mozjs68/Makefile:1.2 pkgsrc/lang/mozjs68/Makefile:1.3
--- pkgsrc/lang/mozjs68/Makefile:1.2    Sun Apr 12 08:27:58 2020
+++ pkgsrc/lang/mozjs68/Makefile        Thu May 14 08:44:48 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2020/04/12 08:27:58 adam Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/14 08:44:48 rin Exp $
 
 DISTNAME=      mozjs68_68.6.0.orig
 PKGNAME=       ${DISTNAME:S/_/-/:S/.orig//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang
 MASTER_SITES=  http://deb.debian.org/debian/pool/main/m/mozjs68/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/lang/mozjs68/distinfo
diff -u pkgsrc/lang/mozjs68/distinfo:1.1 pkgsrc/lang/mozjs68/distinfo:1.2
--- pkgsrc/lang/mozjs68/distinfo:1.1    Mon Apr  6 04:58:42 2020
+++ pkgsrc/lang/mozjs68/distinfo        Thu May 14 08:44:48 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2020/04/06 04:58:42 wiz Exp $
+$NetBSD: distinfo,v 1.2 2020/05/14 08:44:48 rin Exp $
 
 SHA1 (mozjs68_68.6.0.orig.tar.xz) = 98eb63629e8889caa738fa15591fe8eeba73b227
 RMD160 (mozjs68_68.6.0.orig.tar.xz) = 7b00f416e1e767b0595fbd7e4c26c42c83ccd7a1
@@ -6,3 +6,5 @@ SHA512 (mozjs68_68.6.0.orig.tar.xz) = fa
 Size (mozjs68_68.6.0.orig.tar.xz) = 75303520 bytes
 SHA1 (patch-.._.._config_rules.mk) = cf3421d991e1cbfab4c0cdcb7b648b1388fa32d5
 SHA1 (patch-.._.._python_mozbuild_mozbuild_backend_recursivemake.py) = dda670432e5673c5d28dcf6c4902d4a724e71170
+SHA1 (patch-vm_JSONPrinter.cpp) = 384f26d9602844a3a586184c8971d48a07453645
+SHA1 (patch-vm_JSONPrinter.h) = b92c335185886f79d15f2d9d348bf10e4a714c6e

Added files:

Index: pkgsrc/lang/mozjs68/patches/patch-vm_JSONPrinter.cpp
diff -u /dev/null pkgsrc/lang/mozjs68/patches/patch-vm_JSONPrinter.cpp:1.1
--- /dev/null   Thu May 14 08:44:48 2020
+++ pkgsrc/lang/mozjs68/patches/patch-vm_JSONPrinter.cpp        Thu May 14 08:44:48 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-vm_JSONPrinter.cpp,v 1.1 2020/05/14 08:44:48 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/mozjs68/patches/patch-vm_JSONPrinter.h
diff -u /dev/null pkgsrc/lang/mozjs68/patches/patch-vm_JSONPrinter.h:1.1
--- /dev/null   Thu May 14 08:44:48 2020
+++ pkgsrc/lang/mozjs68/patches/patch-vm_JSONPrinter.h  Thu May 14 08:44:48 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-vm_JSONPrinter.h,v 1.1 2020/05/14 08:44:48 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.