diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-23 15:20:34 +0000 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-23 15:20:34 +0000 |
| commit | a42bed2e9a78715889240ff900e2391bef923285 (patch) | |
| tree | 202c502b7e964384fb7f0639b756353374b0c045 /intl/patch-icu.sh | |
| parent | 9a2224a97c7d258fc1f0e5fad30706987880ce22 (diff) | |
| parent | 276f6583e00edf2a217a3092471ca2aa3aab5a09 (diff) | |
| download | UXP-a42bed2e9a78715889240ff900e2391bef923285.tar UXP-a42bed2e9a78715889240ff900e2391bef923285.tar.gz UXP-a42bed2e9a78715889240ff900e2391bef923285.tar.lz UXP-a42bed2e9a78715889240ff900e2391bef923285.tar.xz UXP-a42bed2e9a78715889240ff900e2391bef923285.zip | |
Merge branch 'master' into remove-unboxed
# Conflicts:
# js/src/jit/BaselineIC.cpp
# js/src/jsarray.cpp
Diffstat (limited to 'intl/patch-icu.sh')
| -rw-r--r-- | intl/patch-icu.sh | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/intl/patch-icu.sh b/intl/patch-icu.sh new file mode 100644 index 000000000..b96bc1831 --- /dev/null +++ b/intl/patch-icu.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +set -e + +# Ensure that $Date$ in the checked-out git files expands timezone-agnostically, +# so that this script's behavior is consistent when run from any time zone. +export TZ=UTC + +# Also ensure GIT-INFO is consistently English. +export LANG=en_US.UTF-8 +export LANGUAGE=en_US +export LC_ALL=en_US.UTF-8 + +icu_dir=`dirname $0`/icu + +for patch in \ + bug-915735 \ + suppress-warnings.diff \ + bug-1172609-timezone-recreateDefault.diff \ + bug-1198952-workaround-make-3.82-bug.diff \ + bug-1228227-bug-1263325-libc++-gcc_hidden.diff \ + ucol_getKeywordValuesForLocale-ulist_resetList.diff \ +; do + echo "Applying local patch $patch" + patch -d ${icu_dir}/../../ -p1 --no-backup-if-mismatch < ${icu_dir}/../icu-patches/$patch +done + |