From 552d700d2dad3c6abd24a8738f7fa22937e13da2 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Fri, 11 Aug 2017 02:58:47 +0200
Subject: [PATCH] nodejs-current: Update from 8.2.1 to 8.3.0

Note that the resulting package does not work yet due to
 https://github.com/nodejs/node/pull/14489
not being in 8.3.0.
---
 packages/nodejs-current/build.sh       | 11 ++---------
 packages/nodejs-current/node.gyp.patch | 19 +++++--------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/packages/nodejs-current/build.sh b/packages/nodejs-current/build.sh
index b445bdce..63db0193 100644
--- a/packages/nodejs-current/build.sh
+++ b/packages/nodejs-current/build.sh
@@ -1,8 +1,8 @@
 # status: Does not build
 TERMUX_PKG_HOMEPAGE=https://nodejs.org/
 TERMUX_PKG_DESCRIPTION="Platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications"
-TERMUX_PKG_VERSION=8.2.1
-TERMUX_PKG_SHA256=66fe1379bc7daf9a16c6b5c45ab695bf1cdcfae9738d2989e940104d6b31973f
+TERMUX_PKG_VERSION=8.3.0
+TERMUX_PKG_SHA256=33fa7a02f265636c240be9ebd0f93942f77856a9c2c751592da1a0962b6ed010
 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.gz
 # Note that we do not use a shared libuv to avoid an issue with the Android
 # linker, which does not use symbols of linked shared libraries when resolving
@@ -55,11 +55,4 @@ termux_step_configure () {
 		--without-inspector \
 		--without-intl \
 		--cross-compiling
-
-	# Remove cross-compile directories:
-	sed -i '/usr\/include/d; /usr\/lib/d' out/deps/v8/src/mkpeephole.host.mk
-	# The above statement causes some straggling \ in the makefile:
-	sed -i 's|-I$(srcdir)/deps/v8 \\|-I$(srcdir)/deps/v8|' out/deps/v8/src/mkpeephole.host.mk
-	# Remove extra libraries not needed for mkpeephole:
-	sed -i '/-lcares/d; /-lcrypto/d; /-lssl/d; /-lz/d' out/deps/v8/src/mkpeephole.host.mk
 }
diff --git a/packages/nodejs-current/node.gyp.patch b/packages/nodejs-current/node.gyp.patch
index a1a7ab0b..24029a01 100644
--- a/packages/nodejs-current/node.gyp.patch
+++ b/packages/nodejs-current/node.gyp.patch
@@ -1,7 +1,7 @@
-diff -u -r ../node-v8.1.0/node.gyp ./node.gyp
---- ../node-v8.1.0/node.gyp	2017-06-08 12:31:34.000000000 +0200
-+++ ./node.gyp	2017-06-12 12:13:40.219057425 +0200
-@@ -557,156 +557,6 @@
+diff -u -r ../node-v8.3.0/node.gyp ./node.gyp
+--- ../node-v8.3.0/node.gyp	2017-08-09 20:48:31.000000000 +0200
++++ ./node.gyp	2017-08-11 00:37:54.033951029 +0200
+@@ -559,147 +559,6 @@
            ],
          } ],
        ]
@@ -85,16 +85,7 @@ diff -u -r ../node-v8.1.0/node.gyp ./node.gyp
 -        '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)trace_event.<(OBJ_SUFFIX)',
 -      ],
 -
--      'defines': [
--        # gtest's ASSERT macros conflict with our own.
--        'GTEST_DONT_DEFINE_ASSERT_EQ=1',
--        'GTEST_DONT_DEFINE_ASSERT_GE=1',
--        'GTEST_DONT_DEFINE_ASSERT_GT=1',
--        'GTEST_DONT_DEFINE_ASSERT_LE=1',
--        'GTEST_DONT_DEFINE_ASSERT_LT=1',
--        'GTEST_DONT_DEFINE_ASSERT_NE=1',
--        'NODE_WANT_INTERNALS=1',
--      ],
+-      'defines': [ 'NODE_WANT_INTERNALS=1' ],
 -
 -      'sources': [
 -        'test/cctest/test_base64.cc',
-- 
2.11.0