rpm/icu
SHA256
1
0
Fork 0
forked from pool/icu
Code Pull Requests Activity

Accepting request 879226 from X11:common:Factory

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/879226
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icu?expand=0&rev=78
This commit is contained in:
Dominique Leuenberger 2021-03-17 19:13:28 +00:00 committed by Git OBS Bridge
commit bb5914fd4f
3 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
icu-1618.patch Normal file
View File

@ -0,0 +1,43 @@
From 7045a80e08a5f662b9588ad9f0b8a5c1cd558bce Mon Sep 17 00:00:00 2001
From: Frank Tang <ftang@chromium.org>
Date: Fri, 5 Mar 2021 02:29:58 +0000
Subject: [PATCH] ICU-21521 Fix cast of uprv_strcmp
See #1618
[Update from guillaume: drop 1st hunk for backporting]
---
source/common/locid.cpp | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/source/common/locid.cpp b/source/common/locid.cpp
index 448c1de5e44..2d005b23542 100644
--- a/source/common/locid.cpp
+++ b/source/common/locid.cpp
@@ -1618,8 +1622,12 @@ AliasReplacer::outputToString(
out.append(SEP_CHAR, status);
}
variants.sort([](UElement e1, UElement e2) -> int8_t {
- return uprv_strcmp(
+ // uprv_strcmp return int and in some platform, such as arm64-v8a,
+ // it may return positive values > 127 which cause the casted value
+ // of int8_t negative.
+ int res = uprv_strcmp(
(const char*)e1.pointer, (const char*)e2.pointer);
+ return (res == 0) ? 0 : ((res > 0) ? 1 : -1);
}, status);
int32_t variantsStart = out.length();
for (int32_t i = 0; i < variants.size(); i++) {
@@ -1680,8 +1688,12 @@ AliasReplacer::replace(const Locale& locale, CharString& out, UErrorCode& status
// Sort the variants
variants.sort([](UElement e1, UElement e2) -> int8_t {
- return uprv_strcmp(
+ // uprv_strcmp return int and in some platform, such as arm64-v8a,
+ // it may return positive values > 127 which cause the casted value
+ // of int8_t negative.
+ int res = uprv_strcmp(
(const char*)e1.pointer, (const char*)e2.pointer);
+ return (res == 0) ? 0 : ((res > 0) ? 1 : -1);
}, status);
// A changed count to assert when loop too many times.

5
icu.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Mar 8 07:33:00 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Added icu-1618.patch to fix 2 tests on aarch64 [boo#1182645]
-------------------------------------------------------------------
Mon Mar 1 13:37:17 UTC 2021 - Martin Liška <mliska@suse.cz>

1
icu.spec
View File

@ -44,6 +44,7 @@ Patch4: icu-fix-install-mode-files.diff
Patch6: icu-error-reporting.diff
Patch7: icu-avoid-x87-excess-precision.diff
Patch8: locale.diff
Patch9: icu-1618.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: pkg-config