From 33aea6bfd3ec0b3583ab2020af9fbcd808814d11 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Fri, 3 Jun 2016 10:12:46 -0400 Subject: [PATCH] nodejs: Update from 6.2.0 to 6.2.1 --- packages/nodejs/build.sh | 2 +- packages/nodejs/node.gyp.patch | 9 +++++---- packages/nodejs/src-node_config.cc.patch | 15 --------------- 3 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 packages/nodejs/src-node_config.cc.patch diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh index ebcb470c..4b53a040 100644 --- a/packages/nodejs/build.sh +++ b/packages/nodejs/build.sh @@ -1,6 +1,6 @@ TERMUX_PKG_HOMEPAGE=http://nodejs.org/ TERMUX_PKG_DESCRIPTION="Platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications" -TERMUX_PKG_VERSION=6.2.0 +TERMUX_PKG_VERSION=6.2.1 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="openssl, libuv, libgnustl, c-ares" TERMUX_PKG_RM_AFTER_INSTALL="lib/node_modules/npm/html lib/node_modules/npm/make.bat share/systemtap lib/dtrace" diff --git a/packages/nodejs/node.gyp.patch b/packages/nodejs/node.gyp.patch index 8ec79990..ec0917ef 100644 --- a/packages/nodejs/node.gyp.patch +++ b/packages/nodejs/node.gyp.patch @@ -1,7 +1,7 @@ -diff -u -r ../node-v6.0.0/node.gyp ./node.gyp ---- ../node-v6.0.0/node.gyp 2016-04-26 15:50:22.000000000 -0400 -+++ ./node.gyp 2016-05-02 00:04:38.044434363 -0400 -@@ -685,31 +685,6 @@ +diff -u -r ../node-v6.2.1/node.gyp ./node.gyp +--- ../node-v6.2.1/node.gyp 2016-06-02 17:53:57.000000000 -0400 ++++ ./node.gyp 2016-06-03 08:41:23.800132335 -0400 +@@ -685,32 +685,6 @@ ], } ], ] @@ -26,6 +26,7 @@ diff -u -r ../node-v6.0.0/node.gyp ./node.gyp - 'GTEST_DONT_DEFINE_ASSERT_LE=1', - 'GTEST_DONT_DEFINE_ASSERT_LT=1', - 'GTEST_DONT_DEFINE_ASSERT_NE=1', +- 'NODE_WANT_INTERNALS=1', - ], - 'sources': [ - 'test/cctest/util.cc', diff --git a/packages/nodejs/src-node_config.cc.patch b/packages/nodejs/src-node_config.cc.patch deleted file mode 100644 index 325d24a9..00000000 --- a/packages/nodejs/src-node_config.cc.patch +++ /dev/null @@ -1,15 +0,0 @@ -Backport of https://github.com/nodejs/node/pull/6820 - -diff -u -r ../node-v6.2.0/src/node_config.cc ./src/node_config.cc ---- ../node-v6.2.0/src/node_config.cc 2016-05-17 15:53:07.000000000 -0400 -+++ ./src/node_config.cc 2016-05-18 16:45:34.588991777 -0400 -@@ -29,8 +29,8 @@ - void InitConfig(Local target, - Local unused, - Local context) { --#ifdef NODE_HAVE_I18N_SUPPORT - Environment* env = Environment::GetCurrent(context); -+#ifdef NODE_HAVE_I18N_SUPPORT - - READONLY_BOOLEAN_PROPERTY("hasIntl"); - -- 2.11.0