[arch-commits] Commit in nodejs/repos (6 files)
Evangelos Foutras
foutrelis at archlinux.org
Tue Apr 25 04:39:10 UTC 2017
Date: Tuesday, April 25, 2017 @ 04:39:09
Author: foutrelis
Revision: 225242
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
nodejs/repos/community-staging-i686/
nodejs/repos/community-staging-i686/PKGBUILD
(from rev 225241, nodejs/trunk/PKGBUILD)
nodejs/repos/community-staging-i686/nodejs-v8-icu59.patch
(from rev 225241, nodejs/trunk/nodejs-v8-icu59.patch)
nodejs/repos/community-staging-x86_64/
nodejs/repos/community-staging-x86_64/PKGBUILD
(from rev 225241, nodejs/trunk/PKGBUILD)
nodejs/repos/community-staging-x86_64/nodejs-v8-icu59.patch
(from rev 225241, nodejs/trunk/nodejs-v8-icu59.patch)
------------------------------------------------+
community-staging-i686/PKGBUILD | 77 +++++++++++++++++++++++
community-staging-i686/nodejs-v8-icu59.patch | 63 ++++++++++++++++++
community-staging-x86_64/PKGBUILD | 77 +++++++++++++++++++++++
community-staging-x86_64/nodejs-v8-icu59.patch | 63 ++++++++++++++++++
4 files changed, 280 insertions(+)
Copied: nodejs/repos/community-staging-i686/PKGBUILD (from rev 225241, nodejs/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2017-04-25 04:39:09 UTC (rev 225242)
@@ -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.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-staging-i686/nodejs-v8-icu59.patch (from rev 225241, nodejs/trunk/nodejs-v8-icu59.patch)
===================================================================
--- community-staging-i686/nodejs-v8-icu59.patch (rev 0)
+++ community-staging-i686/nodejs-v8-icu59.patch 2017-04-25 04:39:09 UTC (rev 225242)
@@ -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();
+
Copied: nodejs/repos/community-staging-x86_64/PKGBUILD (from rev 225241, nodejs/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2017-04-25 04:39:09 UTC (rev 225242)
@@ -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.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-staging-x86_64/nodejs-v8-icu59.patch (from rev 225241, nodejs/trunk/nodejs-v8-icu59.patch)
===================================================================
--- community-staging-x86_64/nodejs-v8-icu59.patch (rev 0)
+++ community-staging-x86_64/nodejs-v8-icu59.patch 2017-04-25 04:39:09 UTC (rev 225242)
@@ -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