2020-06-02 22:30:55 +02:00
|
|
|
--- base/i18n/icu_util.cc.orig 2020-05-13 18:39:35 UTC
|
2019-04-05 14:01:25 +02:00
|
|
|
+++ base/i18n/icu_util.cc
|
2020-06-02 22:30:55 +02:00
|
|
|
@@ -49,7 +49,7 @@
|
2017-06-28 02:36:33 +02:00
|
|
|
#endif
|
|
|
|
|
2020-03-08 20:44:41 +01:00
|
|
|
#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
|
2020-04-13 12:37:15 +02:00
|
|
|
- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST))
|
|
|
|
+ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD)
|
2020-03-08 20:44:41 +01:00
|
|
|
#include "third_party/icu/source/i18n/unicode/timezone.h"
|
2017-06-28 02:36:33 +02:00
|
|
|
#endif
|
2020-03-08 20:44:41 +01:00
|
|
|
|
2020-04-13 12:37:15 +02:00
|
|
|
@@ -341,7 +341,7 @@ void InitializeIcuTimeZone() {
|
2020-03-08 20:44:41 +01:00
|
|
|
fuchsia::IntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
|
|
|
|
icu::TimeZone::adoptDefault(
|
|
|
|
icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
|
2020-04-13 12:37:15 +02:00
|
|
|
-#elif defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)
|
2020-06-02 22:30:55 +02:00
|
|
|
+#elif (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMECAST)
|
|
|
|
// To respond to the time zone change properly, the default time zone
|
2020-03-08 20:44:41 +01:00
|
|
|
// cache in ICU has to be populated on starting up.
|
|
|
|
// See TimeZoneMonitorLinux::NotifyClientsFromImpl().
|