pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang nodejs*: Fix builds with icu-68.1.
details: https://anonhg.NetBSD.org/pkgsrc/rev/42447ace5c13
branches: trunk
changeset: 441935:42447ace5c13
user: jperkin <jperkin%pkgsrc.org@localhost>
date: Sat Nov 14 09:54:22 2020 +0000
description:
nodejs*: Fix builds with icu-68.1.
diffstat:
lang/nodejs10/distinfo | 4 +-
lang/nodejs10/patches/patch-deps_v8_src_objects_intl-objects.cc | 42 +++++++++
lang/nodejs10/patches/patch-deps_v8_src_runtime_runtime-intl.cc | 45 ++++++++++
lang/nodejs8/distinfo | 4 +-
lang/nodejs8/patches/patch-deps_v8_src_objects_intl-objects.cc | 42 +++++++++
lang/nodejs8/patches/patch-deps_v8_src_runtime_runtime-intl.cc | 45 ++++++++++
6 files changed, 180 insertions(+), 2 deletions(-)
diffs (226 lines):
diff -r 6b42ee055a22 -r 42447ace5c13 lang/nodejs10/distinfo
--- a/lang/nodejs10/distinfo Sat Nov 14 01:29:21 2020 +0000
+++ b/lang/nodejs10/distinfo Sat Nov 14 09:54:22 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2020/11/12 21:02:43 adam Exp $
+$NetBSD: distinfo,v 1.10 2020/11/14 09:54:23 jperkin Exp $
SHA1 (node-v10.23.0.tar.gz) = 641cefc66f2360dbf409f8bb7f94bf3096cb9da4
RMD160 (node-v10.23.0.tar.gz) = 71fefc0b9451395f74750f956102e2b4cfa67144
@@ -18,6 +18,8 @@
SHA1 (patch-deps_v8_src_compiler_types.h) = 711cc94535200374104c3cd1f0fbbd00994701a6
SHA1 (patch-deps_v8_src_globals.h) = 6695a381000844ad9837bdbc3edbe9040ec4d5ff
SHA1 (patch-deps_v8_src_log-utils.h) = 765e4e4af2cb11e38c033174ac92fbb6ee1fd480
+SHA1 (patch-deps_v8_src_objects_intl-objects.cc) = 7d5a9cb3dd02fb1fa99c8f0645d015dff37f282f
+SHA1 (patch-deps_v8_src_runtime_runtime-intl.cc) = dffa78003abb45e2bae0ee3cd75b1daee64160e1
SHA1 (patch-deps_v8_tools_run-llprof.sh) = 39aa3faf77492ef8dd35b411b7b0e4605b469af3
SHA1 (patch-node.gypi) = 4a104dba6c22702211009bc60a6be6f87554e2fa
SHA1 (patch-src_cares__wrap.cc) = a26a162f130468cbc0650a33b27b71377d273704
diff -r 6b42ee055a22 -r 42447ace5c13 lang/nodejs10/patches/patch-deps_v8_src_objects_intl-objects.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/nodejs10/patches/patch-deps_v8_src_objects_intl-objects.cc Sat Nov 14 09:54:22 2020 +0000
@@ -0,0 +1,42 @@
+$NetBSD: patch-deps_v8_src_objects_intl-objects.cc,v 1.1 2020/11/14 09:54:23 jperkin Exp $
+
+icu 68.1 compat.
+
+--- deps/v8/src/objects/intl-objects.cc.orig 2020-09-15 13:25:38.000000000 +0000
++++ deps/v8/src/objects/intl-objects.cc
+@@ -243,7 +243,7 @@ void SetResolvedDateSettings(Isolate* is
+ char result[ULOC_FULLNAME_CAPACITY];
+ status = U_ZERO_ERROR;
+ uloc_toLanguageTag(icu_locale.getName(), result, ULOC_FULLNAME_CAPACITY,
+- FALSE, &status);
++ false, &status);
+ if (U_SUCCESS(status)) {
+ JSObject::SetProperty(resolved, factory->NewStringFromStaticChars("locale"),
+ factory->NewStringFromAsciiChecked(result),
+@@ -422,7 +422,7 @@ void SetResolvedNumericSettings(Isolate*
+ char result[ULOC_FULLNAME_CAPACITY];
+ UErrorCode status = U_ZERO_ERROR;
+ uloc_toLanguageTag(icu_locale.getName(), result, ULOC_FULLNAME_CAPACITY,
+- FALSE, &status);
++ false, &status);
+ if (U_SUCCESS(status)) {
+ JSObject::SetProperty(resolved, factory->NewStringFromStaticChars("locale"),
+ factory->NewStringFromAsciiChecked(result),
+@@ -657,7 +657,7 @@ void SetResolvedCollatorSettings(Isolate
+ char result[ULOC_FULLNAME_CAPACITY];
+ status = U_ZERO_ERROR;
+ uloc_toLanguageTag(icu_locale.getName(), result, ULOC_FULLNAME_CAPACITY,
+- FALSE, &status);
++ false, &status);
+ if (U_SUCCESS(status)) {
+ JSObject::SetProperty(resolved, factory->NewStringFromStaticChars("locale"),
+ factory->NewStringFromAsciiChecked(result),
+@@ -796,7 +796,7 @@ void SetResolvedBreakIteratorSettings(Is
+ char result[ULOC_FULLNAME_CAPACITY];
+ status = U_ZERO_ERROR;
+ uloc_toLanguageTag(icu_locale.getName(), result, ULOC_FULLNAME_CAPACITY,
+- FALSE, &status);
++ false, &status);
+ if (U_SUCCESS(status)) {
+ JSObject::SetProperty(resolved, factory->NewStringFromStaticChars("locale"),
+ factory->NewStringFromAsciiChecked(result),
diff -r 6b42ee055a22 -r 42447ace5c13 lang/nodejs10/patches/patch-deps_v8_src_runtime_runtime-intl.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/nodejs10/patches/patch-deps_v8_src_runtime_runtime-intl.cc Sat Nov 14 09:54:22 2020 +0000
@@ -0,0 +1,45 @@
+$NetBSD: patch-deps_v8_src_runtime_runtime-intl.cc,v 1.1 2020/11/14 09:54:23 jperkin Exp $
+
+icu 68.1 compat.
+
+--- deps/v8/src/runtime/runtime-intl.cc.orig 2020-09-15 13:25:38.000000000 +0000
++++ deps/v8/src/runtime/runtime-intl.cc
+@@ -85,7 +85,7 @@ RUNTIME_FUNCTION(Runtime_CanonicalizeLan
+ char result[ULOC_FULLNAME_CAPACITY];
+
+ // Force strict BCP47 rules.
+- uloc_toLanguageTag(icu_result, result, ULOC_FULLNAME_CAPACITY, TRUE, &error);
++ uloc_toLanguageTag(icu_result, result, ULOC_FULLNAME_CAPACITY, true, &error);
+
+ if (U_FAILURE(error) || error == U_STRING_NOT_TERMINATED_WARNING) {
+ return *factory->NewStringFromAsciiChecked(kInvalidTag);
+@@ -132,7 +132,7 @@ RUNTIME_FUNCTION(Runtime_AvailableLocale
+
+ error = U_ZERO_ERROR;
+ // No need to force strict BCP47 rules.
+- uloc_toLanguageTag(icu_name, result, ULOC_FULLNAME_CAPACITY, FALSE, &error);
++ uloc_toLanguageTag(icu_name, result, ULOC_FULLNAME_CAPACITY, false, &error);
+ if (U_FAILURE(error) || error == U_STRING_NOT_TERMINATED_WARNING) {
+ // This shouldn't happen, but lets not break the user.
+ continue;
+@@ -164,7 +164,7 @@ RUNTIME_FUNCTION(Runtime_GetDefaultICULo
+ char result[ULOC_FULLNAME_CAPACITY];
+ UErrorCode status = U_ZERO_ERROR;
+ uloc_toLanguageTag(default_locale.getName(), result, ULOC_FULLNAME_CAPACITY,
+- FALSE, &status);
++ false, &status);
+ if (U_SUCCESS(status)) {
+ return *factory->NewStringFromAsciiChecked(result);
+ }
+@@ -399,9 +399,9 @@ RUNTIME_FUNCTION(Runtime_InternalCompare
+ std::unique_ptr<uc16[]> sap1;
+ std::unique_ptr<uc16[]> sap2;
+ icu::UnicodeString string_val1(
+- FALSE, GetUCharBufferFromFlat(flat1, &sap1, length1), length1);
++ false, GetUCharBufferFromFlat(flat1, &sap1, length1), length1);
+ icu::UnicodeString string_val2(
+- FALSE, GetUCharBufferFromFlat(flat2, &sap2, length2), length2);
++ false, GetUCharBufferFromFlat(flat2, &sap2, length2), length2);
+ result = collator->compare(string_val1, string_val2, status);
+ }
+ if (U_FAILURE(status)) return isolate->ThrowIllegalOperation();
diff -r 6b42ee055a22 -r 42447ace5c13 lang/nodejs8/distinfo
--- a/lang/nodejs8/distinfo Sat Nov 14 01:29:21 2020 +0000
+++ b/lang/nodejs8/distinfo Sat Nov 14 09:54:22 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2020/01/24 18:58:12 adam Exp $
+$NetBSD: distinfo,v 1.21 2020/11/14 09:54:22 jperkin Exp $
SHA1 (node-v8.17.0.tar.gz) = 66b39f093c14e1243d1de15c4af6a9b4cfbc09f5
RMD160 (node-v8.17.0.tar.gz) = 55eb1b26f3e9730ffb49fc061b763fb26817124d
@@ -16,6 +16,8 @@
SHA1 (patch-deps_v8_src_compiler_types.h) = 711cc94535200374104c3cd1f0fbbd00994701a6
SHA1 (patch-deps_v8_src_globals.h) = ec9798befbfbcd432b0c61bc914fe9d6a4bf4a86
SHA1 (patch-deps_v8_src_log-utils.h) = 32bbf2de2af7a8ab6900a4d5e968dcc1357f6de2
+SHA1 (patch-deps_v8_src_objects_intl-objects.cc) = 964e748b957acd96a33599be625d5b596009085b
+SHA1 (patch-deps_v8_src_runtime_runtime-intl.cc) = fd94107ce4d75aada37e5d04a49a10f8c5651ebf
SHA1 (patch-deps_v8_tools_run-llprof.sh) = 39aa3faf77492ef8dd35b411b7b0e4605b469af3
SHA1 (patch-src_cares__wrap.cc) = a26a162f130468cbc0650a33b27b71377d273704
SHA1 (patch-src_inspector__agent.cc) = 6066c01b671a1d416440b073a7a21fdf22eef926
diff -r 6b42ee055a22 -r 42447ace5c13 lang/nodejs8/patches/patch-deps_v8_src_objects_intl-objects.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/nodejs8/patches/patch-deps_v8_src_objects_intl-objects.cc Sat Nov 14 09:54:22 2020 +0000
@@ -0,0 +1,42 @@
+$NetBSD: patch-deps_v8_src_objects_intl-objects.cc,v 1.1 2020/11/14 09:54:23 jperkin Exp $
+
+icu 68.1 compat.
+
+--- deps/v8/src/objects/intl-objects.cc.orig 2019-12-17 06:54:05.000000000 +0000
++++ deps/v8/src/objects/intl-objects.cc
+@@ -228,7 +228,7 @@ void SetResolvedDateSettings(Isolate* is
+ char result[ULOC_FULLNAME_CAPACITY];
+ status = U_ZERO_ERROR;
+ uloc_toLanguageTag(icu_locale.getName(), result, ULOC_FULLNAME_CAPACITY,
+- FALSE, &status);
++ false, &status);
+ if (U_SUCCESS(status)) {
+ JSObject::SetProperty(resolved, factory->NewStringFromStaticChars("locale"),
+ factory->NewStringFromAsciiChecked(result), SLOPPY)
+@@ -405,7 +405,7 @@ void SetResolvedNumericSettings(Isolate*
+ char result[ULOC_FULLNAME_CAPACITY];
+ UErrorCode status = U_ZERO_ERROR;
+ uloc_toLanguageTag(icu_locale.getName(), result, ULOC_FULLNAME_CAPACITY,
+- FALSE, &status);
++ false, &status);
+ if (U_SUCCESS(status)) {
+ JSObject::SetProperty(resolved, factory->NewStringFromStaticChars("locale"),
+ factory->NewStringFromAsciiChecked(result), SLOPPY)
+@@ -636,7 +636,7 @@ void SetResolvedCollatorSettings(Isolate
+ char result[ULOC_FULLNAME_CAPACITY];
+ status = U_ZERO_ERROR;
+ uloc_toLanguageTag(icu_locale.getName(), result, ULOC_FULLNAME_CAPACITY,
+- FALSE, &status);
++ false, &status);
+ if (U_SUCCESS(status)) {
+ JSObject::SetProperty(resolved, factory->NewStringFromStaticChars("locale"),
+ factory->NewStringFromAsciiChecked(result), SLOPPY)
+@@ -773,7 +773,7 @@ void SetResolvedBreakIteratorSettings(Is
+ char result[ULOC_FULLNAME_CAPACITY];
+ status = U_ZERO_ERROR;
+ uloc_toLanguageTag(icu_locale.getName(), result, ULOC_FULLNAME_CAPACITY,
+- FALSE, &status);
++ false, &status);
+ if (U_SUCCESS(status)) {
+ JSObject::SetProperty(resolved, factory->NewStringFromStaticChars("locale"),
+ factory->NewStringFromAsciiChecked(result), SLOPPY)
diff -r 6b42ee055a22 -r 42447ace5c13 lang/nodejs8/patches/patch-deps_v8_src_runtime_runtime-intl.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/nodejs8/patches/patch-deps_v8_src_runtime_runtime-intl.cc Sat Nov 14 09:54:22 2020 +0000
@@ -0,0 +1,45 @@
+$NetBSD: patch-deps_v8_src_runtime_runtime-intl.cc,v 1.1 2020/11/14 09:54:23 jperkin Exp $
+
+icu 68.1 compat.
+
+--- deps/v8/src/runtime/runtime-intl.cc.orig 2019-12-17 06:54:05.000000000 +0000
++++ deps/v8/src/runtime/runtime-intl.cc
+@@ -89,7 +89,7 @@ RUNTIME_FUNCTION(Runtime_CanonicalizeLan
+ char result[ULOC_FULLNAME_CAPACITY];
+
+ // Force strict BCP47 rules.
+- uloc_toLanguageTag(icu_result, result, ULOC_FULLNAME_CAPACITY, TRUE, &error);
++ uloc_toLanguageTag(icu_result, result, ULOC_FULLNAME_CAPACITY, true, &error);
+
+ if (U_FAILURE(error) || error == U_STRING_NOT_TERMINATED_WARNING) {
+ return *factory->NewStringFromAsciiChecked(kInvalidTag);
+@@ -136,7 +136,7 @@ RUNTIME_FUNCTION(Runtime_AvailableLocale
+
+ error = U_ZERO_ERROR;
+ // No need to force strict BCP47 rules.
+- uloc_toLanguageTag(icu_name, result, ULOC_FULLNAME_CAPACITY, FALSE, &error);
++ uloc_toLanguageTag(icu_name, result, ULOC_FULLNAME_CAPACITY, false, &error);
+ if (U_FAILURE(error) || error == U_STRING_NOT_TERMINATED_WARNING) {
+ // This shouldn't happen, but lets not break the user.
+ continue;
+@@ -168,7 +168,7 @@ RUNTIME_FUNCTION(Runtime_GetDefaultICULo
+ char result[ULOC_FULLNAME_CAPACITY];
+ UErrorCode status = U_ZERO_ERROR;
+ uloc_toLanguageTag(default_locale.getName(), result, ULOC_FULLNAME_CAPACITY,
+- FALSE, &status);
++ false, &status);
+ if (U_SUCCESS(status)) {
+ return *factory->NewStringFromAsciiChecked(result);
+ }
+@@ -550,9 +550,9 @@ RUNTIME_FUNCTION(Runtime_InternalCompare
+ std::unique_ptr<uc16[]> sap1;
+ std::unique_ptr<uc16[]> sap2;
+ icu::UnicodeString string_val1(
+- FALSE, GetUCharBufferFromFlat(flat1, &sap1, length1), length1);
++ false, GetUCharBufferFromFlat(flat1, &sap1, length1), length1);
+ icu::UnicodeString string_val2(
+- FALSE, GetUCharBufferFromFlat(flat2, &sap2, length2), length2);
++ false, GetUCharBufferFromFlat(flat2, &sap2, length2), length2);
+ result = collator->compare(string_val1, string_val2, status);
+ }
+ if (U_FAILURE(status)) return isolate->ThrowIllegalOperation();
Home |
Main Index |
Thread Index |
Old Index