Bug 1445465 - Part 1: Remove ICU patch no longer needed with ICU 61. r=Waldo
authorAndré Bargull <andre.bargull@gmail.com>
Tue, 27 Mar 2018 07:10:44 -0700
changeset 410691 661eb6a317614c2a36277eeab8f781634dfa96ef
parent 410690 0f4795583a6df475b1b2c41dfbfc263f0076ecc9
child 410692 b8ff6d9ecca3199c1b6721645c17c46f8a860cd3
push id33734
push useraciure@mozilla.com
push dateThu, 29 Mar 2018 22:07:07 +0000
treeherdermozilla-central@dcd10220d55a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersWaldo
bugs1445465
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1445465 - Part 1: Remove ICU patch no longer needed with ICU 61. r=Waldo
intl/icu-patches/bug-1422415-numberformat-sprintfl-windows.diff
intl/update-icu.sh
deleted file mode 100644
--- a/intl/icu-patches/bug-1422415-numberformat-sprintfl-windows.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-Bug 1422415 - NumberFormat returns NaN if RegionalPrefsLocales is fa-IR and value has decimals
-
-https://ssl.icu-project.org/trac/ticket/13497
-
-diff --git a/intl/icu/source/i18n/digitlst.cpp b/intl/icu/source/i18n/digitlst.cpp
---- a/intl/icu/source/i18n/digitlst.cpp
-+++ b/intl/icu/source/i18n/digitlst.cpp
-@@ -846,17 +846,22 @@ DigitList::set(double source)
-     //       That is why infinity is special cased here.
-     if (uprv_isInfinite(source)) {
-         if (uprv_isNegativeInfinity(source)) {
-             uprv_strcpy(rep,"-inf"); // Handle negative infinity
-         } else {
-             uprv_strcpy(rep,"inf");
-         }
-     } else {
-+#if U_USE_STRTOD_L && U_PLATFORM_USES_ONLY_WIN32_API
-+        umtx_initOnce(gCLocaleInitOnce, &initCLocale);
-+        _sprintf_l(rep, "%+1.*e", gCLocale, MAX_DBL_DIGITS - 1, source);
-+#else
-         sprintf(rep, "%+1.*e", MAX_DBL_DIGITS - 1, source);
-+#endif
-     }
-     U_ASSERT(uprv_strlen(rep) < sizeof(rep));
- 
-     // uprv_decNumberFromString() will parse the string expecting '.' as a
-     // decimal separator, however sprintf() can use ',' in certain locales.
-     // Overwrite a ',' with '.' here before proceeding.
-     char *decimalSeparator = strchr(rep, ',');
-     if (decimalSeparator != NULL) {
--- a/intl/update-icu.sh
+++ b/intl/update-icu.sh
@@ -65,17 +65,16 @@ find ${icu_dir}/source/data/zone \
 # the tree.)
 svn info $1 | grep -v '^Revision: [[:digit:]]\+$' > ${icu_dir}/SVN-INFO
 
 for patch in \
  bug-915735 \
  suppress-warnings.diff \
  bug-1172609-timezone-recreateDefault.diff \
  bug-1198952-workaround-make-3.82-bug.diff \
- bug-1422415-numberformat-sprintfl-windows.diff \
 ; do
   echo "Applying local patch $patch"
   patch -d ${icu_dir}/../../ -p1 --no-backup-if-mismatch < ${icu_dir}/../icu-patches/$patch
 done
 
 topsrcdir=`dirname $0`/../
 python ${topsrcdir}/js/src/tests/non262/String/make-normalize-generateddata-input.py $topsrcdir