diff --git a/extra/nodejs/build b/extra/nodejs/build index 0e2e39b5..aeb8310e 100755 --- a/extra/nodejs/build +++ b/extra/nodejs/build @@ -1,7 +1,5 @@ #!/bin/sh -e -patch -p1 < python-3.10.patch - # Fix build when libatomic.so does not exist in the system. # This may be provided by compiler-rt which requires no additional # linker flags to be used. diff --git a/extra/nodejs/checksums b/extra/nodejs/checksums index 8632504d..88b8ef9d 100644 --- a/extra/nodejs/checksums +++ b/extra/nodejs/checksums @@ -1,2 +1 @@ -97dc1aca232b4911e0b9e5a23a03200ab8ef05157e03c732315b579481bf7912 -4a9acf25dd64f94ad551f8a0e8c81189c23912132705f1655f7f9c54073d55b3 +d3f631bd0d215ded26b49b2eae42c84de2ba1b46f00cc2930809900a0f7165ae diff --git a/extra/nodejs/patches/python-3.10.patch b/extra/nodejs/patches/python-3.10.patch deleted file mode 100644 index 32bea19f..00000000 --- a/extra/nodejs/patches/python-3.10.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/configure b/configure -index baf4b513..6ef2da2e 100755 ---- a/configure -+++ b/configure -@@ -4,6 +4,7 @@ - # Note that the mix of single and double quotes is intentional, - # as is the fact that the ] goes on a new line. - _=[ 'exec' '/bin/sh' '-c' ''' -+command -v python3.10 >/dev/null && exec python3.10 "$0" "$@" - command -v python3.9 >/dev/null && exec python3.9 "$0" "$@" - command -v python3.8 >/dev/null && exec python3.8 "$0" "$@" - command -v python3.7 >/dev/null && exec python3.7 "$0" "$@" -@@ -21,7 +22,7 @@ except ImportError: - from distutils.spawn import find_executable as which - - print('Node.js configure: Found Python {}.{}.{}...'.format(*sys.version_info)) --acceptable_pythons = ((3, 9), (3, 8), (3, 7), (3, 6)) -+acceptable_pythons = ((3, 10), (3, 9), (3, 8), (3, 7), (3, 6)) - if sys.version_info[:2] in acceptable_pythons: - import configure - else: -diff --git a/deps/v8/third_party/jinja2/tests.py b/deps/v8/third_party/jinja2/tests.py -index 0adc3d4d..b14f85ff 100644 ---- a/deps/v8/third_party/jinja2/tests.py -+++ b/deps/v8/third_party/jinja2/tests.py -@@ -10,7 +10,7 @@ - """ - import operator - import re --from collections import Mapping -+from collections.abc import Mapping - from jinja2.runtime import Undefined - from jinja2._compat import text_type, string_types, integer_types - import decimal -diff --git a/tools/inspector_protocol/jinja2/tests.py b/tools/inspector_protocol/jinja2/tests.py -index 0adc3d4d..b14f85ff 100644 ---- a/tools/inspector_protocol/jinja2/tests.py -+++ b/tools/inspector_protocol/jinja2/tests.py -@@ -10,7 +10,7 @@ - """ - import operator - import re --from collections import Mapping -+from collections.abc import Mapping - from jinja2.runtime import Undefined - from jinja2._compat import text_type, string_types, integer_types - import decimal diff --git a/extra/nodejs/sources b/extra/nodejs/sources index e2572071..b812f1d0 100644 --- a/extra/nodejs/sources +++ b/extra/nodejs/sources @@ -1,2 +1 @@ https://nodejs.org/download/release/vVERSION/node-vVERSION.tar.xz -patches/python-3.10.patch diff --git a/extra/nodejs/version b/extra/nodejs/version index 37a9bdf0..a50ebb29 100644 --- a/extra/nodejs/version +++ b/extra/nodejs/version @@ -1 +1 @@ -16.10.0 1 +16.11.0 1