nodejs: Update from 6.11.1 to 6.11.2

diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh
index 2450d622af9c6efb9bafa8b4a1ad8a39cfc324a8..f28806615bd7556113336a31e99fb386bc7883a6 100644 (file)
--- a/packages/nodejs/build.sh
+++ b/packages/nodejs/build.sh
@@ -1,14 +1,15 @@
 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=6.11.1
+TERMUX_PKG_VERSION=6.11.2
+TERMUX_PKG_SHA256=20146ed51b638404665737ed8a25cc06e96d7d7259eb90a4bdec4730a78002a6
 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=0187d4e4ef00cee2b70b0ad0689100050654f26629775d097b145d0d8727f9a0
 # 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
 # symbols on dlopen(). See https://github.com/termux/termux-packages/issues/462.
 TERMUX_PKG_DEPENDS="openssl, c-ares"
 TERMUX_PKG_RM_AFTER_INSTALL="lib/node_modules/npm/html lib/node_modules/npm/make.bat share/systemtap lib/dtrace"
 TERMUX_PKG_BUILD_IN_SRC=yes
+TERMUX_PKG_CONFLICTS="nodejs-current"
 
 termux_step_configure () {
        # See https://github.com/nodejs/build/issues/266 about enabling snapshots

diff --git a/packages/nodejs/node.gyp.patch b/packages/nodejs/node.gyp.patch
index bd027670301be7bb4bc6283b81a45c6e0744a6af..1b69d92f4fdd0902ddc23d112877f7e71322076e 100644 (file)
--- a/packages/nodejs/node.gyp.patch
+++ b/packages/nodejs/node.gyp.patch
@@ -1,7 +1,7 @@
-diff -u -r ../node-v6.3.1/node.gyp ./node.gyp
---- ../node-v6.3.1/node.gyp    2016-07-21 16:44:43.000000000 -0400
-+++ ./node.gyp 2016-07-23 14:03:01.349959957 -0400
-@@ -808,65 +808,6 @@
+diff -u -r ../node-v6.11.2/node.gyp ./node.gyp
+--- ../node-v6.11.2/node.gyp   2017-08-01 05:39:14.000000000 +0000
++++ ./node.gyp 2017-08-08 08:52:59.805556714 +0000
+@@ -531,123 +531,6 @@
            ],
          } ],
        ]
@@ -9,11 +9,62 @@ diff -u -r ../node-v6.3.1/node.gyp ./node.gyp
 -    {
 -      'target_name': 'cctest',
 -      'type': 'executable',
--      'dependencies': [ 'deps/gtest/gtest.gyp:gtest' ],
+-
+-      'dependencies': [
+-        '<(node_core_target_name)',
+-        'deps/gtest/gtest.gyp:gtest',
+-        'node_js2c#host',
+-        'node_dtrace_header',
+-        'node_dtrace_ustack',
+-        'node_dtrace_provider',
+-      ],
+-
+-      'variables': {
+-        'OBJ_PATH': '<(OBJ_DIR)/node/src',
+-        'OBJ_GEN_PATH': '<(OBJ_DIR)/node/gen',
+-        'OBJ_SUFFIX': 'o',
+-        'conditions': [
+-          ['OS=="win"', {
+-            'OBJ_PATH': '<(OBJ_DIR)/node',
+-            'OBJ_GEN_PATH': '<(OBJ_DIR)/node',
+-            'OBJ_SUFFIX': 'obj',
+-          }],
+-          ['OS=="aix"', {
+-            'OBJ_PATH': '<(OBJ_DIR)/node_base/src',
+-            'OBJ_GEN_PATH': '<(OBJ_DIR)/node_base/gen',
+-          }],
+-         ],
+-       },
+-
+-      'includes': [
+-        'node.gypi'
+-      ],
+-
 -      'include_dirs': [
 -        'src',
--        'deps/v8/include'
+-        'tools/msvs/genfiles',
+-        'deps/v8/include',
+-        'deps/cares/include',
+-        'deps/uv/include',
+-        '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h
 -      ],
+-
+-      'libraries': [
+-        '<(OBJ_GEN_PATH)/node_javascript.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/async-wrap.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/env.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/node.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/node_buffer.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/node_i18n.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/debug-agent.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/util.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/string_bytes.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/string_search.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/stream_base.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/node_constants.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/node_revert.<(OBJ_SUFFIX)',
+-      ],
+-
 -      'defines': [
 -        # gtest's ASSERT macros conflict with our own.
 -        'GTEST_DONT_DEFINE_ASSERT_EQ=1',
@@ -24,18 +75,23 @@ diff -u -r ../node-v6.3.1/node.gyp ./node.gyp
 -        'GTEST_DONT_DEFINE_ASSERT_NE=1',
 -        'NODE_WANT_INTERNALS=1',
 -      ],
+-
 -      'sources': [
--        'test/cctest/util.cc',
+-        'test/cctest/test_base64.cc',
+-        'test/cctest/test_util.cc',
+-      ],
+-
+-      'sources!': [
+-        'src/node_main.cc'
 -      ],
 -
 -      'conditions': [
 -        ['v8_inspector=="true"', {
 -          'sources': [
--            'src/inspector_socket.cc',
--            'test/cctest/test_inspector_socket.cc'
+-            'test/cctest/test_inspector_socket.cc',
 -          ],
 -          'conditions': [
--            [ 'node_shared_openssl=="false"', {
+-            [ 'node_shared_openssl=="false" and node_shared=="false"', {
 -              'dependencies': [
 -                'deps/openssl/openssl.gyp:openssl'
 -              ]
@@ -52,16 +108,18 @@ diff -u -r ../node-v6.3.1/node.gyp ./node.gyp
 -            }]
 -          ]
 -        }],
--        [ 'node_use_v8_platform=="true"', {
--          'dependencies': [
--            'deps/v8/tools/gyp/v8.gyp:v8_libplatform',
+-        [ 'node_use_dtrace=="true" and OS!="mac" and OS!="linux"', {
+-          'copies': [{
+-            'destination': '<(OBJ_DIR)/cctest/src',
+-            'files': [
+-              '<(OBJ_PATH)/node_dtrace_ustack.<(OBJ_SUFFIX)',
+-              '<(OBJ_PATH)/node_dtrace_provider.<(OBJ_SUFFIX)',
+-              '<(OBJ_PATH)/node_dtrace.<(OBJ_SUFFIX)',
+-            ]},
 -          ],
 -        }],
--        [ 'node_use_bundled_v8=="true"', {
--          'dependencies': [
--            'deps/v8/tools/gyp/v8.gyp:v8',
--            'deps/v8/tools/gyp/v8.gyp:v8_libplatform'
--          ],
+-        ['OS=="solaris"', {
+-          'ldflags': [ '-I<(SHARED_INTERMEDIATE_DIR)' ]
 -        }],
 -      ]
      }