Received: by mail.netbsd.org (Postfix, from userid 605) id 2088084DA6; Wed, 9 May 2018 12:18:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9B66784D3E for ; Wed, 9 May 2018 12:18:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id jeOXaQKMGS5F for ; Wed, 9 May 2018 12:18:04 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id CD4E684CCF for ; Wed, 9 May 2018 12:18:03 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C8001FBEC; Wed, 9 May 2018 12:18:03 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1525868283112040" MIME-Version: 1.0 Date: Wed, 9 May 2018 12:18:03 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/lang/nodejs8 To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20180509121803.C8001FBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1525868283112040 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Wed May 9 12:18:03 UTC 2018 Modified Files: pkgsrc/lang/nodejs8: distinfo pkgsrc/lang/nodejs8/patches: patch-deps_cares_cares.gyp Added Files: pkgsrc/lang/nodejs8/patches: patch-src_inspector__io.cc patch-src_node__i18n.cc Log Message: nodejs8: Fix building with ICU 61. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/nodejs8/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/lang/nodejs8/patches/patch-deps_cares_cares.gyp cvs rdiff -u -r0 -r1.1 pkgsrc/lang/nodejs8/patches/patch-src_inspector__io.cc \ pkgsrc/lang/nodejs8/patches/patch-src_node__i18n.cc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1525868283112040 Content-Disposition: inline Content-Length: 5189 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/nodejs8/distinfo diff -u pkgsrc/lang/nodejs8/distinfo:1.8 pkgsrc/lang/nodejs8/distinfo:1.9 --- pkgsrc/lang/nodejs8/distinfo:1.8 Wed May 2 16:33:02 2018 +++ pkgsrc/lang/nodejs8/distinfo Wed May 9 12:18:03 2018 @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.8 2018/05/02 16:33:02 fhajny Exp $ +$NetBSD: distinfo,v 1.9 2018/05/09 12:18:03 adam Exp $ SHA1 (node-v8.11.1.tar.gz) = 9144b4545885af5c806f7f68d814ffa6a8ed97bd RMD160 (node-v8.11.1.tar.gz) = bbed69463aa4fb4bf8bf5d37d6878fdb23eff450 SHA512 (node-v8.11.1.tar.gz) = 91ed0c6f3e4b3b7f914d96401754ade6a2e7dd7d820774336650a2e1854c0b3f6010d36a4236363caa0659656a1970f30717490a244d94c5acf6c4fdcf53d3d1 Size (node-v8.11.1.tar.gz) = 31030225 bytes SHA1 (patch-common.gypi) = 5b3a50617358637a6f910de28bb5a14f037317a6 -SHA1 (patch-deps_cares_cares.gyp) = 2235eb44bc984fa2e745fdf1786f1ae6de6ef80f +SHA1 (patch-deps_cares_cares.gyp) = 22b44f2ac59963f694dfe4f4585e08960b3dec32 SHA1 (patch-deps_uv_common.gypi) = ba9caa1f6d9d6df1913d0d72a8d18ea6db0a32ff SHA1 (patch-deps_uv_src_unix_netbsd.c) = e1b5a3c611dbd08d0918d69dcf3331630158a1bc SHA1 (patch-deps_v8_src_arm_cpu-arm.cc) = d0d11ac474ab109a6f40b26fa457b12d742eb48d @@ -20,6 +20,8 @@ SHA1 (patch-deps_v8_src_log-utils.h) = 3 SHA1 (patch-deps_v8_tools_run-llprof.sh) = 39aa3faf77492ef8dd35b411b7b0e4605b469af3 SHA1 (patch-src_cares__wrap.cc) = a26a162f130468cbc0650a33b27b71377d273704 SHA1 (patch-src_inspector__agent.cc) = f6d25964a6446a1cb3c7733b7668c87932efad98 +SHA1 (patch-src_inspector__io.cc) = 1824738bc4b34c93571367189adcfdc9ee84ccf0 +SHA1 (patch-src_node__i18n.cc) = 9fde68e1bd55e0026310ba7a51e2091d587c1277 SHA1 (patch-tools_gyp_pylib_gyp_common.py) = 585dd239415da146fa50ed86e42dd99080e86002 SHA1 (patch-tools_gyp_pylib_gyp_generator_make.py) = be3cc1aaa85c3d59b6f2758df813cb5ad8d8f74e SHA1 (patch-tools_gyp_pylib_gyp_xcode__emulation.py) = 15937c419f3226ab280c7bcd5d726773cb5add57 Index: pkgsrc/lang/nodejs8/patches/patch-deps_cares_cares.gyp diff -u pkgsrc/lang/nodejs8/patches/patch-deps_cares_cares.gyp:1.1 pkgsrc/lang/nodejs8/patches/patch-deps_cares_cares.gyp:1.2 --- pkgsrc/lang/nodejs8/patches/patch-deps_cares_cares.gyp:1.1 Wed Nov 1 12:07:31 2017 +++ pkgsrc/lang/nodejs8/patches/patch-deps_cares_cares.gyp Wed May 9 12:18:03 2018 @@ -1,6 +1,7 @@ -$NetBSD: patch-deps_cares_cares.gyp,v 1.1 2017/11/01 12:07:31 fhajny Exp $ +$NetBSD: patch-deps_cares_cares.gyp,v 1.2 2018/05/09 12:18:03 adam Exp $ Add support for NetBSD. + --- deps/cares/cares.gyp.orig 2013-03-14 10:55:24.000000000 +0900 +++ deps/cares/cares.gyp 2013-03-14 10:55:47.000000000 +0900 @@ -140,6 +140,10 @@ Added files: Index: pkgsrc/lang/nodejs8/patches/patch-src_inspector__io.cc diff -u /dev/null pkgsrc/lang/nodejs8/patches/patch-src_inspector__io.cc:1.1 --- /dev/null Wed May 9 12:18:03 2018 +++ pkgsrc/lang/nodejs8/patches/patch-src_inspector__io.cc Wed May 9 12:18:03 2018 @@ -0,0 +1,31 @@ +$NetBSD: patch-src_inspector__io.cc,v 1.1 2018/05/09 12:18:03 adam Exp $ + +Fix building with ICU 61. + +--- src/inspector_io.cc.orig 2018-05-04 08:11:15.000000000 +0000 ++++ src/inspector_io.cc +@@ -74,11 +74,11 @@ std::string StringViewToUtf8(const Strin + + size_t result_length = view.length() * sizeof(*source); + std::string result(result_length, '\0'); +- UnicodeString utf16(unicodeSource, view.length()); ++ icu::UnicodeString utf16(unicodeSource, view.length()); + // ICU components for std::string compatibility are not enabled in build... + bool done = false; + while (!done) { +- CheckedArrayByteSink sink(&result[0], result_length); ++ icu::CheckedArrayByteSink sink(&result[0], result_length); + utf16.toUTF8(sink); + result_length = sink.NumberOfBytesAppended(); + result.resize(result_length); +@@ -111,8 +111,8 @@ void ReleasePairOnAsyncClose(uv_handle_t + } // namespace + + std::unique_ptr Utf8ToStringView(const std::string& message) { +- UnicodeString utf16 = +- UnicodeString::fromUTF8(StringPiece(message.data(), message.length())); ++ icu::UnicodeString utf16 = ++ icu::UnicodeString::fromUTF8(icu::StringPiece(message.data(), message.length())); + StringView view(reinterpret_cast(utf16.getBuffer()), + utf16.length()); + return StringBuffer::create(view); Index: pkgsrc/lang/nodejs8/patches/patch-src_node__i18n.cc diff -u /dev/null pkgsrc/lang/nodejs8/patches/patch-src_node__i18n.cc:1.1 --- /dev/null Wed May 9 12:18:03 2018 +++ pkgsrc/lang/nodejs8/patches/patch-src_node__i18n.cc Wed May 9 12:18:03 2018 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_node__i18n.cc,v 1.1 2018/05/09 12:18:03 adam Exp $ + +Fix building with ICU 61. + +--- src/node_i18n.cc.orig 2018-05-04 08:04:50.000000000 +0000 ++++ src/node_i18n.cc +@@ -523,7 +523,7 @@ const char* GetVersion(const char* type, + } else if (!strcmp(type, TYPE_UNICODE)) { + return U_UNICODE_VERSION; + } else if (!strcmp(type, TYPE_TZ)) { +- return TimeZone::getTZDataVersion(*status); ++ return icu::TimeZone::getTZDataVersion(*status); + } else if (!strcmp(type, TYPE_CLDR)) { + UVersionInfo versionArray; + ulocdata_getCLDRVersion(versionArray, status); --_----------=_1525868283112040--