haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

nodejs: bump versions

Browse Source
This commit is contained in:
Jerome Duval
2021-06-05 14:53:20 +02:00
parent 5cac7e9e29
commit bb13b79dca
6 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net-libs/nodejs/nodejs12-12.21.0.recipe → net-libs/nodejs/nodejs12-12.22.0.recipe
View File

@@ -10,7 +10,7 @@ LICENSE="BSD (2-clause)"
REVISION="1"
SOURCE_URI="https://nodejs.org/dist/v$portVersion/node-v$portVersion.tar.xz"
SOURCE_DIR="node-v$portVersion"
CHECKSUM_SHA256="052f37ace6f569b513b5a1154b2a45d3c4d8b07d7d7c807b79f1566db61e979d"
CHECKSUM_SHA256="df5c5f0ebad4889f5dd24e565eaaa9cbe2ca3274f78af469d9a20cc36f60ba23"
PATCHES="nodejs-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 ?x86 x86_64"

2
net-libs/nodejs/nodejs14-14.16.0.recipe → net-libs/nodejs/nodejs14-14.17.0.recipe
View File

@@ -10,7 +10,7 @@ LICENSE="BSD (2-clause)"
REVISION="1"
SOURCE_URI="https://nodejs.org/dist/v$portVersion/node-v$portVersion.tar.xz"
SOURCE_DIR="node-v$portVersion"
CHECKSUM_SHA256="4e7648a617f79b459d583f7dbdd31fbbac5b846d41598f3b54331a5b6115dfa6"
CHECKSUM_SHA256="56e05bff9331039317db417f772e635e0cd1c55f733f7b1b079d71ab5842c9ed"
PATCHES="nodejs-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 ?x86 x86_64"

2
net-libs/nodejs/nodejs16-16.1.0.recipe → net-libs/nodejs/nodejs16-16.3.0.recipe
View File

@@ -10,7 +10,7 @@ LICENSE="BSD (2-clause)"
REVISION="1"
SOURCE_URI="https://github.com/nodejs/node/archive/v$portVersion/nodejs-$portVersion.tar.gz"
SOURCE_DIR="node-$portVersion"
CHECKSUM_SHA256="c82a47f858e63b2267a8783271d69626e3959884a5c84d152255b496c403c978"
CHECKSUM_SHA256="4d2eb041b914566edbd2792c2cd9843b2a4200e4c9507bc5695e0a6d9d126933"
PATCHES="nodejs-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86_64"

0
net-libs/nodejs/patches/nodejs-12.21.0.patchset → net-libs/nodejs/patches/nodejs-12.22.0.patchset
View File

60
net-libs/nodejs/patches/nodejs-14.16.0.patchset → net-libs/nodejs/patches/nodejs-14.17.0.patchset
View File

@@ -1,11 +1,11 @@
From 3aaf81dbdc8d0d657588d1d312090f61b57f9e70 Mon Sep 17 00:00:00 2001
From 191875a030e72e75da3c85c80890544f10b4c258 Mon Sep 17 00:00:00 2001
From: Calvin Hill <calvin@hakobaito.co.uk>
Date: Wed, 22 May 2019 11:23:37 +0000
Subject: Initial Haiku support for Node.js
diff --git a/common.gypi b/common.gypi
index e610650..515ae80 100644
index aa4279d..e81a699 100644
--- a/common.gypi
+++ b/common.gypi
@@ -257,6 +257,9 @@
@@ -74,7 +74,7 @@ index e610650..515ae80 100644
# `OPENSSL_THREADS` is defined via GYP for openSSL for all architectures.
'defines': [
diff --git a/configure.py b/configure.py
index e6f7e4d..e7cbf3d 100755
index a477bd1..32b5601 100755
--- a/configure.py
+++ b/configure.py
@@ -48,7 +48,7 @@ from fetch_deps import FetchDeps
@@ -189,7 +189,7 @@ index 905afd8..48ade67 100644
#endif // !NODE_SHARED_MODE
diff --git a/src/node_os.cc b/src/node_os.cc
index 2e151ac..a07b856 100644
index 3cde809..fac4b87 100644
--- a/src/node_os.cc
+++ b/src/node_os.cc
@@ -34,7 +34,7 @@
@@ -201,10 +201,10 @@ index 2e151ac..a07b856 100644
namespace node {
namespace os {
@@ -114,7 +114,17 @@ static void GetCPUInfo(const FunctionCallbackInfo<Value>& args) {
// [model, speed, (5 entries of cpu_times), model2, speed2, ...]
std::vector<Local<Value>> result(count * 7);
for (int i = 0, j = 0; i < count; i++) {
@@ -115,7 +115,17 @@ static void GetCPUInfo(const FunctionCallbackInfo<Value>& args) {
std::vector<Local<Value>> result;
result.reserve(count * 7);
for (int i = 0; i < count; i++) {
+ /*
uv_cpu_info_t* ci = cpu_infos + i;
+
@@ -216,27 +216,27 @@ index 2e151ac..a07b856 100644
+ std::cout << ci->cpu_times.idle << std::endl;
+ std::cout << ci->cpu_times.irq << std::endl;
+
result[j++] = OneByteString(isolate, ci->model);
result[j++] = Number::New(isolate, ci->speed);
result[j++] = Number::New(isolate, ci->cpu_times.user);
@@ -122,10 +132,11 @@ static void GetCPUInfo(const FunctionCallbackInfo<Value>& args) {
result[j++] = Number::New(isolate, ci->cpu_times.sys);
result[j++] = Number::New(isolate, ci->cpu_times.idle);
result[j++] = Number::New(isolate, ci->cpu_times.irq);
result.emplace_back(OneByteString(isolate, ci->model));
result.emplace_back(Number::New(isolate, ci->speed));
result.emplace_back(Number::New(isolate, ci->cpu_times.user));
@@ -123,10 +133,11 @@ static void GetCPUInfo(const FunctionCallbackInfo<Value>& args) {
result.emplace_back(Number::New(isolate, ci->cpu_times.sys));
result.emplace_back(Number::New(isolate, ci->cpu_times.idle));
result.emplace_back(Number::New(isolate, ci->cpu_times.irq));
+ */
}
uv_free_cpu_info(cpu_infos, count);
- args.GetReturnValue().Set(Array::New(isolate, result.data(), result.size()));
+ // args.GetReturnValue().Set(Array::New(isolate, result.data(), result.size()));
+// args.GetReturnValue().Set(Array::New(isolate, result.data(), result.size()));
}
diff --git a/src/node_report.cc b/src/node_report.cc
index 3b97bb7..25dcb4c 100644
index 13f87b1..de4455e 100644
--- a/src/node_report.cc
+++ b/src/node_report.cc
@@ -684,16 +684,16 @@ static void PrintSystemInformation(JSONWriter* writer) {
@@ -688,16 +688,16 @@ static void PrintSystemInformation(JSONWriter* writer) {
{"core_file_size_blocks", RLIMIT_CORE},
{"data_seg_size_kbytes", RLIMIT_DATA},
{"file_size_blocks", RLIMIT_FSIZE},
@@ -273,14 +273,14 @@ index 9734836..94e4d8c 100644
2.30.0
From c0213e9265469a8b1348d729849769f5cea7623d Mon Sep 17 00:00:00 2001
From a0f6d91f118a6f94fc276bc0e53991263b807d8c Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 27 Mar 2021 14:01:44 +0100
Subject: Haiku v8 patches
diff --git a/deps/v8/BUILD.gn b/deps/v8/BUILD.gn
index 167e635..77a0d56 100644
index eaaeadf..118a3b3 100644
--- a/deps/v8/BUILD.gn
+++ b/deps/v8/BUILD.gn
@@ -260,7 +260,7 @@ if (v8_enable_snapshot_native_code_counters == "") {
@@ -301,7 +301,7 @@ index 167e635..77a0d56 100644
cflags += [ "-Wmissing-field-initializers" ]
if (v8_current_cpu != "mips" && v8_current_cpu != "mipsel") {
@@ -3887,6 +3887,11 @@ v8_component("v8_libbase") {
@@ -3888,6 +3888,11 @@ v8_component("v8_libbase") {
"src/base/debug/stack_trace_fuchsia.cc",
"src/base/platform/platform-fuchsia.cc",
]
@@ -313,7 +313,7 @@ index 167e635..77a0d56 100644
} else if (is_mac || is_ios) {
sources += [
"src/base/debug/stack_trace_posix.cc",
@@ -4431,6 +4436,13 @@ if (is_fuchsia && !build_with_chromium) {
@@ -4432,6 +4437,13 @@ if (is_fuchsia && !build_with_chromium) {
group("v8_fuzzers") {
testonly = true
@@ -327,7 +327,7 @@ index 167e635..77a0d56 100644
data_deps = [
":v8_simple_json_fuzzer",
":v8_simple_multi_return_fuzzer",
@@ -4442,6 +4454,8 @@ group("v8_fuzzers") {
@@ -4443,6 +4455,8 @@ group("v8_fuzzers") {
":v8_simple_wasm_compile_fuzzer",
":v8_simple_wasm_fuzzer",
]
@@ -465,7 +465,7 @@ index 0000000..c4f0ae3
+} // namespace base
+} // namespace v8
diff --git a/deps/v8/src/base/platform/platform-posix.cc b/deps/v8/src/base/platform/platform-posix.cc
index 17fc5b5..4b2020f 100644
index e5aa4de..dbf3c65 100644
--- a/deps/v8/src/base/platform/platform-posix.cc
+++ b/deps/v8/src/base/platform/platform-posix.cc
@@ -61,7 +61,7 @@
@@ -492,7 +492,7 @@ index 17fc5b5..4b2020f 100644
#ifndef MADV_FREE
#define MADV_FREE MADV_DONTNEED
#endif
@@ -413,6 +421,8 @@ bool OS::DiscardSystemPages(void* address, size_t size) {
@@ -429,6 +437,8 @@ bool OS::DiscardSystemPages(void* address, size_t size) {
int ret = madvise(address, size, MADV_FREE_REUSABLE);
#elif defined(_AIX) || defined(V8_OS_SOLARIS)
int ret = madvise(reinterpret_cast<caddr_t>(address), size, MADV_FREE);
@@ -501,7 +501,7 @@ index 17fc5b5..4b2020f 100644
#else
int ret = madvise(address, size, MADV_FREE);
#endif
@@ -424,6 +434,8 @@ bool OS::DiscardSystemPages(void* address, size_t size) {
@@ -440,6 +450,8 @@ bool OS::DiscardSystemPages(void* address, size_t size) {
// imply runtime support.
#if defined(_AIX) || defined(V8_OS_SOLARIS)
ret = madvise(reinterpret_cast<caddr_t>(address), size, MADV_DONTNEED);
@@ -510,7 +510,7 @@ index 17fc5b5..4b2020f 100644
#else
ret = madvise(address, size, MADV_DONTNEED);
#endif
@@ -971,7 +983,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* value) {
@@ -987,7 +999,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* value) {
// keep this version in POSIX as most Linux-compatible derivatives will
// support it. MacOS and FreeBSD are different here.
#if !defined(V8_OS_FREEBSD) && !defined(V8_OS_MACOSX) && !defined(_AIX) && \
@@ -520,7 +520,7 @@ index 17fc5b5..4b2020f 100644
// static
void* Stack::GetStackStart() {
diff --git a/deps/v8/src/libsampler/sampler.cc b/deps/v8/src/libsampler/sampler.cc
index e2091ce..0d5e7f2 100644
index 0443657..10026b6 100644
--- a/deps/v8/src/libsampler/sampler.cc
+++ b/deps/v8/src/libsampler/sampler.cc
@@ -12,7 +12,7 @@
@@ -541,7 +541,7 @@ index e2091ce..0d5e7f2 100644
#include <ucontext.h>
#endif
@@ -483,6 +483,16 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
@@ -490,6 +490,16 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
state->sp = reinterpret_cast<void*>(mcontext.__gregs[_REG_SP]);
state->fp = reinterpret_cast<void*>(mcontext.__gregs[_REG_FP]);
#endif // V8_HOST_ARCH_*
@@ -583,7 +583,7 @@ index f3e4615..c3649ba 100755
2.30.0
From 820caf91ac5d59bd030a36ef49fc807e18d6d596 Mon Sep 17 00:00:00 2001
From fce649d6a0bc8a424efaeb6decbedf5369109036 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 27 Mar 2021 18:23:32 +0100
Subject: v8 gyp build for Haiku

34
net-libs/nodejs/patches/nodejs-16.1.0.patchset → net-libs/nodejs/patches/nodejs-16.3.0.patchset
View File

@@ -1,14 +1,14 @@
From a881d03bcf3d4db7cc66ec9ffdbb27a544cbcf33 Mon Sep 17 00:00:00 2001
From 8f6fef89fb8ef098c3ee66b04e673efafd045272 Mon Sep 17 00:00:00 2001
From: Calvin Hill <calvin@hakobaito.co.uk>
Date: Wed, 22 May 2019 11:23:37 +0000
Subject: Initial Haiku support for Node.js
diff --git a/common.gypi b/common.gypi
index be7c06d..f4d6598 100644
index ee91fb1..7e8ab3e 100644
--- a/common.gypi
+++ b/common.gypi
@@ -258,6 +258,9 @@
@@ -265,6 +265,9 @@
'_target_name!="<(node_core_target_name)")', {
'cflags!': ['-Werror'],
}],
@@ -18,7 +18,7 @@ index be7c06d..f4d6598 100644
],
'msvs_settings': {
'VCCLCompilerTool': {
@@ -286,6 +289,10 @@
@@ -293,6 +296,10 @@
['target_arch=="arm64"', {
'TargetMachine' : 0, # NotSet. MACHINE:ARM64 is inferred from the input files.
}],
@@ -29,7 +29,7 @@ index be7c06d..f4d6598 100644
],
'GenerateDebugInformation': 'true',
'SuppressStartupBanner': 'true',
@@ -346,6 +353,10 @@
@@ -353,6 +360,10 @@
['_type!="static_library"', {
'xcode_settings': {'OTHER_LDFLAGS': ['-fsanitize=address']},
}],
@@ -40,16 +40,16 @@ index be7c06d..f4d6598 100644
],
}],
['v8_enable_pointer_compression == 1', {
@@ -373,7 +384,7 @@
@@ -380,7 +391,7 @@
'cflags': [ '-pthread' ],
'ldflags': [ '-pthread' ],
}],
- [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+ [ 'OS in "linux freebsd openbsd solaris android aix cloudabi haiku"', {
'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ],
'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++1y' ],
'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++14' ],
'defines': [ '__STDC_FORMAT_MACROS' ],
@@ -387,6 +398,10 @@
@@ -394,6 +405,10 @@
'cflags': [ '-I/usr/local/include' ],
'ldflags': [ '-Wl,-z,wxneeded' ],
}],
@@ -60,7 +60,7 @@ index be7c06d..f4d6598 100644
],
'conditions': [
[ 'target_arch=="ia32"', {
@@ -545,6 +560,12 @@
@@ -552,6 +567,12 @@
'OPENSSL_NO_PINSHARED'
],
}],
@@ -74,10 +74,10 @@ index be7c06d..f4d6598 100644
# `OPENSSL_THREADS` is defined via GYP for openSSL for all architectures.
'defines': [
diff --git a/configure.py b/configure.py
index 6798b4a..2678027 100755
index 05d4315..2a00675 100755
--- a/configure.py
+++ b/configure.py
@@ -45,7 +45,7 @@ from gyp_node import run_gyp
@@ -50,7 +50,7 @@ from gyp_node import run_gyp
parser = argparse.ArgumentParser()
valid_os = ('win', 'mac', 'solaris', 'freebsd', 'openbsd', 'linux',
@@ -176,7 +176,7 @@ index a3c9279..ada02d5 100644
' and force_load=="true"', {
'ldflags': [
diff --git a/src/node.cc b/src/node.cc
index b757013..856a664 100644
index 6c601fb..71ccec6 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -622,7 +622,7 @@ inline void PlatformInit() {
@@ -273,7 +273,7 @@ index 9734836..94e4d8c 100644
2.30.0
From 19f5ca5600488d78311515fd68bd7b74145f1f15 Mon Sep 17 00:00:00 2001
From 322daeb233a92b56e8b7cef3cd848f14fa2fc9f7 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 27 Mar 2021 14:01:44 +0100
Subject: Haiku v8 patches
@@ -583,14 +583,14 @@ index 8ca9089..7615f31 100755
2.30.0
From 54f5215d55d1e67ddb25419182140f36df8d8b8b Mon Sep 17 00:00:00 2001
From 9242030ae4d54237cfc85ac0c4ca4c8458afdf0a Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 27 Mar 2021 18:23:32 +0100
Subject: v8 gyp build for Haiku
diff --git a/tools/v8_gypfiles/features.gypi b/tools/v8_gypfiles/features.gypi
index b21bf1d..00fd2cf 100644
index 9767630..55dbb38 100644
--- a/tools/v8_gypfiles/features.gypi
+++ b/tools/v8_gypfiles/features.gypi
@@ -46,6 +46,11 @@
@@ -606,10 +606,10 @@ index b21bf1d..00fd2cf 100644
'is_android': 1,
}, {
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
index 377e12d..ba3eba9 100644
index f20c9d5..7246f62 100644
--- a/tools/v8_gypfiles/v8.gyp
+++ b/tools/v8_gypfiles/v8.gyp
@@ -956,6 +956,17 @@
@@ -959,6 +959,17 @@
'<(V8_ROOT)/src/base/platform/platform-fuchsia.cc',
]
}],