From: Noah-Huppert <Noah-Huppert@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] nodejs: update to 14.5.0
Date: Mon, 10 Aug 2020 20:55:52 +0200 [thread overview]
Message-ID: <20200810185552.rDAXOy-eIuDl2znkkh6Hm6hyFOKVYFrRU7kcOTBUdDM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23433@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 617 bytes --]
There is an updated pull request by Noah-Huppert against master on the void-packages repository
https://github.com/Noah-Huppert/void-packages node14
https://github.com/void-linux/void-packages/pull/23433
nodejs: update to 14.5.0
Works on my machine (`x86_64`):
```
% ./xbps-src pkg nodejs
% sudo xbps-install --repository "$PWD/hostdir/binpkgs/node14/" -Syu nodejs
% node -v
v14.5.0
```
I removed the patches b/c I assume in this version they aren't needed? Someone familiar with the package should confirm this.
A patch file from https://github.com/void-linux/void-packages/pull/23433.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-node14-23433.patch --]
[-- Type: text/x-diff, Size: 10412 bytes --]
From 7390703fe76ca024d6b2aeedfe684f9c1a38cf1e Mon Sep 17 00:00:00 2001
From: Noah Huppert <contact@noahh.io>
Date: Mon, 10 Aug 2020 14:13:37 -0400
Subject: [PATCH] [ci skip] nodejs: update to 14.7.0
---
.../patches/0092-getAllFieldPositions.patch | 169 ------------------
srcpkgs/nodejs/patches/ppc32.patch | 20 ---
srcpkgs/nodejs/template | 6 +-
3 files changed, 3 insertions(+), 192 deletions(-)
delete mode 100644 srcpkgs/nodejs/patches/0092-getAllFieldPositions.patch
delete mode 100644 srcpkgs/nodejs/patches/ppc32.patch
diff --git a/srcpkgs/nodejs/patches/0092-getAllFieldPositions.patch b/srcpkgs/nodejs/patches/0092-getAllFieldPositions.patch
deleted file mode 100644
index f9d3718949b..00000000000
--- a/srcpkgs/nodejs/patches/0092-getAllFieldPositions.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 2b107e7670ffb43719a66ee4a55ab408a5dcf2a5 Mon Sep 17 00:00:00 2001
-From: Ujjwal Sharma <ryzokuken@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 <jkummerow@chromium.org>
- Commit-Queue: Frank Tang <ftang@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/src/3rdparty/chromium/v8/src/objects/js-number-format.cc b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
-index 92d3e2fb82e..ced408aa173 100644
---- deps/v8/src/objects/js-number-format.cc
-+++ 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>());
-
diff --git a/srcpkgs/nodejs/patches/ppc32.patch b/srcpkgs/nodejs/patches/ppc32.patch
deleted file mode 100644
index 502d471429f..00000000000
--- a/srcpkgs/nodejs/patches/ppc32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- deps/v8/src/libsampler/sampler.cc.orig
-+++ deps/v8/src/libsampler/sampler.cc
-@@ -423,10 +423,17 @@
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link);
- #else
- // Some C libraries, notably Musl, define the regs member as a void pointer
-+ #if !V8_TARGET_ARCH_32_BIT
- state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
- state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
- state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]);
-+ #else
-+ state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+ state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+ state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+ state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]);
-+ #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index c7dc1281b8a..b5641b870e0 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
# Template file for 'nodejs'
pkgname=nodejs
-version=13.2.0
-revision=3
+version=14.7.0
+revision=1
wrksrc="node-v${version}"
# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
hostmakedepends="which pkg-config python3 zlib-devel $(vopt_if icu icu-devel)
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=379dcecb721984a99dc9e16c2a096d6eb7a760d50b188582d9ce33e0478a1a5e
+checksum=2a34cc5b7386259b1c601ae9e538a3a10403493fa42d3bcd95004782331a56ef
python_version=3
build_options="ssl libuv http_parser icu nghttp2 cares"
next prev parent reply other threads:[~2020-08-10 18:55 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-07 4:30 [PR PATCH] " Noah-Huppert
2020-07-07 4:35 ` ericonr
2020-07-07 5:06 ` Noah-Huppert
2020-07-07 5:40 ` Noah-Huppert
2020-07-07 7:10 ` fosslinux
2020-08-08 4:46 ` [PR PATCH] [Updated] " Noah-Huppert
2020-08-08 4:47 ` Noah-Huppert
2020-08-09 18:14 ` bn4t
2020-08-10 17:17 ` Noah-Huppert
2020-08-10 18:55 ` Noah-Huppert [this message]
2020-08-10 18:56 ` nodejs: update to 14.7.0 Noah-Huppert
2020-09-09 17:38 ` q5sys
2020-09-09 18:05 ` Noah-Huppert
2020-09-09 18:17 ` q5sys
2020-09-09 18:17 ` Noah-Huppert
2020-09-09 18:42 ` Johnnynator
2020-09-09 18:54 ` Noah-Huppert
2020-09-09 18:54 ` Noah-Huppert
2020-09-09 18:57 ` Johnnynator
2020-09-11 20:21 ` Johnnynator
2020-09-12 17:48 ` [PR PATCH] [Closed]: " leahneukirchen
2020-09-12 17:48 ` leahneukirchen
2020-09-12 19:25 ` Noah-Huppert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200810185552.rDAXOy-eIuDl2znkkh6Hm6hyFOKVYFrRU7kcOTBUdDM@z \
--to=noah-huppert@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).