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]>
nodejs · Oct 4, 2021 · e7046e0 · e7046e0
1 parent a3db203
commit e7046e0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/common.gypi b/common.gypi
@@ -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.12',
+    'v8_embedder_string': '-node.13',
 
     ##### V8 defaults for Node.js #####
 

diff --git a/deps/v8/src/objects/intl-objects.cc b/deps/v8/src/objects/intl-objects.cc
@@ -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);

diff --git a/deps/v8/src/objects/intl-objects.h b/deps/v8/src/objects/intl-objects.h
@@ -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;