diff options
Diffstat (limited to 'www/chromium/files/patch-base_i18n_icu__util.cc')
| -rw-r--r-- | www/chromium/files/patch-base_i18n_icu__util.cc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc index e2bb4275c2c4..ee299d6fd853 100644 --- a/www/chromium/files/patch-base_i18n_icu__util.cc +++ b/www/chromium/files/patch-base_i18n_icu__util.cc @@ -1,20 +1,20 @@ --- base/i18n/icu_util.cc.orig 2019-12-16 21:51:21 UTC +++ base/i18n/icu_util.cc -@@ -20,7 +20,7 @@ - #include "build/build_config.h" - #include "third_party/icu/source/common/unicode/putil.h" - #include "third_party/icu/source/common/unicode/udata.h" --#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_ANDROID) -+#if (defined(OS_LINUX) || defined(OS_BSD) && !defined(OS_CHROMEOS)) || defined(OS_ANDROID) - #include "third_party/icu/source/i18n/unicode/timezone.h" +@@ -43,7 +43,7 @@ #endif -@@ -365,7 +365,7 @@ bool InitializeICU() { - // TODO(jungshik): Some callers do not care about tz at all. If necessary, - // add a boolean argument to this function to init'd the default tz only - // when requested. --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - if (result) - std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault()); + #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ +- (defined(OS_LINUX) && !defined(IS_CHROMECAST)) ++ (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD) + #include "third_party/icu/source/i18n/unicode/timezone.h" #endif + +@@ -288,7 +288,7 @@ void InitializeIcuTimeZone() { + fuchsia::IntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); + icu::TimeZone::adoptDefault( + icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); +-#elif defined(OS_LINUX) && !defined(IS_CHROMECAST) ++#elif (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD) + // To respond to the timezone change properly, the default timezone + // cache in ICU has to be populated on starting up. + // See TimeZoneMonitorLinux::NotifyClientsFromImpl(). |