From 8e6db99b38acac2b3ec4ec047358275c34fa2b42 Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Wed, 21 Oct 2020 02:50:49 +0900 Subject: [PATCH 1/2] nodejs: update to 15.0.0 Signed-off-by: Sora Morimoto --- srcpkgs/nodejs/patches/python3.9.patch | 35 -------------------------- srcpkgs/nodejs/template | 4 +-- 2 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 srcpkgs/nodejs/patches/python3.9.patch diff --git a/srcpkgs/nodejs/patches/python3.9.patch b/srcpkgs/nodejs/patches/python3.9.patch deleted file mode 100644 index c6902083209..00000000000 --- a/srcpkgs/nodejs/patches/python3.9.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c8b950a7afcc3e7c222bb94fabccc7e2fb447457 Mon Sep 17 00:00:00 2001 -From: cclauss -Date: Tue, 6 Oct 2020 17:51:24 +0200 -Subject: [PATCH] build: gitHub actions: Python 3.9 and actions/setup-python@v2 - -PR-URL: https://github.com/nodejs/node/pull/35521 -Reviewed-By: Richard Lau -Reviewed-By: Shelley Vohr -Reviewed-By: Rich Trott -Reviewed-By: Jiawen Geng -Reviewed-By: Myles Borins - -Modified by fosslinux to remove .github stuff. - -diff --git configure configure -index 7e8c4cff832..07581d9c5a4 100755 ---- configure -+++ configure -@@ -5,6 +5,7 @@ - # as is the fact that the ] goes on a new line. - _=[ 'exec' '/bin/sh' '-c' ''' - test ${FORCE_PYTHON2} && exec python2 "$0" "$@" # workaround for gclient -+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" "$@" - command -v python3.6 >/dev/null && exec python3.6 "$0" "$@" -@@ -19,7 +20,7 @@ import sys - from distutils.spawn import find_executable - - print('Node.js configure: Found Python {0}.{1}.{2}...'.format(*sys.version_info)) --acceptable_pythons = ((3, 8), (3, 7), (3, 6), (3, 5), (2, 7)) -+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: diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index 91f2889fd52..74189e808e2 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -1,6 +1,6 @@ # Template file for 'nodejs' pkgname=nodejs -version=14.13.1 +version=15.0.0 revision=1 wrksrc="node-v${version}" # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079 @@ -17,7 +17,7 @@ maintainer="Enno Boland " license="MIT" homepage="https://nodejs.org/" distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz" -checksum=f0080d3284ea1585e255a3f459ce151e8106a33f4ce8bed0da15ff99c6a082a5 +checksum=72f6234594877ab212c43a76f2f5b05d409d7c025e0eb36d675d9acfd0d3f2d8 python_version=3 build_options="ssl libuv http_parser icu nghttp2 cares" From 734a50802fd15c32d12d771ee5ee4f5fcb269f7a Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Fri, 23 Oct 2020 18:37:57 +0900 Subject: [PATCH 2/2] WIP Signed-off-by: Sora Morimoto --- srcpkgs/nodejs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index 74189e808e2..a422c142f14 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -1,6 +1,6 @@ # Template file for 'nodejs' pkgname=nodejs -version=15.0.0 +version=15.0.1 revision=1 wrksrc="node-v${version}" # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079 @@ -17,7 +17,7 @@ maintainer="Enno Boland " license="MIT" homepage="https://nodejs.org/" distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz" -checksum=72f6234594877ab212c43a76f2f5b05d409d7c025e0eb36d675d9acfd0d3f2d8 +checksum=b9a00a4847863914ffe7751c2d81b67cb96a8f958cbc692f988c8c78db14ebec python_version=3 build_options="ssl libuv http_parser icu nghttp2 cares"