Differential D22184 Diff 64134 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 2018-11-13 18:25:11 UTC | --- src/3rdparty/chromium/base/i18n/icu_util.cc.orig 2019-05-23 14:39:34.000000000 +0200 | ||||
+++ src/3rdparty/chromium/base/i18n/icu_util.cc | +++ src/3rdparty/chromium/base/i18n/icu_util.cc 2019-10-27 22:58:57.501541000 +0100 | ||||
@@ -20,7 +20,7 @@ | @@ -20,7 +20,7 @@ | ||||
#include "build/build_config.h" | #include "build/build_config.h" | ||||
#include "third_party/icu/source/common/unicode/putil.h" | #include "third_party/icu/source/common/unicode/putil.h" | ||||
#include "third_party/icu/source/common/unicode/udata.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_CHROMEOS)) || defined(OS_ANDROID) | ||||
+#if ((defined(OS_LINUX) || defined(OS_BSD)) && !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" | #include "third_party/icu/source/i18n/unicode/timezone.h" | ||||
#endif | #endif | ||||
@@ -320,7 +320,7 @@ bool InitializeICU() { | @@ -75,7 +75,11 @@ | ||||
// No need to change the filename in multiple places (gyp files, windows | |||||
// build pkg configurations, etc). 'l' stands for Little Endian. | |||||
// This variable is exported through the header file. | |||||
+#if defined(ARCH_CPU_LITTLE_ENDIAN) | |||||
const char kIcuDataFileName[] = "icudtl.dat"; | |||||
+#else | |||||
+const char kIcuDataFileName[] = "icudtb.dat"; | |||||
+#endif | |||||
#if defined(OS_ANDROID) | |||||
const char kAndroidAssetsIcuDataFileName[] = "assets/icudtl.dat"; | |||||
#endif | |||||
@@ -320,7 +324,7 @@ | |||||
// TODO(jungshik): Some callers do not care about tz at all. If necessary, | // 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 | // add a boolean argument to this function to init'd the default tz only | ||||
// when requested. | // when requested. | ||||
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | ||||
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) | +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) | ||||
if (result) | if (result) | ||||
std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault()); | std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault()); | ||||
#endif | #endif |