[arch-commits] Commit in nodejs/repos (8 files)
Felix Yan
felixonmars at archlinux.org
Wed May 3 15:33:39 UTC 2017
Date: Wednesday, May 3, 2017 @ 15:33:38
Author: felixonmars
Revision: 226673
archrelease: copy trunk to community-i686, community-x86_64
Added:
nodejs/repos/community-i686/PKGBUILD
(from rev 226672, nodejs/trunk/PKGBUILD)
nodejs/repos/community-i686/nodejs-v8-icu59.patch
(from rev 226672, nodejs/trunk/nodejs-v8-icu59.patch)
nodejs/repos/community-x86_64/PKGBUILD
(from rev 226672, nodejs/trunk/PKGBUILD)
nodejs/repos/community-x86_64/nodejs-v8-icu59.patch
(from rev 226672, nodejs/trunk/nodejs-v8-icu59.patch)
Deleted:
nodejs/repos/community-i686/PKGBUILD
nodejs/repos/community-i686/nodejs-v8-icu59.patch
nodejs/repos/community-x86_64/PKGBUILD
nodejs/repos/community-x86_64/nodejs-v8-icu59.patch
----------------------------------------+
/PKGBUILD | 154 +++++++++++++++++++++++++++++++
/nodejs-v8-icu59.patch | 126 +++++++++++++++++++++++++
community-i686/PKGBUILD | 77 ---------------
community-i686/nodejs-v8-icu59.patch | 63 ------------
community-x86_64/PKGBUILD | 77 ---------------
community-x86_64/nodejs-v8-icu59.patch | 63 ------------
6 files changed, 280 insertions(+), 280 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-05-03 15:32:47 UTC (rev 226672)
+++ community-i686/PKGBUILD 2017-05-03 15:33:38 UTC (rev 226673)
@@ -1,77 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: James Campos <james.r.campos at gmail.com>
-# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
-# Contributor: Dongsheng Cai <dongsheng at moodle dot com>
-# Contributor: Masutu Subric <masutu.arch at googlemail dot com>
-# Contributor: TIanyi Cui <tianyicui at gmail.com>
-
-pkgname=nodejs
-pkgver=7.9.0
-pkgrel=2
-pkgdesc='Evented I/O for V8 javascript'
-arch=('i686' 'x86_64')
-url='http://nodejs.org/'
-license=('MIT')
-depends=('openssl-1.0' 'zlib' 'icu' 'libuv' 'http-parser' 'c-ares') # 'v8')
-makedepends=('python2' 'procps-ng')
-optdepends=('npm: nodejs package manager')
-source=("nodejs-$pkgver.tar.gz::https://github.com/nodejs/node/archive/v$pkgver.tar.gz"
- 'nodejs-v8-icu59.patch')
-sha256sums=('77b8f773ad7eca17e56e8d25f66be862999d6479a06767efe5ccf64f2dfd03ea'
- '38ffab18dd2cbb9ac2ee5f4cedffae6943abeb479427eeebd3e2870981cb089b')
-
-prepare() {
- cd node-$pkgver
-
- # https://github.com/nodejs/node/pull/11754#issuecomment-285407461
- patch -Np1 -d deps/v8 <../nodejs-v8-icu59.patch
-
- msg 'Fixing for python2 name'
- find -type f -exec sed \
- -e 's_^#!/usr/bin/env python$_&2_' \
- -e 's_^\(#!/usr/bin/python2\).[45]$_\1_' \
- -e 's_^#!/usr/bin/python$_&2_' \
- -e 's_^\( *exec \+\)python\( \+.*\)$_\1python2\2_'\
- -e 's_^\(.*\)python\( \+-c \+.*\)$_\1python2\2_'\
- -e "s_'python'_'python2'_" -i {} \;
- find test/ -type f -exec sed 's_python _python2 _' -i {} \;
-}
-
-build() {
- cd node-$pkgver
-
- export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
- export PYTHON=python2
- ./configure \
- --prefix=/usr \
- --with-intl=system-icu \
- --without-npm \
- --shared-openssl \
- --shared-zlib \
- --shared-libuv \
- --shared-http-parser \
- --shared-cares
- # --shared-v8
-
- make
-}
-
-check() {
- cd node-$pkgver
- # Expected failure: https://github.com/nodejs/node/issues/11627
- make test || warning "Tests failed"
-}
-
-package() {
- cd node-$pkgver
-
- make DESTDIR="$pkgdir" install
-
- install -D -m644 LICENSE \
- "$pkgdir"/usr/share/licenses/nodejs/LICENSE
-}
-
-# vim:set ts=2 sw=2 et:
Copied: nodejs/repos/community-i686/PKGBUILD (from rev 226672, nodejs/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-05-03 15:33:38 UTC (rev 226673)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: James Campos <james.r.campos at gmail.com>
+# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
+# Contributor: Dongsheng Cai <dongsheng at moodle dot com>
+# Contributor: Masutu Subric <masutu.arch at googlemail dot com>
+# Contributor: TIanyi Cui <tianyicui at gmail.com>
+
+pkgname=nodejs
+pkgver=7.10.0
+pkgrel=1
+pkgdesc='Evented I/O for V8 javascript'
+arch=('i686' 'x86_64')
+url='http://nodejs.org/'
+license=('MIT')
+depends=('openssl-1.0' 'zlib' 'icu' 'libuv' 'http-parser' 'c-ares') # 'v8')
+makedepends=('python2' 'procps-ng')
+optdepends=('npm: nodejs package manager')
+source=("nodejs-$pkgver.tar.gz::https://github.com/nodejs/node/archive/v$pkgver.tar.gz"
+ 'nodejs-v8-icu59.patch')
+sha512sums=('b5a1c5167e9f22fccdf61e33a28b03f12c5bb51e4ceefa27b021c5c7e0f3c2ed021cb7ee0b34ea8c4fbf7cafc7a2658a64a7eaa73d75c4905c10683be32bbeb3'
+ 'da8071f9b5d7c88c13b812cd422de412c7720a7644620be5e0af8fc79a4af8d8e764308b7607022953a0270c67a6cb2d98d5bad7c2c3974066ec348e4fe86c7b')
+
+prepare() {
+ cd node-$pkgver
+
+ # https://github.com/nodejs/node/pull/11754#issuecomment-285407461
+ patch -Np1 -d deps/v8 <../nodejs-v8-icu59.patch
+
+ msg 'Fixing for python2 name'
+ find -type f -exec sed \
+ -e 's_^#!/usr/bin/env python$_&2_' \
+ -e 's_^\(#!/usr/bin/python2\).[45]$_\1_' \
+ -e 's_^#!/usr/bin/python$_&2_' \
+ -e 's_^\( *exec \+\)python\( \+.*\)$_\1python2\2_'\
+ -e 's_^\(.*\)python\( \+-c \+.*\)$_\1python2\2_'\
+ -e "s_'python'_'python2'_" -i {} \;
+ find test/ -type f -exec sed 's_python _python2 _' -i {} \;
+}
+
+build() {
+ cd node-$pkgver
+
+ export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
+ export PYTHON=python2
+ ./configure \
+ --prefix=/usr \
+ --with-intl=system-icu \
+ --without-npm \
+ --shared-openssl \
+ --shared-zlib \
+ --shared-libuv \
+ --shared-http-parser \
+ --shared-cares
+ # --shared-v8
+
+ make
+}
+
+check() {
+ cd node-$pkgver
+ # Expected failure: https://github.com/nodejs/node/issues/11627
+ make test || warning "Tests failed"
+}
+
+package() {
+ cd node-$pkgver
+
+ make DESTDIR="$pkgdir" install
+
+ install -D -m644 LICENSE \
+ "$pkgdir"/usr/share/licenses/nodejs/LICENSE
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/nodejs-v8-icu59.patch
===================================================================
--- community-i686/nodejs-v8-icu59.patch 2017-05-03 15:32:47 UTC (rev 226672)
+++ community-i686/nodejs-v8-icu59.patch 2017-05-03 15:33:38 UTC (rev 226673)
@@ -1,63 +0,0 @@
-Index: src/i18n.cc
-diff --git a/src/i18n.cc b/src/i18n.cc
-index d2245ef34a9a319a53b4cf4b4ea05ec095fef2d5..7c22871ff5e440f771659d44a0db013b34ec2105 100644
---- a/src/i18n.cc
-+++ b/src/i18n.cc
-@@ -30,8 +30,13 @@
- #include "unicode/ucol.h"
- #include "unicode/ucurr.h"
- #include "unicode/unum.h"
-+#include "unicode/uvernum.h"
- #include "unicode/uversion.h"
-
-+#if U_ICU_VERSION_MAJOR_NUM >= 59
-+#include "unicode/char16ptr.h"
-+#endif
-+
- namespace v8 {
- namespace internal {
-
-@@ -270,8 +275,13 @@ icu::DecimalFormat* CreateICUNumberFormat(
- }
-
- UErrorCode status_digits = U_ZERO_ERROR;
-+#if U_ICU_VERSION_MAJOR_NUM >= 59
- uint32_t fraction_digits = ucurr_getDefaultFractionDigits(
-- currency.getTerminatedBuffer(), &status_digits);
-+ icu::toUCharPtr(currency.getTerminatedBuffer()), &status_digits);
-+#else
-+ uint32_t fraction_digits = ucurr_getDefaultFractionDigits(
-+ currency.getTerminatedBuffer(), &status_digits);
-+#endif
- if (U_SUCCESS(status_digits)) {
- number_format->setMinimumFractionDigits(fraction_digits);
- number_format->setMaximumFractionDigits(fraction_digits);
-Index: src/runtime/runtime-i18n.cc
-diff --git a/src/runtime/runtime-i18n.cc b/src/runtime/runtime-i18n.cc
-index 0b45381914641a824e36e99eaa0d315bf96252aa..e89175a37db11aa6990888e26e6bb989cf7c36b5 100644
---- a/src/runtime/runtime-i18n.cc
-+++ b/src/runtime/runtime-i18n.cc
-@@ -43,6 +43,7 @@
- #include "unicode/uloc.h"
- #include "unicode/unistr.h"
- #include "unicode/unum.h"
-+#include "unicode/ustring.h"
- #include "unicode/uversion.h"
-
-
-@@ -609,10 +610,11 @@ RUNTIME_FUNCTION(Runtime_InternalCompare) {
- String::FlatContent flat2 = string2->GetFlatContent();
- std::unique_ptr<uc16[]> sap1;
- std::unique_ptr<uc16[]> sap2;
-- const UChar* string_val1 = GetUCharBufferFromFlat(flat1, &sap1, length1);
-- const UChar* string_val2 = GetUCharBufferFromFlat(flat2, &sap2, length2);
-- result =
-- collator->compare(string_val1, length1, string_val2, length2, status);
-+ icu::UnicodeString string_val1(
-+ FALSE, GetUCharBufferFromFlat(flat1, &sap1, length1), length1);
-+ icu::UnicodeString string_val2(
-+ FALSE, GetUCharBufferFromFlat(flat2, &sap2, length2), length2);
-+ result = collator->compare(string_val1, string_val2, status);
- }
- if (U_FAILURE(status)) return isolate->ThrowIllegalOperation();
-
Copied: nodejs/repos/community-i686/nodejs-v8-icu59.patch (from rev 226672, nodejs/trunk/nodejs-v8-icu59.patch)
===================================================================
--- community-i686/nodejs-v8-icu59.patch (rev 0)
+++ community-i686/nodejs-v8-icu59.patch 2017-05-03 15:33:38 UTC (rev 226673)
@@ -0,0 +1,63 @@
+Index: src/i18n.cc
+diff --git a/src/i18n.cc b/src/i18n.cc
+index d2245ef34a9a319a53b4cf4b4ea05ec095fef2d5..7c22871ff5e440f771659d44a0db013b34ec2105 100644
+--- a/src/i18n.cc
++++ b/src/i18n.cc
+@@ -30,8 +30,13 @@
+ #include "unicode/ucol.h"
+ #include "unicode/ucurr.h"
+ #include "unicode/unum.h"
++#include "unicode/uvernum.h"
+ #include "unicode/uversion.h"
+
++#if U_ICU_VERSION_MAJOR_NUM >= 59
++#include "unicode/char16ptr.h"
++#endif
++
+ namespace v8 {
+ namespace internal {
+
+@@ -270,8 +275,13 @@ icu::DecimalFormat* CreateICUNumberFormat(
+ }
+
+ UErrorCode status_digits = U_ZERO_ERROR;
++#if U_ICU_VERSION_MAJOR_NUM >= 59
+ uint32_t fraction_digits = ucurr_getDefaultFractionDigits(
+- currency.getTerminatedBuffer(), &status_digits);
++ icu::toUCharPtr(currency.getTerminatedBuffer()), &status_digits);
++#else
++ uint32_t fraction_digits = ucurr_getDefaultFractionDigits(
++ currency.getTerminatedBuffer(), &status_digits);
++#endif
+ if (U_SUCCESS(status_digits)) {
+ number_format->setMinimumFractionDigits(fraction_digits);
+ number_format->setMaximumFractionDigits(fraction_digits);
+Index: src/runtime/runtime-i18n.cc
+diff --git a/src/runtime/runtime-i18n.cc b/src/runtime/runtime-i18n.cc
+index 0b45381914641a824e36e99eaa0d315bf96252aa..e89175a37db11aa6990888e26e6bb989cf7c36b5 100644
+--- a/src/runtime/runtime-i18n.cc
++++ b/src/runtime/runtime-i18n.cc
+@@ -43,6 +43,7 @@
+ #include "unicode/uloc.h"
+ #include "unicode/unistr.h"
+ #include "unicode/unum.h"
++#include "unicode/ustring.h"
+ #include "unicode/uversion.h"
+
+
+@@ -609,10 +610,11 @@ RUNTIME_FUNCTION(Runtime_InternalCompare) {
+ String::FlatContent flat2 = string2->GetFlatContent();
+ std::unique_ptr<uc16[]> sap1;
+ std::unique_ptr<uc16[]> sap2;
+- const UChar* string_val1 = GetUCharBufferFromFlat(flat1, &sap1, length1);
+- const UChar* string_val2 = GetUCharBufferFromFlat(flat2, &sap2, length2);
+- result =
+- collator->compare(string_val1, length1, string_val2, length2, status);
++ icu::UnicodeString string_val1(
++ FALSE, GetUCharBufferFromFlat(flat1, &sap1, length1), length1);
++ icu::UnicodeString string_val2(
++ FALSE, GetUCharBufferFromFlat(flat2, &sap2, length2), length2);
++ result = collator->compare(string_val1, string_val2, status);
+ }
+ if (U_FAILURE(status)) return isolate->ThrowIllegalOperation();
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-05-03 15:32:47 UTC (rev 226672)
+++ community-x86_64/PKGBUILD 2017-05-03 15:33:38 UTC (rev 226673)
@@ -1,77 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: James Campos <james.r.campos at gmail.com>
-# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
-# Contributor: Dongsheng Cai <dongsheng at moodle dot com>
-# Contributor: Masutu Subric <masutu.arch at googlemail dot com>
-# Contributor: TIanyi Cui <tianyicui at gmail.com>
-
-pkgname=nodejs
-pkgver=7.9.0
-pkgrel=2
-pkgdesc='Evented I/O for V8 javascript'
-arch=('i686' 'x86_64')
-url='http://nodejs.org/'
-license=('MIT')
-depends=('openssl-1.0' 'zlib' 'icu' 'libuv' 'http-parser' 'c-ares') # 'v8')
-makedepends=('python2' 'procps-ng')
-optdepends=('npm: nodejs package manager')
-source=("nodejs-$pkgver.tar.gz::https://github.com/nodejs/node/archive/v$pkgver.tar.gz"
- 'nodejs-v8-icu59.patch')
-sha256sums=('77b8f773ad7eca17e56e8d25f66be862999d6479a06767efe5ccf64f2dfd03ea'
- '38ffab18dd2cbb9ac2ee5f4cedffae6943abeb479427eeebd3e2870981cb089b')
-
-prepare() {
- cd node-$pkgver
-
- # https://github.com/nodejs/node/pull/11754#issuecomment-285407461
- patch -Np1 -d deps/v8 <../nodejs-v8-icu59.patch
-
- msg 'Fixing for python2 name'
- find -type f -exec sed \
- -e 's_^#!/usr/bin/env python$_&2_' \
- -e 's_^\(#!/usr/bin/python2\).[45]$_\1_' \
- -e 's_^#!/usr/bin/python$_&2_' \
- -e 's_^\( *exec \+\)python\( \+.*\)$_\1python2\2_'\
- -e 's_^\(.*\)python\( \+-c \+.*\)$_\1python2\2_'\
- -e "s_'python'_'python2'_" -i {} \;
- find test/ -type f -exec sed 's_python _python2 _' -i {} \;
-}
-
-build() {
- cd node-$pkgver
-
- export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
- export PYTHON=python2
- ./configure \
- --prefix=/usr \
- --with-intl=system-icu \
- --without-npm \
- --shared-openssl \
- --shared-zlib \
- --shared-libuv \
- --shared-http-parser \
- --shared-cares
- # --shared-v8
-
- make
-}
-
-check() {
- cd node-$pkgver
- # Expected failure: https://github.com/nodejs/node/issues/11627
- make test || warning "Tests failed"
-}
-
-package() {
- cd node-$pkgver
-
- make DESTDIR="$pkgdir" install
-
- install -D -m644 LICENSE \
- "$pkgdir"/usr/share/licenses/nodejs/LICENSE
-}
-
-# vim:set ts=2 sw=2 et:
Copied: nodejs/repos/community-x86_64/PKGBUILD (from rev 226672, nodejs/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-05-03 15:33:38 UTC (rev 226673)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: James Campos <james.r.campos at gmail.com>
+# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
+# Contributor: Dongsheng Cai <dongsheng at moodle dot com>
+# Contributor: Masutu Subric <masutu.arch at googlemail dot com>
+# Contributor: TIanyi Cui <tianyicui at gmail.com>
+
+pkgname=nodejs
+pkgver=7.10.0
+pkgrel=1
+pkgdesc='Evented I/O for V8 javascript'
+arch=('i686' 'x86_64')
+url='http://nodejs.org/'
+license=('MIT')
+depends=('openssl-1.0' 'zlib' 'icu' 'libuv' 'http-parser' 'c-ares') # 'v8')
+makedepends=('python2' 'procps-ng')
+optdepends=('npm: nodejs package manager')
+source=("nodejs-$pkgver.tar.gz::https://github.com/nodejs/node/archive/v$pkgver.tar.gz"
+ 'nodejs-v8-icu59.patch')
+sha512sums=('b5a1c5167e9f22fccdf61e33a28b03f12c5bb51e4ceefa27b021c5c7e0f3c2ed021cb7ee0b34ea8c4fbf7cafc7a2658a64a7eaa73d75c4905c10683be32bbeb3'
+ 'da8071f9b5d7c88c13b812cd422de412c7720a7644620be5e0af8fc79a4af8d8e764308b7607022953a0270c67a6cb2d98d5bad7c2c3974066ec348e4fe86c7b')
+
+prepare() {
+ cd node-$pkgver
+
+ # https://github.com/nodejs/node/pull/11754#issuecomment-285407461
+ patch -Np1 -d deps/v8 <../nodejs-v8-icu59.patch
+
+ msg 'Fixing for python2 name'
+ find -type f -exec sed \
+ -e 's_^#!/usr/bin/env python$_&2_' \
+ -e 's_^\(#!/usr/bin/python2\).[45]$_\1_' \
+ -e 's_^#!/usr/bin/python$_&2_' \
+ -e 's_^\( *exec \+\)python\( \+.*\)$_\1python2\2_'\
+ -e 's_^\(.*\)python\( \+-c \+.*\)$_\1python2\2_'\
+ -e "s_'python'_'python2'_" -i {} \;
+ find test/ -type f -exec sed 's_python _python2 _' -i {} \;
+}
+
+build() {
+ cd node-$pkgver
+
+ export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
+ export PYTHON=python2
+ ./configure \
+ --prefix=/usr \
+ --with-intl=system-icu \
+ --without-npm \
+ --shared-openssl \
+ --shared-zlib \
+ --shared-libuv \
+ --shared-http-parser \
+ --shared-cares
+ # --shared-v8
+
+ make
+}
+
+check() {
+ cd node-$pkgver
+ # Expected failure: https://github.com/nodejs/node/issues/11627
+ make test || warning "Tests failed"
+}
+
+package() {
+ cd node-$pkgver
+
+ make DESTDIR="$pkgdir" install
+
+ install -D -m644 LICENSE \
+ "$pkgdir"/usr/share/licenses/nodejs/LICENSE
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/nodejs-v8-icu59.patch
===================================================================
--- community-x86_64/nodejs-v8-icu59.patch 2017-05-03 15:32:47 UTC (rev 226672)
+++ community-x86_64/nodejs-v8-icu59.patch 2017-05-03 15:33:38 UTC (rev 226673)
@@ -1,63 +0,0 @@
-Index: src/i18n.cc
-diff --git a/src/i18n.cc b/src/i18n.cc
-index d2245ef34a9a319a53b4cf4b4ea05ec095fef2d5..7c22871ff5e440f771659d44a0db013b34ec2105 100644
---- a/src/i18n.cc
-+++ b/src/i18n.cc
-@@ -30,8 +30,13 @@
- #include "unicode/ucol.h"
- #include "unicode/ucurr.h"
- #include "unicode/unum.h"
-+#include "unicode/uvernum.h"
- #include "unicode/uversion.h"
-
-+#if U_ICU_VERSION_MAJOR_NUM >= 59
-+#include "unicode/char16ptr.h"
-+#endif
-+
- namespace v8 {
- namespace internal {
-
-@@ -270,8 +275,13 @@ icu::DecimalFormat* CreateICUNumberFormat(
- }
-
- UErrorCode status_digits = U_ZERO_ERROR;
-+#if U_ICU_VERSION_MAJOR_NUM >= 59
- uint32_t fraction_digits = ucurr_getDefaultFractionDigits(
-- currency.getTerminatedBuffer(), &status_digits);
-+ icu::toUCharPtr(currency.getTerminatedBuffer()), &status_digits);
-+#else
-+ uint32_t fraction_digits = ucurr_getDefaultFractionDigits(
-+ currency.getTerminatedBuffer(), &status_digits);
-+#endif
- if (U_SUCCESS(status_digits)) {
- number_format->setMinimumFractionDigits(fraction_digits);
- number_format->setMaximumFractionDigits(fraction_digits);
-Index: src/runtime/runtime-i18n.cc
-diff --git a/src/runtime/runtime-i18n.cc b/src/runtime/runtime-i18n.cc
-index 0b45381914641a824e36e99eaa0d315bf96252aa..e89175a37db11aa6990888e26e6bb989cf7c36b5 100644
---- a/src/runtime/runtime-i18n.cc
-+++ b/src/runtime/runtime-i18n.cc
-@@ -43,6 +43,7 @@
- #include "unicode/uloc.h"
- #include "unicode/unistr.h"
- #include "unicode/unum.h"
-+#include "unicode/ustring.h"
- #include "unicode/uversion.h"
-
-
-@@ -609,10 +610,11 @@ RUNTIME_FUNCTION(Runtime_InternalCompare) {
- String::FlatContent flat2 = string2->GetFlatContent();
- std::unique_ptr<uc16[]> sap1;
- std::unique_ptr<uc16[]> sap2;
-- const UChar* string_val1 = GetUCharBufferFromFlat(flat1, &sap1, length1);
-- const UChar* string_val2 = GetUCharBufferFromFlat(flat2, &sap2, length2);
-- result =
-- collator->compare(string_val1, length1, string_val2, length2, status);
-+ icu::UnicodeString string_val1(
-+ FALSE, GetUCharBufferFromFlat(flat1, &sap1, length1), length1);
-+ icu::UnicodeString string_val2(
-+ FALSE, GetUCharBufferFromFlat(flat2, &sap2, length2), length2);
-+ result = collator->compare(string_val1, string_val2, status);
- }
- if (U_FAILURE(status)) return isolate->ThrowIllegalOperation();
-
Copied: nodejs/repos/community-x86_64/nodejs-v8-icu59.patch (from rev 226672, nodejs/trunk/nodejs-v8-icu59.patch)
===================================================================
--- community-x86_64/nodejs-v8-icu59.patch (rev 0)
+++ community-x86_64/nodejs-v8-icu59.patch 2017-05-03 15:33:38 UTC (rev 226673)
@@ -0,0 +1,63 @@
+Index: src/i18n.cc
+diff --git a/src/i18n.cc b/src/i18n.cc
+index d2245ef34a9a319a53b4cf4b4ea05ec095fef2d5..7c22871ff5e440f771659d44a0db013b34ec2105 100644
+--- a/src/i18n.cc
++++ b/src/i18n.cc
+@@ -30,8 +30,13 @@
+ #include "unicode/ucol.h"
+ #include "unicode/ucurr.h"
+ #include "unicode/unum.h"
++#include "unicode/uvernum.h"
+ #include "unicode/uversion.h"
+
++#if U_ICU_VERSION_MAJOR_NUM >= 59
++#include "unicode/char16ptr.h"
++#endif
++
+ namespace v8 {
+ namespace internal {
+
+@@ -270,8 +275,13 @@ icu::DecimalFormat* CreateICUNumberFormat(
+ }
+
+ UErrorCode status_digits = U_ZERO_ERROR;
++#if U_ICU_VERSION_MAJOR_NUM >= 59
+ uint32_t fraction_digits = ucurr_getDefaultFractionDigits(
+- currency.getTerminatedBuffer(), &status_digits);
++ icu::toUCharPtr(currency.getTerminatedBuffer()), &status_digits);
++#else
++ uint32_t fraction_digits = ucurr_getDefaultFractionDigits(
++ currency.getTerminatedBuffer(), &status_digits);
++#endif
+ if (U_SUCCESS(status_digits)) {
+ number_format->setMinimumFractionDigits(fraction_digits);
+ number_format->setMaximumFractionDigits(fraction_digits);
+Index: src/runtime/runtime-i18n.cc
+diff --git a/src/runtime/runtime-i18n.cc b/src/runtime/runtime-i18n.cc
+index 0b45381914641a824e36e99eaa0d315bf96252aa..e89175a37db11aa6990888e26e6bb989cf7c36b5 100644
+--- a/src/runtime/runtime-i18n.cc
++++ b/src/runtime/runtime-i18n.cc
+@@ -43,6 +43,7 @@
+ #include "unicode/uloc.h"
+ #include "unicode/unistr.h"
+ #include "unicode/unum.h"
++#include "unicode/ustring.h"
+ #include "unicode/uversion.h"
+
+
+@@ -609,10 +610,11 @@ RUNTIME_FUNCTION(Runtime_InternalCompare) {
+ String::FlatContent flat2 = string2->GetFlatContent();
+ std::unique_ptr<uc16[]> sap1;
+ std::unique_ptr<uc16[]> sap2;
+- const UChar* string_val1 = GetUCharBufferFromFlat(flat1, &sap1, length1);
+- const UChar* string_val2 = GetUCharBufferFromFlat(flat2, &sap2, length2);
+- result =
+- collator->compare(string_val1, length1, string_val2, length2, status);
++ icu::UnicodeString string_val1(
++ FALSE, GetUCharBufferFromFlat(flat1, &sap1, length1), length1);
++ icu::UnicodeString string_val2(
++ FALSE, GetUCharBufferFromFlat(flat2, &sap2, length2), length2);
++ result = collator->compare(string_val1, string_val2, status);
+ }
+ if (U_FAILURE(status)) return isolate->ThrowIllegalOperation();
+
More information about the arch-commits
mailing list