Differential D38165 Diff 118368 www/qt5-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc
Changeset View
Changeset View
Standalone View
Standalone View
www/qt5-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc
| --- src/3rdparty/chromium/base/i18n/icu_util.cc.orig 2020-11-07 01:22:36 UTC | --- src/3rdparty/chromium/base/i18n/icu_util.cc.orig 2021-12-15 16:12:54 UTC | ||||
| +++ src/3rdparty/chromium/base/i18n/icu_util.cc | +++ src/3rdparty/chromium/base/i18n/icu_util.cc | ||||
| @@ -49,7 +49,7 @@ | @@ -48,7 +48,7 @@ | ||||
| #include "third_party/icu/source/common/unicode/unistr.h" | |||||
| #endif | #endif | ||||
| #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ | -#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ | ||||
| - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) | +#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ | ||||
| + (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) | ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !BUILDFLAG(IS_CHROMECAST)) | ||||
| #include "third_party/icu/source/i18n/unicode/timezone.h" | #include "third_party/icu/source/i18n/unicode/timezone.h" | ||||
| #endif | #endif | ||||
| @@ -345,7 +345,7 @@ void InitializeIcuTimeZone() { | @@ -345,7 +345,7 @@ void InitializeIcuTimeZone() { | ||||
| fuchsia::IntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); | fuchsia::IntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); | ||||
| icu::TimeZone::adoptDefault( | icu::TimeZone::adoptDefault( | ||||
| icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); | icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); | ||||
| -#elif defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST) | -#elif (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !BUILDFLAG(IS_CHROMECAST) | ||||
| +#elif (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMECAST) | +#elif (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMECAST) | ||||
| // To respond to the time zone change properly, the default time zone | // To respond to the time zone change properly, the default time zone | ||||
| // cache in ICU has to be populated on starting up. | // cache in ICU has to be populated on starting up. | ||||
| // See TimeZoneMonitorLinux::NotifyClientsFromImpl(). | // See TimeZoneMonitorLinux::NotifyClientsFromImpl(). | ||||