diff options
| author | Ting-Wei Lan <lantw44@gmail.com> | 2016-01-25 20:57:30 +0800 |
|---|---|---|
| committer | Ting-Wei Lan <lantw44@gmail.com> | 2016-01-25 20:57:30 +0800 |
| commit | da862ebb6fb75ade5b6ff71e608c647bea2c4177 (patch) | |
| tree | 446809f9226f9f8d922195ec7c52a9f42b2d96b0 | |
| parent | fcbef209d4c8d42a73db92fc8708f8c0cdf52cd2 (diff) | |
| download | copr-rpm-spec-da862ebb6fb75ade5b6ff71e608c647bea2c4177.tar.gz copr-rpm-spec-da862ebb6fb75ade5b6ff71e608c647bea2c4177.tar.zst copr-rpm-spec-da862ebb6fb75ade5b6ff71e608c647bea2c4177.zip | |
chromium: Fix the build for icu 56
| -rw-r--r-- | chromium/chromium/chromium-use-non-versioned-icu-namespace.patch | 14 | ||||
| -rw-r--r-- | chromium/chromium/chromium.spec | 13 |
2 files changed, 24 insertions, 3 deletions
diff --git a/chromium/chromium/chromium-use-non-versioned-icu-namespace.patch b/chromium/chromium/chromium-use-non-versioned-icu-namespace.patch new file mode 100644 index 0000000..f7b0b6d --- /dev/null +++ b/chromium/chromium/chromium-use-non-versioned-icu-namespace.patch @@ -0,0 +1,14 @@ +Index: components/autofill/core/common/autofill_l10n_util.cc +diff --git a/components/autofill/core/common/autofill_l10n_util.cc b/components/autofill/core/common/autofill_l10n_util.cc +index 2ee517faf82b1feb224f83ae533092ae3b31f5af..c29b0a299b7215895874adf9241e4705247161ab 100644 +--- a/components/autofill/core/common/autofill_l10n_util.cc ++++ b/components/autofill/core/common/autofill_l10n_util.cc +@@ -22,7 +22,7 @@ CaseInsensitiveCompare::CaseInsensitiveCompare(const icu::Locale& locale) { + // 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 " diff --git a/chromium/chromium/chromium.spec b/chromium/chromium/chromium.spec index c94b203..5f0fb39 100644 --- a/chromium/chromium/chromium.spec +++ b/chromium/chromium/chromium.spec @@ -8,7 +8,7 @@ Name: chromium Version: 48.0.2564.82 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An open-source project that aims to build a safer, faster, and more stable browser Group: Applications/Internet @@ -26,6 +26,10 @@ Source2: chromium-browser.desktop # https://projects.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/chromium&id=37c3842 Patch0: chromium-fix-print-preview-on-en_GB-locale.patch +# Add another patch from Arch Linux to fix icu 56 build issue +# https://projects.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/chromium&id=d820900 +Patch1: chromium-use-non-versioned-icu-namespace.patch + # I don't have time to test whether it work on other architectures ExclusiveArch: x86_64 @@ -80,8 +84,7 @@ Requires: hicolor-icon-theme %prep -%setup -q -%patch0 -p1 +%autosetup -p1 touch chrome/test/data/webui/i18n_process_css_test.html # https://code.google.com/p/chromium/issues/detail?id=541273 # https://projects.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/chromium&id=37c3842 @@ -248,6 +251,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sat Jan 23 2016 - Ting-Wei Lan <lantw44@gmail.com> - 48.0.2564.82-2 +- Fix build issue for icu 56 +- Use autosetup macro + * Thu Jan 21 2016 - Ting-Wei Lan <lantw44@gmail.com> - 48.0.2564.82-1 - Update to 48.0.2564.82 |