[arch-commits] Commit in nodejs-lts-erbium/repos (4 files)
Evangelos Foutras
foutrelis at archlinux.org
Thu Apr 15 12:46:13 UTC 2021
Date: Thursday, April 15, 2021 @ 12:46:13
Author: foutrelis
Revision: 919040
archrelease: copy trunk to community-staging-x86_64
Added:
nodejs-lts-erbium/repos/community-staging-x86_64/
nodejs-lts-erbium/repos/community-staging-x86_64/PKGBUILD
(from rev 919039, nodejs-lts-erbium/trunk/PKGBUILD)
nodejs-lts-erbium/repos/community-staging-x86_64/python3.patch
(from rev 919039, nodejs-lts-erbium/trunk/python3.patch)
nodejs-lts-erbium/repos/community-staging-x86_64/v8-call-new-ListFormatter-createInstance.patch
(from rev 919039, nodejs-lts-erbium/trunk/v8-call-new-ListFormatter-createInstance.patch)
------------------------------------------------+
PKGBUILD | 65 +++++++++++++++
python3.patch | 58 ++++++++++++++
v8-call-new-ListFormatter-createInstance.patch | 95 +++++++++++++++++++++++
3 files changed, 218 insertions(+)
Copied: nodejs-lts-erbium/repos/community-staging-x86_64/PKGBUILD (from rev 919039, nodejs-lts-erbium/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2021-04-15 12:46:13 UTC (rev 919040)
@@ -0,0 +1,65 @@
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+# Contributor: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=nodejs-lts-erbium
+pkgver=12.22.0
+pkgrel=2
+pkgdesc="Evented I/O for V8 javascript (LTS release: Erbium)"
+arch=(x86_64)
+url="https://nodejs.org/"
+license=(MIT)
+depends=(openssl zlib icu libuv c-ares brotli libnghttp2) # http-parser
+makedepends=(python procps-ng)
+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
+ python3.patch)
+# https://nodejs.org/download/release/latest-erbium/SHASUMS256.txt.asc
+sha256sums=('df5c5f0ebad4889f5dd24e565eaaa9cbe2ca3274f78af469d9a20cc36f60ba23'
+ '44ebcff050a1c849819d66399c14bd711801d0eb64f518d292d3d6efedce3b3a'
+ '20a0f718c94a4686dfc66edd994788759cbda65734cbc52082884f6d0913477d')
+validpgpkeys=(C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 # Myles Borins <mylesborins at google.com>
+ 77984A986EBC2AA786BC0F66B01FBB92821C587A # Gibson Fahnestock <gibfahn at gmail.com>
+ B9AE9905FFD7803F25714661B63B535A4C206CA9 # Evan Lucas <evanlucas at me.com>
+ DD8F2338BAE7501E3DD5AC78C273792F7D83545D # Rod Vagg <rod at vagg.org>
+ B9E2F5981AA6E0CD28160D9FF13993A75599653C # Shelley Vohr <shelley.vohr at gmail.com>
+ 4ED778F539E3634C779C87C6D7062848A1AB005C # Beth Griggs <Bethany.Griggs at uk.ibm.com>
+ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C) # Richard Lau <rlau at redhat.com>
+
+prepare() {
+ cd node-v${pkgver}
+ patch -Np1 -F3 -d deps/v8 <../v8-call-new-ListFormatter-createInstance.patch
+ patch -Np1 -i ../python3.patch
+}
+
+build() {
+ cd node-v${pkgver}
+
+ ./configure \
+ --prefix=/usr \
+ --with-intl=system-icu \
+ --without-npm \
+ --shared-openssl \
+ --shared-zlib \
+ --shared-libuv \
+ --experimental-http-parser \
+ --shared-cares \
+ --shared-brotli \
+ --shared-nghttp2
+ #--shared-http-parser \
+
+ make
+}
+
+check() {
+ cd node-v${pkgver}
+ make test-only
+}
+
+package() {
+ cd node-v${pkgver}
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}/
+}
Copied: nodejs-lts-erbium/repos/community-staging-x86_64/python3.patch (from rev 919039, nodejs-lts-erbium/trunk/python3.patch)
===================================================================
--- community-staging-x86_64/python3.patch (rev 0)
+++ community-staging-x86_64/python3.patch 2021-04-15 12:46:13 UTC (rev 919040)
@@ -0,0 +1,58 @@
+diff --git a/configure b/configure
+index 9156e13f..630ef657 100755
+--- a/configure
++++ b/configure
+@@ -1,28 +1,37 @@
+ #!/bin/sh
+
+-# Locate python2 interpreter and re-execute the script. Note that the
+-# mix of single and double quotes is intentional, as is the fact that
+-# the ] goes on a new line.
++# Locate an acceptable python interpreter and then re-execute the script.
++# Note that the mix of single and double quotes is intentional,
++# as is the fact that the ] goes on a new line.
++# When a 'which' call is made for a specific version of Python on Travis CI,
++# pyenv will alert which shims are available and then will fail the build.
+ _=[ 'exec' '/bin/sh' '-c' '''
++test ${TRAVIS} && exec python "$0" "$@" # workaround for pyenv on Travis CI
++which python3.9 >/dev/null && exec python3.9 "$0" "$@"
++which python3.8 >/dev/null && exec python3.8 "$0" "$@"
++which python3.7 >/dev/null && exec python3.7 "$0" "$@"
++which python3.6 >/dev/null && exec python3.6 "$0" "$@"
++which python3.5 >/dev/null && exec python3.5 "$0" "$@"
++which python3 >/dev/null && exec python3 "$0" "$@"
+ which python2.7 >/dev/null && exec python2.7 "$0" "$@"
+-which python2 >/dev/null && exec python2 "$0" "$@"
+ exec python "$0" "$@"
+ ''' "$0" "$@"
+ ]
+ del _
+
+ import sys
+-from distutils.spawn import find_executable as which
+-if sys.version_info[:2] != (2, 7):
+- sys.stderr.write('Please use Python 2.7')
++from distutils.spawn import find_executable
+
+- python2 = which('python2') or which('python2.7')
+-
+- if python2:
+- sys.stderr.write(':\n\n')
+- sys.stderr.write(' ' + python2 + ' ' + ' '.join(sys.argv))
+-
+- sys.stderr.write('\n')
++print('Node configure: Found Python {0}.{1}.{2}...'.format(*sys.version_info))
++acceptable_pythons = ((3, 9), (3, 8), (3, 7), (3, 6), (3, 5), (2, 7))
++if sys.version_info[:2] in acceptable_pythons:
++ import configure
++else:
++ python_cmds = ['python{0}.{1}'.format(*vers) for vers in acceptable_pythons]
++ sys.stderr.write('Please use {0}.\n'.format(' or '.join(python_cmds)))
++ for python_cmd in python_cmds:
++ python_cmd_path = find_executable(python_cmd)
++ if python_cmd_path and 'pyenv/shims' not in python_cmd_path:
++ sys.stderr.write('\t{0} {1}\n'.format(python_cmd_path,
++ ' '.join(sys.argv[:1])))
+ sys.exit(1)
+-
+-import configure
Copied: nodejs-lts-erbium/repos/community-staging-x86_64/v8-call-new-ListFormatter-createInstance.patch (from rev 919039, nodejs-lts-erbium/trunk/v8-call-new-ListFormatter-createInstance.patch)
===================================================================
--- community-staging-x86_64/v8-call-new-ListFormatter-createInstance.patch (rev 0)
+++ community-staging-x86_64/v8-call-new-ListFormatter-createInstance.patch 2021-04-15 12:46:13 UTC (rev 919040)
@@ -0,0 +1,95 @@
+From 035c305ce7761f51328b45f1bd83e26aef267c9d Mon Sep 17 00:00:00 2001
+From: Frank Tang <ftang at chromium.org>
+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 <jkummerow at chromium.org>
+Commit-Queue: Frank Tang <ftang at chromium.org>
+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),
More information about the arch-commits
mailing list