CVS commit: pkgsrc/lang/nodejs

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Thu Apr 22 17:33:04 UTC 2021

Modified Files:
        pkgsrc/lang/nodejs: Makefile
Added Files:
        pkgsrc/lang/nodejs/patches: patch-deps_v8_src_objects_js-list-format.cc

Log Message:
nodejs: Add a patch really and remove obsolete comment

Noticed by adam@. Thank you.


To generate a diff of this commit:
cvs rdiff -u -r1.211 -r1.212 pkgsrc/lang/nodejs/Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/nodejs/patches/patch-deps_v8_src_objects_js-list-format.cc

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

Modified files:

Index: pkgsrc/lang/nodejs/Makefile
diff -u pkgsrc/lang/nodejs/Makefile:1.211 pkgsrc/lang/nodejs/Makefile:1.212
--- pkgsrc/lang/nodejs/Makefile:1.211   Thu Apr 22 15:52:25 2021
+++ pkgsrc/lang/nodejs/Makefile Thu Apr 22 17:33:04 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.211 2021/04/22 15:52:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.212 2021/04/22 17:33:04 ryoon Exp $
 
 DISTNAME=      node-v14.16.1
 EXTRACT_SUFX=  .tar.xz
@@ -12,7 +12,6 @@ PKGREVISION= 2
 MAKE_ENV+=     LD_LIBRARY_PATH=${PREFIX}/lib
 
 CONFIGURE_ARGS+=       --shared-nghttp2
-# ICU 69.1: error: 'createInstance' is a private member of 'icu_69::ListFormatter'
 CONFIGURE_ARGS+=       --with-intl=system-icu
 
 PYTHON_VERSIONS_ACCEPTED=      27

Added files:

Index: pkgsrc/lang/nodejs/patches/patch-deps_v8_src_objects_js-list-format.cc
diff -u /dev/null pkgsrc/lang/nodejs/patches/patch-deps_v8_src_objects_js-list-format.cc:1.1
--- /dev/null   Thu Apr 22 17:33:04 2021
+++ pkgsrc/lang/nodejs/patches/patch-deps_v8_src_objects_js-list-format.cc      Thu Apr 22 17:33:04 2021
@@ -0,0 +1,46 @@
+$NetBSD: patch-deps_v8_src_objects_js-list-format.cc,v 1.1 2021/04/22 17:33:04 ryoon Exp $
+
+* Fix build with ICU 69.1. Backported from 16.0.0.
+
+--- deps/v8/src/objects/js-list-format.cc.orig 2021-04-06 19:42:15.000000000 +0000
++++ deps/v8/src/objects/js-list-format.cc
+@@ -73,6 +73,30 @@ const char* GetIcuStyleString(JSListForm
+   UNREACHABLE();
+ }
+ 
++UListFormatterWidth GetIcuWidth(JSListFormat::Style style) {
++  switch (style) {
++    case JSListFormat::Style::LONG:
++      return ULISTFMT_WIDTH_WIDE;
++    case JSListFormat::Style::SHORT:
++      return ULISTFMT_WIDTH_SHORT;
++    case JSListFormat::Style::NARROW:
++      return ULISTFMT_WIDTH_NARROW;
++  }
++  UNREACHABLE();
++}
++
++UListFormatterType GetIcuType(JSListFormat::Type type) {
++  switch (type) {
++    case JSListFormat::Type::CONJUNCTION:
++      return ULISTFMT_TYPE_AND;
++    case JSListFormat::Type::DISJUNCTION:
++      return ULISTFMT_TYPE_OR;
++    case JSListFormat::Type::UNIT:
++      return ULISTFMT_TYPE_UNITS;
++  }
++  UNREACHABLE();
++}
++
+ }  // namespace
+ 
+ MaybeHandle<JSListFormat> JSListFormat::New(Isolate* isolate, Handle<Map> map,
+@@ -143,7 +167,7 @@ MaybeHandle<JSListFormat> JSListFormat::
+   icu::Locale icu_locale = r.icu_locale;
+   UErrorCode status = U_ZERO_ERROR;
+   icu::ListFormatter* formatter = icu::ListFormatter::createInstance(
+-      icu_locale, GetIcuStyleString(style_enum, type_enum), status);
++      icu_locale, GetIcuType(type_enum), GetIcuWidth(style_enum), status);
+   if (U_FAILURE(status) || formatter == nullptr) {
+     delete formatter;
+     THROW_NEW_ERROR(isolate, NewRangeError(MessageTemplate::kIcuError),