Date: Thursday, April 30, 2020 @ 08:00:06 Author: felixonmars Revision: 622409
archrelease: copy trunk to community-staging-x86_64 Added: nodejs/repos/community-staging-x86_64/PKGBUILD (from rev 622408, nodejs/trunk/PKGBUILD) nodejs/repos/community-staging-x86_64/rebuild.list (from rev 622408, nodejs/trunk/rebuild.list) Deleted: nodejs/repos/community-staging-x86_64/PKGBUILD nodejs/repos/community-staging-x86_64/icu67.patch nodejs/repos/community-staging-x86_64/rebuild.list --------------+ PKGBUILD | 121 +++++++++++++++++++--------------------- icu67.patch | 169 --------------------------------------------------------- rebuild.list | 4 - 3 files changed, 59 insertions(+), 235 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-04-30 07:59:44 UTC (rev 622408) +++ PKGBUILD 2020-04-30 08:00:06 UTC (rev 622409) @@ -1,64 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor Bartłomiej Piotrowski <bpiotrow...@archlinux.org> -# Contributor: Thomas Dziedzic < gostrc at gmail > -# Contributor: James Campos <james.r.cam...@gmail.com> -# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > -# Contributor: Dongsheng Cai <dongsheng at moodle dot com> -# Contributor: Masutu Subric <masutu.arch at googlemail dot com> -# Contributor: TIanyi Cui <tianyi...@gmail.com> - -pkgname=nodejs -pkgver=14.0.0 -pkgrel=2 -pkgdesc='Evented I/O for V8 javascript' -arch=('x86_64') -url='https://nodejs.org/' -license=('MIT') -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') - -prepare() { - cd node-$pkgver - patch -Np1 -i ../icu67.patch -} - -build() { - cd node-$pkgver - - ./configure \ - --prefix=/usr \ - --with-intl=system-icu \ - --without-npm \ - --shared-openssl \ - --shared-zlib \ - --shared-libuv \ - --experimental-http-parser \ - --shared-cares \ - --shared-nghttp2 - # --shared-v8 - # --shared-http-parser - - make -} - -check() { - cd node-$pkgver - # Expected failure: https://github.com/nodejs/node/issues/11627 - make test || warning "Tests failed" -} - -package() { - cd node-$pkgver - - make DESTDIR="$pkgdir" install - - install -D -m644 LICENSE \ - "$pkgdir"/usr/share/licenses/nodejs/LICENSE -} - -# vim:set ts=2 sw=2 et: Copied: nodejs/repos/community-staging-x86_64/PKGBUILD (from rev 622408, nodejs/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-04-30 08:00:06 UTC (rev 622409) @@ -0,0 +1,57 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Thomas Dziedzic < gostrc at gmail > +# Contributor: James Campos <james.r.cam...@gmail.com> +# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > +# Contributor: Dongsheng Cai <dongsheng at moodle dot com> +# Contributor: Masutu Subric <masutu.arch at googlemail dot com> +# Contributor: TIanyi Cui <tianyi...@gmail.com> + +pkgname=nodejs +pkgver=14.1.0 +pkgrel=2 +pkgdesc='Evented I/O for V8 javascript' +arch=('x86_64') +url='https://nodejs.org/' +license=('MIT') +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=('e55d90c261139f7e15d526bcb70363259d5496c951ac6e94e139e23e84fa3e6391d28e9765faa383d126f03fb34b452cb99cebf9178c86c5f3c9bdc9b7506be0') + +build() { + cd node-$pkgver + + ./configure \ + --prefix=/usr \ + --with-intl=system-icu \ + --without-npm \ + --shared-openssl \ + --shared-zlib \ + --shared-libuv \ + --experimental-http-parser \ + --shared-cares \ + --shared-nghttp2 + # --shared-v8 + # --shared-http-parser + + make +} + +check() { + cd node-$pkgver + # Expected failure: https://github.com/nodejs/node/issues/11627 + make test || warning "Tests failed" +} + +package() { + cd node-$pkgver + + make DESTDIR="$pkgdir" install + + install -D -m644 LICENSE \ + "$pkgdir"/usr/share/licenses/nodejs/LICENSE +} + +# vim:set ts=2 sw=2 et: Deleted: icu67.patch =================================================================== --- icu67.patch 2020-04-30 07:59:44 UTC (rev 622408) +++ icu67.patch 2020-04-30 08:00:06 UTC (rev 622409) @@ -1,169 +0,0 @@ -From 2b107e7670ffb43719a66ee4a55ab408a5dcf2a5 Mon Sep 17 00:00:00 2001 -From: Ujjwal Sharma <ryzoku...@disroot.org> -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 <jkumme...@chromium.org> - Commit-Queue: Frank Tang <ft...@chromium.org> - 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> JSNumberFormat::New(Isolate* isolate, - } - - namespace { --Maybe<icu::UnicodeString> IcuFormatNumber( -+Maybe<bool> IcuFormatNumber( - Isolate* isolate, - const icu::number::LocalizedNumberFormatter& number_format, -- Handle<Object> numeric_obj, icu::FieldPositionIterator* fp_iter) { -+ Handle<Object> 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<BigInt> big_int = Handle<BigInt>::cast(numeric_obj); - Handle<String> big_int_string; - ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string, - BigInt::ToString(isolate, big_int), -- Nothing<icu::UnicodeString>()); -- formatted = number_format.formatDecimal( -+ Nothing<bool>()); -+ *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<icu::UnicodeString>()); -- } -- if (fp_iter) { -- formatted.getAllFieldPositions(*fp_iter, status); -+ THROW_NEW_ERROR_RETURN_VALUE( -+ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<bool>()); - } -- icu::UnicodeString result = formatted.toString(status); -- if (U_FAILURE(status)) { -- THROW_NEW_ERROR_RETURN_VALUE(isolate, -- NewTypeError(MessageTemplate::kIcuError), -- Nothing<icu::UnicodeString>()); -- } -- return Just(result); -+ return Just(true); - } - - } // namespace -@@ -1243,10 +1232,16 @@ MaybeHandle<String> JSNumberFormat::FormatNumeric( - Handle<Object> numeric_obj) { - DCHECK(numeric_obj->IsNumeric()); - -- Maybe<icu::UnicodeString> maybe_format = -- IcuFormatNumber(isolate, number_format, numeric_obj, nullptr); -+ icu::number::FormattedNumber formatted; -+ Maybe<bool> maybe_format = -+ IcuFormatNumber(isolate, number_format, numeric_obj, &formatted); - MAYBE_RETURN(maybe_format, Handle<String>()); -- return Intl::ToString(isolate, maybe_format.FromJust()); -+ UErrorCode status = U_ZERO_ERROR; -+ icu::UnicodeString result = formatted.toString(status); -+ if (U_FAILURE(status)) { -+ THROW_NEW_ERROR(isolate, NewTypeError(MessageTemplate::kIcuError), String); -+ } -+ return Intl::ToString(isolate, result); - } - - namespace { -@@ -1359,12 +1354,18 @@ std::vector<NumberFormatSpan> FlattenRegionsToParts( - } - - namespace { --Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, -- icu::FieldPositionIterator* fp_iter, -+Maybe<int> ConstructParts(Isolate* isolate, -+ icu::number::FormattedNumber* formatted, - Handle<JSArray> result, int start_index, - Handle<Object> numeric_obj, bool style_is_unit) { -+ UErrorCode status = U_ZERO_ERROR; -+ icu::UnicodeString formatted_text = formatted->toString(status); -+ if (U_FAILURE(status)) { -+ THROW_NEW_ERROR_RETURN_VALUE( -+ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<int>()); -+ } - DCHECK(numeric_obj->IsNumeric()); -- int32_t length = formatted.length(); -+ int32_t length = formatted_text.length(); - int index = start_index; - if (length == 0) return Just(index); - -@@ -1373,13 +1374,14 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, - // other region covers some part of the formatted string. It's possible - // there's another field with exactly the same begin and end as this backdrop, - // in which case the backdrop's field_id of -1 will give it lower priority. -- regions.push_back(NumberFormatSpan(-1, 0, formatted.length())); -+ regions.push_back(NumberFormatSpan(-1, 0, formatted_text.length())); - - { -- icu::FieldPosition fp; -- while (fp_iter->next(fp)) { -- regions.push_back(NumberFormatSpan(fp.getField(), fp.getBeginIndex(), -- fp.getEndIndex())); -+ icu::ConstrainedFieldPosition cfp; -+ cfp.constrainCategory(UFIELD_CATEGORY_NUMBER); -+ while (formatted->nextPosition(cfp, status)) { -+ regions.push_back( -+ NumberFormatSpan(cfp.getField(), cfp.getStart(), cfp.getLimit())); - } - } - -@@ -1401,7 +1403,7 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, - Handle<String> substring; - ASSIGN_RETURN_ON_EXCEPTION_VALUE( - isolate, substring, -- Intl::ToString(isolate, formatted, part.begin_pos, part.end_pos), -+ Intl::ToString(isolate, formatted_text, part.begin_pos, part.end_pos), - Nothing<int>()); - Intl::AddElement(isolate, result, index, field_type_string, substring); - ++index; -@@ -1421,14 +1423,14 @@ MaybeHandle<JSArray> JSNumberFormat::FormatToParts( - number_format->icu_number_formatter().raw(); - CHECK_NOT_NULL(fmt); - -- icu::FieldPositionIterator fp_iter; -- Maybe<icu::UnicodeString> maybe_format = -- IcuFormatNumber(isolate, *fmt, numeric_obj, &fp_iter); -+ icu::number::FormattedNumber formatted; -+ Maybe<bool> maybe_format = -+ IcuFormatNumber(isolate, *fmt, numeric_obj, &formatted); - MAYBE_RETURN(maybe_format, Handle<JSArray>()); - - Handle<JSArray> result = factory->NewJSArray(0); - Maybe<int> maybe_format_to_parts = ConstructParts( -- isolate, maybe_format.FromJust(), &fp_iter, result, 0, numeric_obj, -+ isolate, &formatted, result, 0, numeric_obj, - number_format->style() == JSNumberFormat::Style::UNIT); - MAYBE_RETURN(maybe_format_to_parts, Handle<JSArray>()); - Deleted: rebuild.list =================================================================== --- rebuild.list 2020-04-30 07:59:44 UTC (rev 622408) +++ rebuild.list 2020-04-30 08:00:06 UTC (rev 622409) @@ -1,2 +0,0 @@ -apm -bash-language-server Copied: nodejs/repos/community-staging-x86_64/rebuild.list (from rev 622408, nodejs/trunk/rebuild.list) =================================================================== --- rebuild.list (rev 0) +++ rebuild.list 2020-04-30 08:00:06 UTC (rev 622409) @@ -0,0 +1,2 @@ +apm +bash-language-server