[arch-commits] Commit in nodejs/trunk (PKGBUILD icu67.patch)
Date: Thursday, April 30, 2020 @ 07:45:26
Author: felixonmars
Revision: 622402
upgpkg: nodejs 14.1.0-1
Modified:
nodejs/trunk/PKGBUILD
Deleted:
nodejs/trunk/icu67.patch
-+
PKGBUILD| 15 +
icu67.patch | 169 --
2 files changed, 4 insertions(+), 180 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-04-30 07:45:07 UTC (rev 622401)
+++ PKGBUILD2020-04-30 07:45:26 UTC (rev 622402)
@@ -8,8 +8,8 @@
# Contributor: TIanyi Cui
pkgname=nodejs
-pkgver=14.0.0
-pkgrel=2
+pkgver=14.1.0
+pkgrel=1
pkgdesc='Evented I/O for V8 javascript'
arch=('x86_64')
url='https://nodejs.org/'
@@ -17,16 +17,9 @@
depends=('openssl' 'zlib' 'icu' 'libuv' 'c-ares' 'libnghttp2') # 'http-parser'
'v8')
makedepends=('python' 'procps-ng')
optdepends=('npm: nodejs package manager')
-source=("nodejs-$pkgver.tar.gz::https://github.com/nodejs/node/archive/v$pkgver.tar.gz;
-icu67.patch)
-sha512sums=('2bb051576b5ed9c919348cb2f6e5a54a3b12d5ff6e6f1d01a153eed58069c6bf740b62fb99087a830197624e3db865ba8ac767b7ed58962503a9f1100b4ebd50'
-
'9b80bdda769a63f8550e4adfaa3b17cda6d3de45b2aa08adcbcf079256058a46537ed40d54e56c64595e608da8d8537e0d2cb5ece44a34636a1aadb47fb5e1ef')
+source=("nodejs-$pkgver.tar.gz::https://github.com/nodejs/node/archive/v$pkgver.tar.gz;)
+sha512sums=('e55d90c261139f7e15d526bcb70363259d5496c951ac6e94e139e23e84fa3e6391d28e9765faa383d126f03fb34b452cb99cebf9178c86c5f3c9bdc9b7506be0')
-prepare() {
- cd node-$pkgver
- patch -Np1 -i ../icu67.patch
-}
-
build() {
cd node-$pkgver
Deleted: icu67.patch
===
--- icu67.patch 2020-04-30 07:45:07 UTC (rev 622401)
+++ icu67.patch 2020-04-30 07:45:26 UTC (rev 622402)
@@ -1,169 +0,0 @@
-From 2b107e7670ffb43719a66ee4a55ab408a5dcf2a5 Mon Sep 17 00:00:00 2001
-From: Ujjwal Sharma
-Date: Wed, 22 Apr 2020 12:20:17 +0530
-Subject: [PATCH] deps: V8: backport 3f8dc4b2e5ba
-
-Original commit message:
-
-[intl] Remove soon-to-be removed getAllFieldPositions
-
-Needed to land ICU67.1 soon.
-
-Bug: v8:10393
-Change-Id: I3c7737ca600d6ccfdc46ffaddfb318ce60bc7618
-Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2136489
-Reviewed-by: Jakob Kummerow
-Commit-Queue: Frank Tang
-Cr-Commit-Position: refs/heads/master@{#67027}
-
-Refs: https://github.com/v8/v8/commit/3f8dc4b2e5baf77b463334c769af85b79d8c1463
- common.gypi | 2 +-
- deps/v8/src/objects/js-number-format.cc | 72 +
- 2 files changed, 38 insertions(+), 36 deletions(-)
-
-diff --git a/deps/v8/src/objects/js-number-format.cc
b/deps/v8/src/objects/js-number-format.cc
-index 92d3e2fb82e..ced408aa173 100644
a/deps/v8/src/objects/js-number-format.cc
-+++ b/deps/v8/src/objects/js-number-format.cc
-@@ -1197,42 +1197,31 @@ MaybeHandle
JSNumberFormat::New(Isolate* isolate,
- }
-
- namespace {
--Maybe IcuFormatNumber(
-+Maybe IcuFormatNumber(
- Isolate* isolate,
- const icu::number::LocalizedNumberFormatter& number_format,
--Handle numeric_obj, icu::FieldPositionIterator* fp_iter) {
-+Handle numeric_obj, icu::number::FormattedNumber* formatted) {
- // If it is BigInt, handle it differently.
- UErrorCode status = U_ZERO_ERROR;
-- icu::number::FormattedNumber formatted;
- if (numeric_obj->IsBigInt()) {
- Handle big_int = Handle::cast(numeric_obj);
- Handle big_int_string;
- ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string,
- BigInt::ToString(isolate, big_int),
-- Nothing());
--formatted = number_format.formatDecimal(
-+ Nothing());
-+*formatted = number_format.formatDecimal(
- {big_int_string->ToCString().get(), big_int_string->length()},
status);
- } else {
- double number = numeric_obj->Number();
--formatted = number_format.formatDouble(number, status);
-+*formatted = number_format.formatDouble(number, status);
- }
- if (U_FAILURE(status)) {
- // This happen because of icu data trimming trim out "unit".
- // See https://bugs.chromium.org/p/v8/issues/detail?id=8641
--THROW_NEW_ERROR_RETURN_VALUE(isolate,
-- NewTypeError(MessageTemplate::kIcuError),
-- Nothing());
-- }
-- if (fp_iter) {
--formatted.getAllFieldPositions(*fp_iter, status);
-+THROW_NEW_ERROR_RETURN_VALUE(
-+isolate, NewTypeError(MessageTemplate::kIcuError), Nothing());
- }
-- icu::UnicodeString result = formatted.toString(status);
-- if (U_FAILURE(status)) {
--THROW_NEW_ERROR_RETURN_VALUE(isolate,
-- NewTypeError(MessageTemplate::kIcuError),
-- Nothing());
-- }
-- return Just(result);
-+
[arch-commits] Commit in nodejs/trunk (PKGBUILD icu67.patch)
Date: Monday, April 27, 2020 @ 09:02:05
Author: foutrelis
Revision: 621802
Fix build with ICU 67
Added:
nodejs/trunk/icu67.patch
Modified:
nodejs/trunk/PKGBUILD
-+
PKGBUILD| 11 +++
icu67.patch | 169 ++
2 files changed, 178 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-04-27 08:54:09 UTC (rev 621801)
+++ PKGBUILD2020-04-27 09:02:05 UTC (rev 621802)
@@ -17,9 +17,16 @@
depends=('openssl' 'zlib' 'icu' 'libuv' 'c-ares' 'libnghttp2') # 'http-parser'
'v8')
makedepends=('python' 'procps-ng')
optdepends=('npm: nodejs package manager')
-source=("nodejs-$pkgver.tar.gz::https://github.com/nodejs/node/archive/v$pkgver.tar.gz;)
-sha512sums=('2bb051576b5ed9c919348cb2f6e5a54a3b12d5ff6e6f1d01a153eed58069c6bf740b62fb99087a830197624e3db865ba8ac767b7ed58962503a9f1100b4ebd50')
+source=("nodejs-$pkgver.tar.gz::https://github.com/nodejs/node/archive/v$pkgver.tar.gz;
+icu67.patch)
+sha512sums=('2bb051576b5ed9c919348cb2f6e5a54a3b12d5ff6e6f1d01a153eed58069c6bf740b62fb99087a830197624e3db865ba8ac767b7ed58962503a9f1100b4ebd50'
+
'9b80bdda769a63f8550e4adfaa3b17cda6d3de45b2aa08adcbcf079256058a46537ed40d54e56c64595e608da8d8537e0d2cb5ece44a34636a1aadb47fb5e1ef')
+prepare() {
+ cd node-$pkgver
+ patch -Np1 -i ../icu67.patch
+}
+
build() {
cd node-$pkgver
Added: icu67.patch
===
--- icu67.patch (rev 0)
+++ icu67.patch 2020-04-27 09:02:05 UTC (rev 621802)
@@ -0,0 +1,169 @@
+From 2b107e7670ffb43719a66ee4a55ab408a5dcf2a5 Mon Sep 17 00:00:00 2001
+From: Ujjwal Sharma
+Date: Wed, 22 Apr 2020 12:20:17 +0530
+Subject: [PATCH] deps: V8: backport 3f8dc4b2e5ba
+
+Original commit message:
+
+[intl] Remove soon-to-be removed getAllFieldPositions
+
+Needed to land ICU67.1 soon.
+
+Bug: v8:10393
+Change-Id: I3c7737ca600d6ccfdc46ffaddfb318ce60bc7618
+Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2136489
+Reviewed-by: Jakob Kummerow
+Commit-Queue: Frank Tang
+Cr-Commit-Position: refs/heads/master@{#67027}
+
+Refs: https://github.com/v8/v8/commit/3f8dc4b2e5baf77b463334c769af85b79d8c1463
+---
+ common.gypi | 2 +-
+ deps/v8/src/objects/js-number-format.cc | 72 +
+ 2 files changed, 38 insertions(+), 36 deletions(-)
+
+diff --git a/deps/v8/src/objects/js-number-format.cc
b/deps/v8/src/objects/js-number-format.cc
+index 92d3e2fb82e..ced408aa173 100644
+--- a/deps/v8/src/objects/js-number-format.cc
b/deps/v8/src/objects/js-number-format.cc
+@@ -1197,42 +1197,31 @@ MaybeHandle
JSNumberFormat::New(Isolate* isolate,
+ }
+
+ namespace {
+-Maybe IcuFormatNumber(
++Maybe IcuFormatNumber(
+ Isolate* isolate,
+ const icu::number::LocalizedNumberFormatter& number_format,
+-Handle numeric_obj, icu::FieldPositionIterator* fp_iter) {
++Handle numeric_obj, icu::number::FormattedNumber* formatted) {
+ // If it is BigInt, handle it differently.
+ UErrorCode status = U_ZERO_ERROR;
+- icu::number::FormattedNumber formatted;
+ if (numeric_obj->IsBigInt()) {
+ Handle big_int = Handle::cast(numeric_obj);
+ Handle big_int_string;
+ ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string,
+ BigInt::ToString(isolate, big_int),
+- Nothing());
+-formatted = number_format.formatDecimal(
++ Nothing());
++*formatted = number_format.formatDecimal(
+ {big_int_string->ToCString().get(), big_int_string->length()},
status);
+ } else {
+ double number = numeric_obj->Number();
+-formatted = number_format.formatDouble(number, status);
++*formatted = number_format.formatDouble(number, status);
+ }
+ if (U_FAILURE(status)) {
+ // This happen because of icu data trimming trim out "unit".
+ // See https://bugs.chromium.org/p/v8/issues/detail?id=8641
+-THROW_NEW_ERROR_RETURN_VALUE(isolate,
+- NewTypeError(MessageTemplate::kIcuError),
+- Nothing());
+- }
+- if (fp_iter) {
+-formatted.getAllFieldPositions(*fp_iter, status);
++THROW_NEW_ERROR_RETURN_VALUE(
++isolate, NewTypeError(MessageTemplate::kIcuError), Nothing());
+ }
+- icu::UnicodeString result = formatted.toString(status);
+- if (U_FAILURE(status)) {
+-THROW_NEW_ERROR_RETURN_VALUE(isolate,
+- NewTypeError(MessageTemplate::kIcuError),
+- Nothing());
+- }
+- return Just(result);
++ return Just(true);
+ }
+
+ } // namespace
+@@ -1243,10 +1232,16 @@ MaybeHandle JSNumberFormat::FormatNumeric(
+ Handle numeric_obj) {
+ DCHECK(numeric_obj->IsNumeric());
+
+- Maybe maybe_format =
+-
