From d429a8193014c4f0b2d093bb740ef3f537468d89 Mon Sep 17 00:00:00 2001 From: Mihail Ivanchev Date: Thu, 23 May 2024 14:21:06 +0200 Subject: [PATCH 1/4] nodejs: update to 20.13.1 --- srcpkgs/nodejs/patches/cross-aarch64.patch | 39 +++------------------- srcpkgs/nodejs/patches/python312.patch | 19 ----------- srcpkgs/nodejs/template | 4 +-- 3 files changed, 7 insertions(+), 55 deletions(-) delete mode 100644 srcpkgs/nodejs/patches/python312.patch diff --git a/srcpkgs/nodejs/patches/cross-aarch64.patch b/srcpkgs/nodejs/patches/cross-aarch64.patch index fa05cb15813e89..137835c699df25 100644 --- a/srcpkgs/nodejs/patches/cross-aarch64.patch +++ b/srcpkgs/nodejs/patches/cross-aarch64.patch @@ -1,40 +1,11 @@ -From 6bdf9dc3ec7dbff00acef081f4e3dd3e061fd744 Mon Sep 17 00:00:00 2001 -From: Ben Noordhuis -Date: Tue, 6 Dec 2022 11:27:49 +0100 -Subject: [PATCH] build: fix arm64 cross-compilation - -Commit 938212f added -msign-return-address=all to _all_ cflags but that -is wrong when cross-compiling, it should only be added to the target's -cflags. - -Fixes: https://github.com/nodejs/node/issues/42888 ---- - configure.py | 2 -- - node.gyp | 3 +++ - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/configure.py b/configure.py -index 40e0395e..9de3148f 100755 ---- a/configure.py -+++ b/configure.py -@@ -1294,9 +1294,7 @@ def configure_node(o): - - o['variables']['want_separate_host_toolset'] = int(cross_compiling) - -- # Enable branch protection for arm64 - if target_arch == 'arm64': -- o['cflags']+=['-msign-return-address=all'] - o['variables']['arm_fpu'] = options.arm_fpu or 'neon' - - if options.node_snapshot_main is not None: diff --git a/node.gyp b/node.gyp -index cf52281b..5218d941 100644 +index 5abbad6c6f..96eedf1b24 100644 --- a/node.gyp +++ b/node.gyp -@@ -112,6 +112,9 @@ - }, - - 'conditions': [ +@@ -481,6 +481,9 @@ + }], + ], + }], + ['target_arch=="arm64"', { + 'cflags': ['-msign-return-address=all'], # Pointer authentication. + }], diff --git a/srcpkgs/nodejs/patches/python312.patch b/srcpkgs/nodejs/patches/python312.patch deleted file mode 100644 index b5f1d22877f7e4..00000000000000 --- a/srcpkgs/nodejs/patches/python312.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ./configure.orig 2023-10-11 07:49:24.971659089 -0400 -+++ ./configure 2023-10-11 07:49:51.615780727 -0400 -@@ -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.12 >/dev/null && exec python3.12 "$0" "$@" - command -v python3.11 >/dev/null && exec python3.11 "$0" "$@" - command -v python3.10 >/dev/null && exec python3.10 "$0" "$@" - command -v python3.9 >/dev/null && exec python3.9 "$0" "$@" -@@ -23,7 +24,7 @@ - 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/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index 33d4fd11ad8a9e..69304162ff7184 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -1,6 +1,6 @@ # Template file for 'nodejs' pkgname=nodejs -version=18.19.1 +version=20.13.1 revision=1 hostmakedepends="which pkg-config python3-setuptools" _make_depends="zlib-devel $(vopt_if icu icu-devel) @@ -15,7 +15,7 @@ license="MIT" homepage="https://nodejs.org/" changelog="https://raw.githubusercontent.com/nodejs/node/main/doc/changelogs/CHANGELOG_V${version%%.*}.md" distfiles="https://nodejs.org/dist/v${version}/node-v${version}.tar.xz" -checksum=090f96a2ecde080b6b382c6d642bca5d0be4702a78cb555be7bf02b20bd16ded +checksum=791786a09023241cb7e4f7d65ec90aa924bb39141ff7bb6d5a1dedf7def4b4e7 python_version=3 build_options="ssl libuv icu nghttp2 cares brotli" From 99d39466a9adb062185882227a8f0efb86273956 Mon Sep 17 00:00:00 2001 From: Mihail Ivanchev Date: Thu, 23 May 2024 14:24:32 +0200 Subject: [PATCH 2/4] Rocket.Chat: rebuild for new nodejs version --- srcpkgs/Rocket.Chat-Desktop/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Rocket.Chat-Desktop/template b/srcpkgs/Rocket.Chat-Desktop/template index d7ecb67b7473f3..96a03340478bb4 100644 --- a/srcpkgs/Rocket.Chat-Desktop/template +++ b/srcpkgs/Rocket.Chat-Desktop/template @@ -1,7 +1,7 @@ # Template file for 'Rocket.Chat-Desktop' pkgname=Rocket.Chat-Desktop version=3.8.7 -revision=2 +revision=3 _electron_ver=19 hostmakedepends="yarn nodejs python3 pkg-config app-builder" makedepends="electron${_electron_ver} libvips-devel" From d49951a64adc143c7985572864c54af8d1023c5f Mon Sep 17 00:00:00 2001 From: Mihail Ivanchev Date: Thu, 23 May 2024 14:26:40 +0200 Subject: [PATCH 3/4] Signal-Desktop: rebuild for new nodejs version --- srcpkgs/Signal-Desktop/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template index cba44a86ff3d4c..d216e08c9004ad 100644 --- a/srcpkgs/Signal-Desktop/template +++ b/srcpkgs/Signal-Desktop/template @@ -1,7 +1,7 @@ # Template file for 'Signal-Desktop' pkgname=Signal-Desktop version=7.10.0 -revision=1 +revision=2 # Signal officially only supports x86_64 # x86_64-musl could potentially work based on the Alpine port: # https://git.alpinelinux.org/aports/tree/testing/signal-desktop From 116ec3d2b357ef47dc90675e8ef25d7b9b760622 Mon Sep 17 00:00:00 2001 From: Mihail Ivanchev Date: Thu, 23 May 2024 14:27:18 +0200 Subject: [PATCH 4/4] ansible-language-server: rebuild for new nodejs version --- srcpkgs/ansible-language-server/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ansible-language-server/template b/srcpkgs/ansible-language-server/template index ef2bb4fef754a5..2a8a2cf610a9e7 100644 --- a/srcpkgs/ansible-language-server/template +++ b/srcpkgs/ansible-language-server/template @@ -1,7 +1,7 @@ # Template file for 'ansible-language-server' pkgname=ansible-language-server version=1.2.1 -revision=1 +revision=2 hostmakedepends="nodejs" depends="nodejs" short_desc="Ansible Language Server"