[Libreoffice-commits] core.git: external/icu

Thorsten Behrens (via logerrit) logerrit at kemper.freedesktop.org
Sun May 17 01:08:43 UTC 2020


 external/icu/icu4c-android.patch.1 |   12 ------------
 1 file changed, 12 deletions(-)

New commits:
commit 1125ee2f8d3851752e34343e81c11f019f23bb3a
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Sun May 17 01:48:51 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Sun May 17 03:07:58 2020 +0200

    Update icu4c-android.patch.1 to recent ICU 67 upgrade
    
    Looks fixed upstream (if slightly differently)
    
    Change-Id: If53722b867346d390866d9502fe36f976d702c31
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94372
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/external/icu/icu4c-android.patch.1 b/external/icu/icu4c-android.patch.1
index 79b648615116..602d225d7812 100644
--- a/external/icu/icu4c-android.patch.1
+++ b/external/icu/icu4c-android.patch.1
@@ -73,15 +73,3 @@ diff -ur icu.org/source/i18n/decimfmt.cpp icu/source/i18n/decimfmt.cpp
  #include <cmath>
  #include <cstdlib>
  #include <stdlib.h>
-diff -ur icu.org/source/i18n/number_decimalquantity.cpp icu/source/i18n/number_decimalquantity.cpp
---- icu.org/source/i18n/number_decimalquantity.cpp	2018-10-02 00:39:56.000000000 +0200
-+++ icu/source/i18n/number_decimalquantity.cpp	2018-10-20 00:33:36.560130873 +0200
-@@ -432,7 +432,7 @@
-         for (; i <= -22; i += 22) n /= 1e22;
-         n /= DOUBLE_MULTIPLIERS[-i];
-     }
--    auto result = static_cast<int64_t>(std::round(n));
-+    auto result = static_cast<int64_t>(round(n));
-     if (result != 0) {
-         _setToLong(result);
-         scale -= fracLength;


More information about the Libreoffice-commits mailing list