From 9d2d81b98df8a124ffdbe01afa2fddf7372ac42a Mon Sep 17 00:00:00 2001
From: Andy Postnikov <apostnikov@gmail.com>
Date: Thu, 29 Oct 2020 11:51:25 +0200
Subject: [PATCH] main/icu: upgrade to 68.2

---
 main/icu/APKBUILD                             | 10 +++---
 ...onverter-allow-some-double-precision.patch | 36 +++++++++++++++++++
 2 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 main/icu/ICU-21366-testConverter-allow-some-double-precision.patch

diff --git a/main/icu/APKBUILD b/main/icu/APKBUILD
index af61c144ba..48667e0813 100644
--- a/main/icu/APKBUILD
+++ b/main/icu/APKBUILD
@@ -4,8 +4,8 @@
 # TODO: After 3.13 is released, change data-packaging to "archive" and split
 # data into multiple variants (English-only, all, ...).
 pkgname=icu
-pkgver=67.1
-pkgrel=2
+pkgver=68.2
+pkgrel=0
 pkgdesc="International Components for Unicode library"
 url="http://site.icu-project.org/"
 arch="all"
@@ -13,7 +13,8 @@ license="MIT ICU Unicode-TOU"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs $pkgname-data::noarch"
 depends_dev="$pkgname=$pkgver-r$pkgrel"
 checkdepends="diffutils python3"
-source="https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/icu4c-${pkgver//./_}-src.tgz"
+source="https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/icu4c-${pkgver//./_}-src.tgz
+	ICU-21366-testConverter-allow-some-double-precision.patch"
 builddir="$srcdir"/icu/source
 
 # secfixes:
@@ -76,4 +77,5 @@ data() {
 		"$subpkgdir"/usr/share/icu/$pkgver/icudt${majorver}l.dat
 }
 
-sha512sums="4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8  icu4c-67_1-src.tgz"
+sha512sums="24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b  icu4c-68_2-src.tgz
+f3a3be0e52d1012484c8ba1985cc1388ecc03763dd4c7bdd3b80b517d4610766b2c3d2fb9c29145422f9af7e394a4a6fa9bc40359e276a3f864bb1e829e9b123  ICU-21366-testConverter-allow-some-double-precision.patch"
diff --git a/main/icu/ICU-21366-testConverter-allow-some-double-precision.patch b/main/icu/ICU-21366-testConverter-allow-some-double-precision.patch
new file mode 100644
index 0000000000..9b3351acbe
--- /dev/null
+++ b/main/icu/ICU-21366-testConverter-allow-some-double-precision.patch
@@ -0,0 +1,36 @@
+Upstream: yes, cherrry-picked from master, will be in 69.1
+Reason: Fixes a test
+
+From bbd1d25810bc134e97bc54c7d850e380d7f509c6 Mon Sep 17 00:00:00 2001
+From: Hugo van der Merwe <17109322+hugovdm@users.noreply.github.com>
+Date: Fri, 6 Nov 2020 17:55:21 +0000
+Subject: [PATCH] ICU-21366 testConverter: allow some double-precision error
+ for 0.0
+
+See #1443
+---
+ icu4c/source/test/intltest/units_test.cpp | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/icu4c/source/test/intltest/units_test.cpp b/icu4c/source/test/intltest/units_test.cpp
+index a853dd79a8..098efb8921 100644
+--- a/test/intltest/units_test.cpp
++++ b/test/intltest/units_test.cpp
+@@ -252,9 +252,12 @@ void UnitsTest::testTemperature() {
+         ConversionRates conversionRates(status);
+         UnitConverter converter(source, target, conversionRates, status);
+ 
++        double maxDelta = 1e-6 * uprv_fabs(testCase.expectedValue);
++        if (testCase.expectedValue == 0) {
++            maxDelta = 1e-12;
++        }
+         assertEqualsNear(UnicodeString("testTemperature: ") + testCase.source + " to " + testCase.target,
+-                         testCase.expectedValue, converter.convert(testCase.inputValue),
+-                         0.0001 * uprv_fabs(testCase.expectedValue));
++                         testCase.expectedValue, converter.convert(testCase.inputValue), maxDelta);
+     }
+ }
+ 
+-- 
+2.30.0.rc0
+
-- 
GitLab