Skip to content

Commit

Permalink
deps: restore minimum ICU version to 68
Browse files Browse the repository at this point in the history
Refs: v8/v8@edac496

PR-URL: #39470
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Beth Griggs <bgriggs@redhat.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
  • Loading branch information
targos committed Sep 1, 2021
1 parent 92d83d1 commit 7470db0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.10',
'v8_embedder_string': '-node.11',

##### V8 defaults for Node.js #####

Expand Down
7 changes: 7 additions & 0 deletions deps/v8/src/objects/intl-objects.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2050,12 +2050,19 @@ bool ICUTimezoneCache::GetOffsets(double time_ms, bool is_utc,
if (is_utc) {
GetTimeZone()->getOffset(time_ms, false, *raw_offset, *dst_offset, status);
} else {
#if U_ICU_VERSION_MAJOR_NUM < 69
static_cast<const icu::BasicTimeZone*>(GetTimeZone())
->getOffsetFromLocal(time_ms, icu::BasicTimeZone::kFormer,
icu::BasicTimeZone::kFormer, *raw_offset,
*dst_offset, status);
#else
// Note that casting TimeZone to BasicTimeZone is safe because we know that
// icu::TimeZone used here is a BasicTimeZone.
static_cast<const icu::BasicTimeZone*>(GetTimeZone())
->getOffsetFromLocal(time_ms, UCAL_TZ_LOCAL_FORMER,
UCAL_TZ_LOCAL_FORMER, *raw_offset, *dst_offset,
status);
#endif
}

return U_SUCCESS(status);
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/objects/intl-objects.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "unicode/locid.h"
#include "unicode/uversion.h"

#define V8_MINIMUM_ICU_VERSION 69
#define V8_MINIMUM_ICU_VERSION 68

namespace U_ICU_NAMESPACE {
class BreakIterator;
Expand Down

0 comments on commit 7470db0

Please sign in to comment.