From 93b5f8413a9294f986aeb5bc7f4889f8a010152a Mon Sep 17 00:00:00 2001 From: Philip Brown Date: Fri, 19 Apr 2024 09:15:16 +0000 Subject: [PATCH] node 18: update to 18.20.2 --- build/nodejs/build-18.sh | 2 +- build/nodejs/patches-18/python-3.12.patch | 27 +++++++++++++---------- doc/packages.md | 2 +- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/build/nodejs/build-18.sh b/build/nodejs/build-18.sh index d0c701cd8..060a6937f 100755 --- a/build/nodejs/build-18.sh +++ b/build/nodejs/build-18.sh @@ -17,7 +17,7 @@ . ../../lib/build.sh PROG=node -VER=18.19.1 +VER=18.20.2 PKG=ooce/runtime/node-18 SUMMARY="Node.js is an evented I/O framework for the V8 JavaScript engine." DESC="Node.js is an evented I/O framework for the V8 JavaScript engine. " diff --git a/build/nodejs/patches-18/python-3.12.patch b/build/nodejs/patches-18/python-3.12.patch index 568307ab4..db22df215 100644 --- a/build/nodejs/patches-18/python-3.12.patch +++ b/build/nodejs/patches-18/python-3.12.patch @@ -1,12 +1,15 @@ -diff -wpruN --no-dereference '--exclude=*.orig' a~/configure a/configure ---- a~/configure 1970-01-01 00:00:00 -+++ a/configure 1970-01-01 00:00:00 -@@ -23,7 +23,7 @@ except ImportError: - from distutils.spawn import find_executable as which - - print('Node.js configure: Found Python {}.{}.{}...'.format(*sys.version_info)) --acceptable_pythons = ((3, 11), (3, 10), (3, 9), (3, 8), (3, 7), (3, 6)) -+acceptable_pythons = ((3, 12), (3, 11), (3, 10), (3, 9), (3, 8), (3, 7), (3, 6)) - if sys.version_info[:2] in acceptable_pythons: - import configure - else: +diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.rej a/configure.rej +--- a~/configure.rej 1970-01-01 00:00:00 ++++ a/configure.rej 1970-01-01 00:00:00 +@@ -0,0 +1,11 @@ ++--- configure 1970-01-01 00:00:00 +++++ configure 1970-01-01 00:00:00 ++@@ -23,7 +23,7 @@ except ImportError: ++ from distutils.spawn import find_executable as which ++ ++ print('Node.js configure: Found Python {}.{}.{}...'.format(*sys.version_info)) ++-acceptable_pythons = ((3, 11), (3, 10), (3, 9), (3, 8), (3, 7), (3, 6)) +++acceptable_pythons = ((3, 12), (3, 11), (3, 10), (3, 9), (3, 8), (3, 7), (3, 6)) ++ if sys.version_info[:2] in acceptable_pythons: ++ import configure ++ else: diff --git a/doc/packages.md b/doc/packages.md index 014599f76..8dd9022f2 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -183,7 +183,7 @@ | ooce/runtime/gnu-smalltalk | 3.2.5 | https://ftp.gnu.org/gnu/smalltalk/ | [omniosorg](https://github.com/omniosorg) | ooce/runtime/groovy-30 | 3.0.21 | https://groovy.apache.org/download.html | [omniosorg](https://github.com/omniosorg) | ooce/runtime/groovy-40 | 4.0.21 | https://groovy.apache.org/download.html | [omniosorg](https://github.com/omniosorg) -| ooce/runtime/node-18 | 18.19.1 | https://nodejs.org/download/release/index.json https://nodejs.org/en/download/ | [omniosorg](https://github.com/omniosorg) +| ooce/runtime/node-18 | 18.20.2 | https://nodejs.org/download/release/index.json https://nodejs.org/en/download/ | [omniosorg](https://github.com/omniosorg) | ooce/runtime/node-20 | 20.12.2 | https://nodejs.org/download/release/index.json https://nodejs.org/en/download/ | [omniosorg](https://github.com/omniosorg) | ooce/runtime/ruby-30 | 3.0.6 | https://www.ruby-lang.org/en/downloads/ | [omniosorg](https://github.com/omniosorg) | ooce/runtime/ruby-31 | 3.1.4 | https://www.ruby-lang.org/en/downloads/ | [omniosorg](https://github.com/omniosorg)