[arch-commits] Commit in nodejs-lts-carbon/repos/community-x86_64 (4 files)
Bruno Pagani
archange at archlinux.org
Fri Mar 30 14:37:14 UTC 2018
Date: Friday, March 30, 2018 @ 14:37:13
Author: archange
Revision: 313557
archrelease: copy trunk to community-x86_64
Added:
nodejs-lts-carbon/repos/community-x86_64/PKGBUILD
(from rev 313556, nodejs-lts-carbon/trunk/PKGBUILD)
nodejs-lts-carbon/repos/community-x86_64/add-icu-prefix-before-ICU-symbols.patch
(from rev 313556, nodejs-lts-carbon/trunk/add-icu-prefix-before-ICU-symbols.patch)
Deleted:
nodejs-lts-carbon/repos/community-x86_64/PKGBUILD
nodejs-lts-carbon/repos/community-x86_64/add-icu-prefix-before-ICU-symbols.patch
-----------------------------------------+
PKGBUILD | 139 +++++++++--------
add-icu-prefix-before-ICU-symbols.patch | 232 +++++++++++++++---------------
2 files changed, 186 insertions(+), 185 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-03-30 14:36:39 UTC (rev 313556)
+++ PKGBUILD 2018-03-30 14:37:13 UTC (rev 313557)
@@ -1,69 +0,0 @@
-# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) <archange at archlinux.org>
-
-pkgname=nodejs-lts-carbon
-pkgver=8.10.0
-pkgrel=2
-pkgdesc='Evented I/O for V8 javascript (LTS release: Carbon)'
-arch=('x86_64')
-url="https://nodejs.org/"
-license=('MIT')
-depends=('openssl' 'zlib' 'icu' 'libuv' 'http-parser' 'c-ares')
-makedepends=('python2' 'procps-ng')
-optdepends=('npm: nodejs package manager')
-provides=("nodejs=$pkgver")
-conflicts=('nodejs')
-source=("${url}/dist/v${pkgver}/node-v${pkgver}.tar.xz"
- add-icu-prefix-before-ICU-symbols.patch)
-# https://nodejs.org/download/release/latest-carbon/SHASUMS256.txt.asc
-sha256sums=('b72d4e71618d6bcbd039b487b51fa7543631a4ac3331d7caf69bdf55b5b2901a'
- 'b0b22c490c4b4e7ed4bad46d1989e980a0ba30299855ec0164ff3d11384833c7')
-#validpgpkeys=('C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' # Myles Borins <mylesborins at google.com>
-# '77984A986EBC2AA786BC0F66B01FBB92821C587A') # Gibson Fahnestock <gibfahn at gmail.com>
-
-prepare() {
- cd node-v${pkgver}
-
- # Fix build with ICU 61
- patch -Np1 -i ../add-icu-prefix-before-ICU-symbols.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-v${pkgver}
-
- export PYTHON=python2
- ./configure \
- --prefix=/usr \
- --with-intl=system-icu \
- --without-npm \
- --shared-openssl \
- --shared-zlib \
- --shared-libuv \
- --shared-http-parser \
- --shared-cares
-
- make
-}
-
-check() {
- cd node-v${pkgver}
- # Expected failure: https://github.com/nodejs/node/issues/11627
- make test || warning "Tests failed"
-}
-
-package() {
- cd node-v${pkgver}
-
- make DESTDIR="${pkgdir}" install
-
- install -Dm644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}/
-}
Copied: nodejs-lts-carbon/repos/community-x86_64/PKGBUILD (from rev 313556, nodejs-lts-carbon/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-03-30 14:37:13 UTC (rev 313557)
@@ -0,0 +1,70 @@
+# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) <archange at archlinux.org>
+
+pkgname=nodejs-lts-carbon
+pkgver=8.11.1
+pkgrel=1
+pkgdesc='Evented I/O for V8 javascript (LTS release: Carbon)'
+arch=('x86_64')
+url="https://nodejs.org/"
+license=('MIT')
+depends=('openssl' 'zlib' 'icu' 'libuv' 'http-parser' 'c-ares' 'libnghttp2')
+makedepends=('python2' 'procps-ng')
+optdepends=('npm: nodejs package manager')
+provides=("nodejs=$pkgver")
+conflicts=('nodejs')
+source=("${url}/dist/v${pkgver}/node-v${pkgver}.tar.xz"
+ add-icu-prefix-before-ICU-symbols.patch)
+# https://nodejs.org/download/release/latest-carbon/SHASUMS256.txt.asc
+sha256sums=('40a6eb51ea37fafcf0cfb58786b15b99152bec672cccf861c14d1cca0ad4758a'
+ 'b0b22c490c4b4e7ed4bad46d1989e980a0ba30299855ec0164ff3d11384833c7')
+#validpgpkeys=('C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' # Myles Borins <mylesborins at google.com>
+# '77984A986EBC2AA786BC0F66B01FBB92821C587A') # Gibson Fahnestock <gibfahn at gmail.com>
+
+prepare() {
+ cd node-v${pkgver}
+
+ # Fix build with ICU 61 https://github.com/nodejs/node/pull/18667
+ patch -Np1 -i ../add-icu-prefix-before-ICU-symbols.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-v${pkgver}
+
+ export PYTHON=python2
+ ./configure \
+ --prefix=/usr \
+ --with-intl=system-icu \
+ --without-npm \
+ --shared-openssl \
+ --shared-zlib \
+ --shared-libuv \
+ --shared-http-parser \
+ --shared-cares \
+ --shared-nghttp2
+
+ make
+}
+
+check() {
+ cd node-v${pkgver}
+ # Expected failure: https://github.com/nodejs/node/issues/11627
+ make test || warning "Tests failed"
+}
+
+package() {
+ cd node-v${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}/
+}
Deleted: add-icu-prefix-before-ICU-symbols.patch
===================================================================
--- add-icu-prefix-before-ICU-symbols.patch 2018-03-30 14:36:39 UTC (rev 313556)
+++ add-icu-prefix-before-ICU-symbols.patch 2018-03-30 14:37:13 UTC (rev 313557)
@@ -1,116 +0,0 @@
-From b8f47b27571f8d763f811f017be3fb37d466c4fc Mon Sep 17 00:00:00 2001
-From: "Steven R. Loomis" <srloomis at us.ibm.com>
-Date: Wed, 7 Feb 2018 16:42:21 -0800
-Subject: [PATCH] src: add "icu::" prefix before ICU symbols
-
-In ICU 61.x, icu4c will no longer put its declarations in the global namespace.
-Everything will be in the "icu::" namespace (or icu_60:: in the linker).
-Prepare for this.
-https://ssl.icu-project.org/trac/ticket/13460
----
- src/inspector_io.cc | 9 +++++----
- src/node_i18n.cc | 2 +-
- tools/icu/iculslocs.cc | 14 +++++++-------
- 3 files changed, 13 insertions(+), 12 deletions(-)
-
-diff --git a/src/inspector_io.cc b/src/inspector_io.cc
-index 9af4458c6b2..01ddc296b08 100644
---- a/src/inspector_io.cc
-+++ b/src/inspector_io.cc
-@@ -74,11 +74,11 @@ std::string StringViewToUtf8(const StringView& view) {
-
- 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,9 @@ void ReleasePairOnAsyncClose(uv_handle_t* async) {
- } // 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);
-diff --git a/src/node_i18n.cc b/src/node_i18n.cc
-index 71ae6a00033..d65fc55ed1f 100644
---- a/src/node_i18n.cc
-+++ b/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);
-diff --git a/tools/icu/iculslocs.cc b/tools/icu/iculslocs.cc
-index ca312b78356..3ceb8d2a4d8 100644
---- a/tools/icu/iculslocs.cc
-+++ b/tools/icu/iculslocs.cc
-@@ -64,7 +64,7 @@ int VERBOSE = 0;
- #define RES_INDEX "res_index"
- #define INSTALLEDLOCALES "InstalledLocales"
-
--CharString packageName;
-+icu::CharString packageName;
- const char* locale = RES_INDEX; // locale referring to our index
-
- void usage() {
-@@ -147,7 +147,7 @@ int localeExists(const char* loc, UBool* exists) {
- if (VERBOSE > 1) {
- printf("Trying to open %s:%s\n", packageName.data(), loc);
- }
-- LocalUResourceBundlePointer aResource(
-+ icu::LocalUResourceBundlePointer aResource(
- ures_openDirect(packageName.data(), loc, &status));
- *exists = FALSE;
- if (U_SUCCESS(status)) {
-@@ -189,11 +189,11 @@ void printIndent(FILE* bf, int indent) {
- * @return 0 for OK, 1 for err
- */
- int dumpAllButInstalledLocales(int lev,
-- LocalUResourceBundlePointer* bund,
-+ icu::LocalUResourceBundlePointer* bund,
- FILE* bf,
- UErrorCode* status) {
- ures_resetIterator(bund->getAlias());
-- LocalUResourceBundlePointer t;
-+ icu::LocalUResourceBundlePointer t;
- while (U_SUCCESS(*status) && ures_hasNext(bund->getAlias())) {
- t.adoptInstead(ures_getNextResource(bund->getAlias(), t.orphan(), status));
- ASSERT_SUCCESS(status, "while processing table");
-@@ -254,10 +254,10 @@ int list(const char* toBundle) {
- printf("\"locale\": %s\n", locale);
- }
-
-- LocalUResourceBundlePointer bund(
-+ icu::LocalUResourceBundlePointer bund(
- ures_openDirect(packageName.data(), locale, &status));
- ASSERT_SUCCESS(&status, "while opening the bundle");
-- LocalUResourceBundlePointer installedLocales(
-+ icu::LocalUResourceBundlePointer installedLocales(
- // NOLINTNEXTLINE (readability/null_usage)
- ures_getByKey(bund.getAlias(), INSTALLEDLOCALES, NULL, &status));
- ASSERT_SUCCESS(&status, "while fetching installed locales");
-@@ -295,7 +295,7 @@ int list(const char* toBundle) {
- }
-
- // OK, now list them.
-- LocalUResourceBundlePointer subkey;
-+ icu::LocalUResourceBundlePointer subkey;
-
- int validCount = 0;
- for (int32_t i = 0; i < count; i++) {
Copied: nodejs-lts-carbon/repos/community-x86_64/add-icu-prefix-before-ICU-symbols.patch (from rev 313556, nodejs-lts-carbon/trunk/add-icu-prefix-before-ICU-symbols.patch)
===================================================================
--- add-icu-prefix-before-ICU-symbols.patch (rev 0)
+++ add-icu-prefix-before-ICU-symbols.patch 2018-03-30 14:37:13 UTC (rev 313557)
@@ -0,0 +1,116 @@
+From b8f47b27571f8d763f811f017be3fb37d466c4fc Mon Sep 17 00:00:00 2001
+From: "Steven R. Loomis" <srloomis at us.ibm.com>
+Date: Wed, 7 Feb 2018 16:42:21 -0800
+Subject: [PATCH] src: add "icu::" prefix before ICU symbols
+
+In ICU 61.x, icu4c will no longer put its declarations in the global namespace.
+Everything will be in the "icu::" namespace (or icu_60:: in the linker).
+Prepare for this.
+https://ssl.icu-project.org/trac/ticket/13460
+---
+ src/inspector_io.cc | 9 +++++----
+ src/node_i18n.cc | 2 +-
+ tools/icu/iculslocs.cc | 14 +++++++-------
+ 3 files changed, 13 insertions(+), 12 deletions(-)
+
+diff --git a/src/inspector_io.cc b/src/inspector_io.cc
+index 9af4458c6b2..01ddc296b08 100644
+--- a/src/inspector_io.cc
++++ b/src/inspector_io.cc
+@@ -74,11 +74,11 @@ std::string StringViewToUtf8(const StringView& view) {
+
+ 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,9 @@ void ReleasePairOnAsyncClose(uv_handle_t* async) {
+ } // 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);
+diff --git a/src/node_i18n.cc b/src/node_i18n.cc
+index 71ae6a00033..d65fc55ed1f 100644
+--- a/src/node_i18n.cc
++++ b/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);
+diff --git a/tools/icu/iculslocs.cc b/tools/icu/iculslocs.cc
+index ca312b78356..3ceb8d2a4d8 100644
+--- a/tools/icu/iculslocs.cc
++++ b/tools/icu/iculslocs.cc
+@@ -64,7 +64,7 @@ int VERBOSE = 0;
+ #define RES_INDEX "res_index"
+ #define INSTALLEDLOCALES "InstalledLocales"
+
+-CharString packageName;
++icu::CharString packageName;
+ const char* locale = RES_INDEX; // locale referring to our index
+
+ void usage() {
+@@ -147,7 +147,7 @@ int localeExists(const char* loc, UBool* exists) {
+ if (VERBOSE > 1) {
+ printf("Trying to open %s:%s\n", packageName.data(), loc);
+ }
+- LocalUResourceBundlePointer aResource(
++ icu::LocalUResourceBundlePointer aResource(
+ ures_openDirect(packageName.data(), loc, &status));
+ *exists = FALSE;
+ if (U_SUCCESS(status)) {
+@@ -189,11 +189,11 @@ void printIndent(FILE* bf, int indent) {
+ * @return 0 for OK, 1 for err
+ */
+ int dumpAllButInstalledLocales(int lev,
+- LocalUResourceBundlePointer* bund,
++ icu::LocalUResourceBundlePointer* bund,
+ FILE* bf,
+ UErrorCode* status) {
+ ures_resetIterator(bund->getAlias());
+- LocalUResourceBundlePointer t;
++ icu::LocalUResourceBundlePointer t;
+ while (U_SUCCESS(*status) && ures_hasNext(bund->getAlias())) {
+ t.adoptInstead(ures_getNextResource(bund->getAlias(), t.orphan(), status));
+ ASSERT_SUCCESS(status, "while processing table");
+@@ -254,10 +254,10 @@ int list(const char* toBundle) {
+ printf("\"locale\": %s\n", locale);
+ }
+
+- LocalUResourceBundlePointer bund(
++ icu::LocalUResourceBundlePointer bund(
+ ures_openDirect(packageName.data(), locale, &status));
+ ASSERT_SUCCESS(&status, "while opening the bundle");
+- LocalUResourceBundlePointer installedLocales(
++ icu::LocalUResourceBundlePointer installedLocales(
+ // NOLINTNEXTLINE (readability/null_usage)
+ ures_getByKey(bund.getAlias(), INSTALLEDLOCALES, NULL, &status));
+ ASSERT_SUCCESS(&status, "while fetching installed locales");
+@@ -295,7 +295,7 @@ int list(const char* toBundle) {
+ }
+
+ // OK, now list them.
+- LocalUResourceBundlePointer subkey;
++ icu::LocalUResourceBundlePointer subkey;
+
+ int validCount = 0;
+ for (int32_t i = 0; i < count; i++) {
More information about the arch-commits
mailing list