Browse Source

fix building against ICU 61

master
parent
commit
d36d8aa717
  1. 40
      node/node.patch
  2. 2
      node/node.spec

40
node/node.patch

@ -340,3 +340,43 @@ Index: tools/install.py
if 'true' == variables.get('node_install_npm'): npm_files(action)
Index: src/node_i18n.cc
--- src/node_i18n.cc.orig 2018-03-06 23:56:00.000000000 +0100
+++ src/node_i18n.cc 2018-03-27 20:01:07.288101000 +0200
@@ -523,7 +523,7 @@
} 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);
Index: src/inspector_io.cc
--- src/inspector_io.cc.orig 2018-03-06 23:56:00.000000000 +0100
+++ src/inspector_io.cc 2018-03-27 20:18:22.987569000 +0200
@@ -74,11 +74,11 @@
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 @@
} // namespace
std::unique_ptr<StringBuffer> 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<const uint16_t*>(utf16.getBuffer()),
utf16.length());
return StringBuffer::create(view);

2
node/node.spec

@ -36,7 +36,7 @@ Class: PLUS
Group: Web
License: MIT/BSD
Version: %{V_opkg}
Release: 20180307
Release: 20180327
# package options
%option with_icu yes

Loading…
Cancel
Save