Skip to content

Commit e7046e0

Browse files
committed
deps: restore minimum ICU version to 68
Refs: v8/v8@edac496 PR-URL: #39470 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Beth Griggs <[email protected]> Reviewed-By: Jiawen Geng <[email protected]>
1 parent a3db203 commit e7046e0

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
# Reset this number to 0 on major V8 upgrades.
3838
# Increment by one for each non-official patch applied to deps/v8.
39-
'v8_embedder_string': '-node.12',
39+
'v8_embedder_string': '-node.13',
4040

4141
##### V8 defaults for Node.js #####
4242

deps/v8/src/objects/intl-objects.cc

+7
Original file line numberDiff line numberDiff line change
@@ -2050,12 +2050,19 @@ bool ICUTimezoneCache::GetOffsets(double time_ms, bool is_utc,
20502050
if (is_utc) {
20512051
GetTimeZone()->getOffset(time_ms, false, *raw_offset, *dst_offset, status);
20522052
} else {
2053+
#if U_ICU_VERSION_MAJOR_NUM < 69
2054+
static_cast<const icu::BasicTimeZone*>(GetTimeZone())
2055+
->getOffsetFromLocal(time_ms, icu::BasicTimeZone::kFormer,
2056+
icu::BasicTimeZone::kFormer, *raw_offset,
2057+
*dst_offset, status);
2058+
#else
20532059
// Note that casting TimeZone to BasicTimeZone is safe because we know that
20542060
// icu::TimeZone used here is a BasicTimeZone.
20552061
static_cast<const icu::BasicTimeZone*>(GetTimeZone())
20562062
->getOffsetFromLocal(time_ms, UCAL_TZ_LOCAL_FORMER,
20572063
UCAL_TZ_LOCAL_FORMER, *raw_offset, *dst_offset,
20582064
status);
2065+
#endif
20592066
}
20602067

20612068
return U_SUCCESS(status);

deps/v8/src/objects/intl-objects.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "unicode/locid.h"
2222
#include "unicode/uversion.h"
2323

24-
#define V8_MINIMUM_ICU_VERSION 69
24+
#define V8_MINIMUM_ICU_VERSION 68
2525

2626
namespace U_ICU_NAMESPACE {
2727
class BreakIterator;

0 commit comments

Comments
 (0)