diff options
Diffstat (limited to 'www/chromium/files/patch-mojo_shell_public_cpp_initialize__base__and__icu.cc')
| -rw-r--r-- | www/chromium/files/patch-mojo_shell_public_cpp_initialize__base__and__icu.cc | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/www/chromium/files/patch-mojo_shell_public_cpp_initialize__base__and__icu.cc b/www/chromium/files/patch-mojo_shell_public_cpp_initialize__base__and__icu.cc new file mode 100644 index 000000000000..0ae943eba5bc --- /dev/null +++ b/www/chromium/files/patch-mojo_shell_public_cpp_initialize__base__and__icu.cc @@ -0,0 +1,16 @@ +--- mojo/shell/public/cpp/initialize_base_and_icu.cc.orig 2016-05-21 17:21:25 UTC ++++ mojo/shell/public/cpp/initialize_base_and_icu.cc +@@ -33,11 +33,13 @@ InitializeBase(const uint8_t* icu_data) + base::SysInfo::MaxSharedMemorySize(); + #endif + ++#if !defined(OS_FREEBSD) + // Initialize core ICU. We must perform the full initialization before we + // initialize icu::TimeZone subsystem because otherwise ICU gets in a state + // where the timezone data is disconnected from the locale data which can + // cause crashes. + CHECK(base::i18n::InitializeICUFromRawMemory(icu_data)); ++#endif + + #if !defined(OS_ANDROID) + // ICU DateFormat class (used in base/time_format.cc) needs to get the |