Date: Sunday, July 18, 2021 @ 23:20:21 Author: archange Revision: 978543
upgpkg: nodejs-lts-fermium 14.17.3-1 Remove ICU 69 patch, fixed upstream. Modified: nodejs-lts-fermium/trunk/PKGBUILD Deleted: nodejs-lts-fermium/trunk/v8-call-new-ListFormatter-createInstance.patch ------------------------------------------------+ PKGBUILD | 15 --- v8-call-new-ListFormatter-createInstance.patch | 95 ----------------------- 2 files changed, 4 insertions(+), 106 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-07-18 23:03:59 UTC (rev 978542) +++ PKGBUILD 2021-07-18 23:20:21 UTC (rev 978543) @@ -2,8 +2,8 @@ # Contributor: Felix Yan <[email protected]> pkgname=nodejs-lts-fermium -pkgver=14.16.0 -pkgrel=2 +pkgver=14.17.3 +pkgrel=1 pkgdesc="Evented I/O for V8 javascript (LTS release: Fermium)" arch=(x86_64) url="https://nodejs.org/"; @@ -13,11 +13,9 @@ optdepends=('npm: nodejs package manager') provides=("nodejs=$pkgver") conflicts=(nodejs) -source=("${url}/dist/v${pkgver}/node-v${pkgver}.tar.xz" - v8-call-new-ListFormatter-createInstance.patch) +source=(${url}/dist/v${pkgver}/node-v${pkgver}.tar.xz) # https://nodejs.org/download/release/latest-fermium/SHASUMS256.txt.asc -sha256sums=('4e7648a617f79b459d583f7dbdd31fbbac5b846d41598f3b54331a5b6115dfa6' - '44ebcff050a1c849819d66399c14bd711801d0eb64f518d292d3d6efedce3b3a') +sha256sums=(4b8b4b5e1b360f9e51dd72130eec21b79f5832ca55200393c657e9ad76697f48) validpgpkeys=(C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 # Myles Borins <[email protected]> 77984A986EBC2AA786BC0F66B01FBB92821C587A # Gibson Fahnestock <[email protected]> B9AE9905FFD7803F25714661B63B535A4C206CA9 # Evan Lucas <[email protected]> @@ -26,11 +24,6 @@ 4ED778F539E3634C779C87C6D7062848A1AB005C # Beth Griggs <[email protected]> C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C) # Richard Lau <[email protected]> -prepare() { - cd node-v${pkgver} - patch -Np1 -d deps/v8 <../v8-call-new-ListFormatter-createInstance.patch -} - build() { cd node-v${pkgver} Deleted: v8-call-new-ListFormatter-createInstance.patch =================================================================== --- v8-call-new-ListFormatter-createInstance.patch 2021-07-18 23:03:59 UTC (rev 978542) +++ v8-call-new-ListFormatter-createInstance.patch 2021-07-18 23:20:21 UTC (rev 978543) @@ -1,95 +0,0 @@ -From 035c305ce7761f51328b45f1bd83e26aef267c9d Mon Sep 17 00:00:00 2001 -From: Frank Tang <[email protected]> -Date: Thu, 15 Oct 2020 22:44:27 -0700 -Subject: [PATCH] [Intl] call new ListFormatter::createInstance - -The one we currently using is now marked as internal and to be removed -for 68. Migrating to the style which already avaiable in ICU 67-1. - -Bug: v8:11031 -Change-Id: I668382a2e1b8602ddca02bf231c5008a6c92bf2d -Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2477751 -Reviewed-by: Jakob Kummerow <[email protected]> -Commit-Queue: Frank Tang <[email protected]> -Cr-Commit-Position: refs/heads/master@{#70638} ---- - src/objects/js-list-format.cc | 55 ++++++++++++----------------------- - 1 file changed, 18 insertions(+), 37 deletions(-) - -diff --git a/src/objects/js-list-format.cc b/src/objects/js-list-format.cc -index b17d38c43ff5..e48a387be50f 100644 ---- a/src/objects/js-list-format.cc -+++ b/src/objects/js-list-format.cc -@@ -29,46 +29,27 @@ namespace v8 { - namespace internal { - - namespace { --const char* kStandard = "standard"; --const char* kOr = "or"; --const char* kUnit = "unit"; --const char* kStandardShort = "standard-short"; --const char* kOrShort = "or-short"; --const char* kUnitShort = "unit-short"; --const char* kStandardNarrow = "standard-narrow"; --const char* kOrNarrow = "or-narrow"; --const char* kUnitNarrow = "unit-narrow"; -- --const char* GetIcuStyleString(JSListFormat::Style style, -- JSListFormat::Type type) { -+ -+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: -- switch (style) { -- case JSListFormat::Style::LONG: -- return kStandard; -- case JSListFormat::Style::SHORT: -- return kStandardShort; -- case JSListFormat::Style::NARROW: -- return kStandardNarrow; -- } -+ return ULISTFMT_TYPE_AND; - case JSListFormat::Type::DISJUNCTION: -- switch (style) { -- case JSListFormat::Style::LONG: -- return kOr; -- case JSListFormat::Style::SHORT: -- return kOrShort; -- case JSListFormat::Style::NARROW: -- return kOrNarrow; -- } -+ return ULISTFMT_TYPE_OR; - case JSListFormat::Type::UNIT: -- switch (style) { -- case JSListFormat::Style::LONG: -- return kUnit; -- case JSListFormat::Style::SHORT: -- return kUnitShort; -- case JSListFormat::Style::NARROW: -- return kUnitNarrow; -- } -+ return ULISTFMT_TYPE_UNITS; - } - UNREACHABLE(); - } -@@ -143,7 +124,7 @@ MaybeHandle<JSListFormat> JSListFormat::New(Isolate* isolate, Handle<Map> map, - 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),
