Djam/chromium-browser-stable
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/chromium-browser-stable.git synced 2025-02-23 22:52:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix build with system icu

Browse source
This commit is contained in:
Tigro 2016-01-03 00:58:07 +03:00
parent 576974ebec
commit 7cae9a72a6
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
chromium-45.0.2454.101-system-icu-54-does-not-have-detectHostTimeZone.patch Normal file
View file

@ -0,0 +1,12 @@
diff -up chromium-45.0.2454.101/content/browser/time_zone_monitor.cc.system-icu chromium-45.0.2454.101/content/browser/time_zone_monitor.cc
--- chromium-45.0.2454.101/content/browser/time_zone_monitor.cc.system-icu 2015-10-13 13:42:42.816642333 -0400
+++ chromium-45.0.2454.101/content/browser/time_zone_monitor.cc 2015-10-13 13:43:13.750917363 -0400
@@ -22,7 +22,7 @@ TimeZoneMonitor::~TimeZoneMonitor() {
void TimeZoneMonitor::NotifyRenderers() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || U_ICU_VERSION_MAJOR_NUM < 55
// On CrOS, ICU's default tz is already set to a new zone. No
// need to redetect it with detectHostTimeZone().
scoped_ptr<icu::TimeZone> new_zone(icu::TimeZone::createDefault());

4
chromium-browser-stable.spec
View file

@ -45,6 +45,9 @@ Patch101: chromium-arm-r0.patch
Patch500: chromium-third-party-cookies-off-by-default.patch
Patch501: chromium-ps-print.patch
# Google patched their bundled copy of icu 54 to include API functionality that wasn't added until 55.
# :P
Patch501: chromium-45.0.2454.101-system-icu-54-does-not-have-detectHostTimeZone.patch
# Patch to fix build with use_system_libvpx
# Chromium bug #541273
Patch600: unbundle-libvpx_new-fix.patch
@ -261,6 +264,7 @@ find third_party/icu -type f \! -regex '.*\.\(gyp\|gypi\|isolate\)' -delete
%patch500 -p1
%patch501 -p2
%patch501 -p1 -b .system-icu
#patch600 -p1
### build with widevine support