Commit e7046e0
committed
deps: restore minimum ICU version to 68
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>1 parent a3db203 commit e7046e0
3 files changed
Lines changed: 9 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -36,7 +36,7 @@ | |||
| 36 | 36 | ||
| 37 | 37 | # Reset this number to 0 on major V8 upgrades. | |
| 38 | 38 | # Increment by one for each non-official patch applied to deps/v8. | |
| 39 | - 'v8_embedder_string': '-node.12', | ||
| 39 | + 'v8_embedder_string': '-node.13', | ||
| 40 | 40 | ||
| 41 | 41 | ##### V8 defaults for Node.js ##### | |
| 42 | 42 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -2050,12 +2050,19 @@ bool ICUTimezoneCache::GetOffsets(double time_ms, bool is_utc, | |||
| 2050 | 2050 | if (is_utc) { | |
| 2051 | 2051 | GetTimeZone()->getOffset(time_ms, false, *raw_offset, *dst_offset, status); | |
| 2052 | 2052 | } 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 | ||
| 2053 | 2059 | // Note that casting TimeZone to BasicTimeZone is safe because we know that | |
| 2054 | 2060 | // icu::TimeZone used here is a BasicTimeZone. | |
| 2055 | 2061 | static_cast<const icu::BasicTimeZone*>(GetTimeZone()) | |
| 2056 | 2062 | ->getOffsetFromLocal(time_ms, UCAL_TZ_LOCAL_FORMER, | |
| 2057 | 2063 | UCAL_TZ_LOCAL_FORMER, *raw_offset, *dst_offset, | |
| 2058 | 2064 | status); | |
| 2065 | + #endif | ||
| 2059 | 2066 | } | |
| 2060 | 2067 | ||
| 2061 | 2068 | return U_SUCCESS(status); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -21,7 +21,7 @@ | |||
| 21 | 21 | #include "unicode/locid.h" | |
| 22 | 22 | #include "unicode/uversion.h" | |
| 23 | 23 | ||
| 24 | - #define V8_MINIMUM_ICU_VERSION 69 | ||
| 24 | + #define V8_MINIMUM_ICU_VERSION 68 | ||
| 25 | 25 | ||
| 26 | 26 | namespace U_ICU_NAMESPACE { | |
| 27 | 27 | class BreakIterator; | |
0 commit comments