diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec index c52d97a..957a524 100644 --- a/chromium-browser-stable.spec +++ b/chromium-browser-stable.spec @@ -51,6 +51,8 @@ Patch502: chromium-45.0.2454.101-system-icu-54-does-not-have-detectHostTim Patch503: enable_vaapi_on_linux.diff # Patch to fix build with use_system_libvpx # Chromium bug #541273 +# fix build with icu other than 54 +Patch504: chromium-system-icu-r0.patch Patch600: unbundle-libvpx_new-fix.patch Provides: %{crname} = %{EVRD} @@ -268,6 +270,7 @@ find third_party/icu -type f \! -regex '.*\.\(gyp\|gypi\|isolate\)' -delete %patch502 -p1 -b .system-icu %patch503 -p1 -b .vaapi +%patch504 -p1 -b .icu-ver #patch600 -p1 ### build with widevine support diff --git a/chromium-system-icu-r0.patch b/chromium-system-icu-r0.patch new file mode 100644 index 0000000..e1e2135 --- /dev/null +++ b/chromium-system-icu-r0.patch @@ -0,0 +1,11 @@ +--- components/autofill/core/common/autofill_l10n_util.cc.orig 2015-12-07 11:46:37.738740329 +0000 ++++ components/autofill/core/common/autofill_l10n_util.cc 2015-12-07 11:46:44.574878953 +0000 +@@ -22,7 +22,7 @@ + // library. This could be due to a device-specific issue (has been seen in + // the wild on Android devices). In the failure case, |collator_| will be + // null. See http://crbug.com/558625. +- icu_54::UnicodeString name; ++ icu::UnicodeString name; + std::string locale_name; + locale.getDisplayName(name).toUTF8String(locale_name); + LOG(ERROR) << "Failed to initialize the ICU Collator for "