summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-base_i18n_icu__util.cc
diff options
context:
space:
mode:
authorJoseph Mingrone <jrm@FreeBSD.org>2020-06-02 20:30:55 +0000
committerJoseph Mingrone <jrm@FreeBSD.org>2020-06-02 20:30:55 +0000
commit8f6dc7d1dd8b0ca59427d71524538aab9403ac23 (patch)
treec272eeb9d12c3f96a460e7ad3fd1eb4233ad20ce /www/chromium/files/patch-base_i18n_icu__util.cc
parentmultimedia/libva-intel-driver: update to 2.4.1 (diff)
www/chromium: Update to version 83.0.4103.61
Submitted by: Matthias Wolf <freebsd@rheinwolf.de> Reviewed by: rene Approved by: chromium@ (rene) Obtained from: https://github.com/gliaskos/freebsd-chromium MFH: 2020Q2 Security: https://chromereleases.googleblog.com/2020/05/stable-channel-update-for-desktop.html Differential Revision: https://reviews.freebsd.org/D25102
Diffstat (limited to 'www/chromium/files/patch-base_i18n_icu__util.cc')
-rw-r--r--www/chromium/files/patch-base_i18n_icu__util.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc
index 34f2453a25de..bf29624ac4ec 100644
--- a/www/chromium/files/patch-base_i18n_icu__util.cc
+++ b/www/chromium/files/patch-base_i18n_icu__util.cc
@@ -1,6 +1,6 @@
---- base/i18n/icu_util.cc.orig 2020-03-16 18:40:27 UTC
+--- base/i18n/icu_util.cc.orig 2020-05-13 18:39:35 UTC
+++ base/i18n/icu_util.cc
-@@ -46,7 +46,7 @@
+@@ -49,7 +49,7 @@
#endif
#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
@@ -14,7 +14,7 @@
icu::TimeZone::adoptDefault(
icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
-#elif defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)
-+#elif (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD)
- // To respond to the timezone change properly, the default timezone
++#elif (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMECAST)
+ // To respond to the time zone change properly, the default time zone
// cache in ICU has to be populated on starting up.
// See TimeZoneMonitorLinux::NotifyClientsFromImpl().