Date: Tue, 21 Sep 2021 20:28:27 GMT From: "Bradley T. Hughes" <bhughes@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 6cc50a438bb3 - main - www/node14: Update 14.17.0 -> 14.17.1 Message-ID: <202109212028.18LKSR1K073768@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bhughes: URL: https://cgit.FreeBSD.org/ports/commit/?id=6cc50a438bb3d8504a56f590bb0b05847970007d commit 6cc50a438bb3d8504a56f590bb0b05847970007d Author: Bradley T. Hughes <bhughes@FreeBSD.org> AuthorDate: 2021-09-14 06:47:41 +0000 Commit: Bradley T. Hughes <bhughes@FreeBSD.org> CommitDate: 2021-09-21 20:20:39 +0000 www/node14: Update 14.17.0 -> 14.17.1 https://nodejs.org/en/blog/release/v14.17.1/ Drop files/patch-deps_v8_src_objects_js-list-format.cc since the change has been upstreamed along with the ICU minimum version bump. Sponsored by: Miles AS --- www/node14/Makefile | 4 +- www/node14/distinfo | 6 +- .../patch-deps_v8_src_objects_js-list-format.cc | 83 ---------------------- 3 files changed, 5 insertions(+), 88 deletions(-) diff --git a/www/node14/Makefile b/www/node14/Makefile index da98e11830ac..ae139847bd3f 100644 --- a/www/node14/Makefile +++ b/www/node14/Makefile @@ -1,6 +1,6 @@ PORTNAME= node DISTVERSIONPREFIX= v -DISTVERSION= 14.17.0 +DISTVERSION= 14.17.1 CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${DISTVERSION}/ PKGNAMESUFFIX= 14 @@ -41,7 +41,7 @@ BUNDLED_SSL_CONFIGURE_OFF= --shared-openssl --openssl-use-def-ca-store BUNDLED_SSL_RUN_DEPENDS_OFF= ca_root_nss>=0:security/ca_root_nss NLS_CONFIGURE_ON= --with-intl=system-icu -NLS_BUILD_DEPENDS= icu>=67.1:devel/icu +NLS_BUILD_DEPENDS= icu>=69.1:devel/icu NLS_LIB_DEPENDS= libicui18n.so:devel/icu DTRACE_CONFIGURE_ON= --with-dtrace diff --git a/www/node14/distinfo b/www/node14/distinfo index f6657ba1cd24..ddbc57ce8810 100644 --- a/www/node14/distinfo +++ b/www/node14/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1621284032 -SHA256 (node-v14.17.0.tar.gz) = 6114e82d3256136dc85a509d835442fbdf2f8430dcd8bfa7c304097344d06fb7 -SIZE (node-v14.17.0.tar.gz) = 63562031 +TIMESTAMP = 1631602049 +SHA256 (node-v14.17.1.tar.gz) = f85297faa15529cf134e9cfd395371fea62e092c3fe2127f2b0fdf8504905cee +SIZE (node-v14.17.1.tar.gz) = 63704704 diff --git a/www/node14/files/patch-deps_v8_src_objects_js-list-format.cc b/www/node14/files/patch-deps_v8_src_objects_js-list-format.cc deleted file mode 100644 index 866327498616..000000000000 --- a/www/node14/files/patch-deps_v8_src_objects_js-list-format.cc +++ /dev/null @@ -1,83 +0,0 @@ -https://github.com/v8/v8/commit/035c305ce7761f51328b45f1bd83e26aef267c9d - -../deps/v8/src/objects/js-list-format.cc:145:55: error: 'createInstance' is a private member of 'icu::ListFormatter' - icu::ListFormatter* formatter = icu::ListFormatter::createInstance( - ~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~ -/usr/local/include/unicode/listformatter.h:267:27: note: declared private here - static ListFormatter* createInstance(const Locale& locale, const char* style, UErrorCode& errorCode); - ^ - ---- deps/v8/src/objects/js-list-format.cc.orig 2021-04-06 19:42:15 UTC -+++ deps/v8/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* i - 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),
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109212028.18LKSR1K073768>