From e1dd8bf9307fca6275d8d53442fabaa5f2eb3e26 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 4 Jun 2017 11:16:26 +0200 Subject: [PATCH] nodejs: remove unneeded patches --- srcpkgs/nodejs/patches/v8-icu59.patch | 59 --------------------------- srcpkgs/nodejs/template | 2 - 2 files changed, 61 deletions(-) delete mode 100644 srcpkgs/nodejs/patches/v8-icu59.patch diff --git a/srcpkgs/nodejs/patches/v8-icu59.patch b/srcpkgs/nodejs/patches/v8-icu59.patch deleted file mode 100644 index a89325e0d9f..00000000000 --- a/srcpkgs/nodejs/patches/v8-icu59.patch +++ /dev/null @@ -1,59 +0,0 @@ -https://codereview.chromium.org/2738503008 - ---- deps/v8/src/i18n.cc.orig -+++ deps/v8/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); ---- deps/v8/src/runtime/runtime-i18n.cc.orig -+++ deps/v8/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 sap1; - std::unique_ptr 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(); - diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index fd52b115e43..9880b1f0fae 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -15,8 +15,6 @@ homepage="https://nodejs.org/" distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz" checksum=28f2e0bd5f80ff83b244df670d577fe36c1e0f11561deee7d8bbdcbd4ead8fb2 -broken="Hello, seems I got bumped prematurely. Please fix me" - build_options="ssl libuv http_parser icu" desc_option_libuv="Enable shared libuv" desc_option_http_parser="Enable shared http-parser"