Accepting request 969258 from X11:common:Factory
OBS-URL: https://build.opensuse.org/request/show/969258 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icu?expand=0&rev=84
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
a5f374b795
@ -1,43 +0,0 @@
|
||||
From 698efda42bb21a9da1c92348d3e73466c8a528fe Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
|
||||
Date: Wed, 3 Nov 2021 02:31:18 +0100
|
||||
Subject: [PATCH] ICU-21793 Fix ucptrietest golden diff
|
||||
References: https://bugzilla.opensuse.org/show_bug.cgi?id=1192935
|
||||
|
||||
---
|
||||
icu4c/source/tools/toolutil/toolutil.cpp | 13 +++++++------
|
||||
1 file changed, 7 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/icu4c/source/tools/toolutil/toolutil.cpp b/icu4c/source/tools/toolutil/toolutil.cpp
|
||||
index 1fc68aa69c..a9dc37377a 100644
|
||||
--- icu4c/source/tools/toolutil/toolutil.cpp
|
||||
+++ icu4c/source/tools/toolutil/toolutil.cpp
|
||||
@@ -228,18 +228,19 @@ uprv_compareGoldenFiles(
|
||||
std::ifstream ifs(goldenFilePath, std::ifstream::in);
|
||||
int32_t pos = 0;
|
||||
char c;
|
||||
- while ((c = ifs.get()) != std::char_traits<char>::eof() && pos < bufferLen) {
|
||||
+ while (ifs.get(c) && pos < bufferLen) {
|
||||
if (c != buffer[pos]) {
|
||||
// Files differ at this position
|
||||
- return pos;
|
||||
+ break;
|
||||
}
|
||||
pos++;
|
||||
}
|
||||
- if (pos < bufferLen || c != std::char_traits<char>::eof()) {
|
||||
- // Files are different lengths
|
||||
- return pos;
|
||||
+ if (pos == bufferLen && ifs.eof()) {
|
||||
+ // Files are same lengths
|
||||
+ pos = -1;
|
||||
}
|
||||
- return -1;
|
||||
+ ifs.close();
|
||||
+ return pos;
|
||||
}
|
||||
|
||||
/*U_CAPI UDate U_EXPORT2
|
||||
--
|
||||
2.34.0
|
||||
|
||||
@ -11,7 +11,7 @@ Index: icu/source/test/intltest/dcfmapts.cpp
|
||||
===================================================================
|
||||
--- icu.orig/source/test/intltest/dcfmapts.cpp
|
||||
+++ icu/source/test/intltest/dcfmapts.cpp
|
||||
@@ -870,7 +870,8 @@ void IntlTestDecimalFormatAPI::TestFixed
|
||||
@@ -875,7 +875,8 @@ void IntlTestDecimalFormatAPI::TestFixed
|
||||
ASSERT_EQUAL(22, fd.getPluralOperand(PLURAL_OPERAND_V));
|
||||
ASSERT_EQUAL(1234567890123456789LL, fd.getPluralOperand(PLURAL_OPERAND_F));
|
||||
ASSERT_EQUAL(1234567890123456789LL, fd.getPluralOperand(PLURAL_OPERAND_T));
|
||||
@ -21,7 +21,7 @@ Index: icu/source/test/intltest/dcfmapts.cpp
|
||||
ASSERT_EQUAL(FALSE, fd.hasIntegerValue());
|
||||
ASSERT_EQUAL(FALSE, fd.isNegative());
|
||||
|
||||
@@ -965,7 +966,8 @@ void IntlTestDecimalFormatAPI::TestFixed
|
||||
@@ -970,7 +971,8 @@ void IntlTestDecimalFormatAPI::TestFixed
|
||||
ASSERT_EQUAL(0, fd.getPluralOperand(PLURAL_OPERAND_T));
|
||||
// note: going through DigitList path to FixedDecimal, which is trimming
|
||||
// int64_t fields to 18 digits. See ticket Ticket #10374
|
||||
|
||||
18
icu.changes
18
icu.changes
@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Apr 9 22:10:56 UTC 2022 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
- update to 71.1:
|
||||
* updates to CLDR 41 locale data with various additions and corrections.
|
||||
* phrase-based line breaking for Japanese. Existing line breaking methods
|
||||
follow standards and conventions for body text but do not work well for
|
||||
short Japanese text, such as in titles and headings. This new feature is
|
||||
optimized for these use cases.
|
||||
* support for Hindi written in Latin letters (hi_Latn). The CLDR data for
|
||||
this increasingly popular locale has been significantly revised and
|
||||
expanded. Note that based on user expectations, hi_Latn incorporates a
|
||||
large amount of English, and can also be referred to as “Hinglish”.
|
||||
* time zone data updated to version 2022a. Note that pre-1970 data for a
|
||||
number of time zones has been removed, as has been the case in the upstream
|
||||
tzdata release since 2021b.
|
||||
- drop fix-ucptrietest-golden-diff.patch (upstream)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 22 10:22:02 UTC 2021 - Andreas Schwab <schwab@suse.de>
|
||||
|
||||
|
||||
21
icu.spec
21
icu.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package icu
|
||||
#
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,8 +17,8 @@
|
||||
|
||||
|
||||
%define lname libicu70
|
||||
%define amajor 70
|
||||
%define aversion 70
|
||||
%define amajor 71
|
||||
%define aversion 71
|
||||
%ifarch %armb hppa mips mips64 ppc ppc64 %sparc s390 s390x m68k
|
||||
%define be_platform 1
|
||||
%else
|
||||
@ -26,18 +26,16 @@
|
||||
%endif
|
||||
# icu-versioning.diff needs update for new Version too
|
||||
Name: icu
|
||||
Version: 70.1
|
||||
Version: 71.1
|
||||
Release: 0
|
||||
Summary: International Components for Unicode
|
||||
License: ICU
|
||||
Group: Development/Libraries/C and C++
|
||||
URL: http://icu-project.org/
|
||||
|
||||
#Git-Clone: https://github.com/unicode-org/icu.git
|
||||
Source: https://github.com/unicode-org/icu/releases/download/release-70-1/icu4c-70_1-src.tgz
|
||||
Source2: https://github.com/unicode-org/icu/releases/download/release-70-1/icu4c-70_1-src.tgz.asc
|
||||
Source3: https://github.com/unicode-org/icu/releases/download/release-70-1/icu4c-70_1-docs.zip
|
||||
Source4: https://github.com/unicode-org/icu/releases/download/release-70-1/icu4c-70_1-docs.zip.asc
|
||||
URL: https://icu.unicode.org/
|
||||
Source: https://github.com/unicode-org/icu/releases/download/release-71-1/icu4c-71_1-src.tgz
|
||||
Source2: https://github.com/unicode-org/icu/releases/download/release-71-1/icu4c-71_1-src.tgz.asc
|
||||
Source3: https://github.com/unicode-org/icu/releases/download/release-71-1/icu4c-71_1-docs.zip
|
||||
Source4: https://github.com/unicode-org/icu/releases/download/release-71-1/icu4c-71_1-docs.zip.asc
|
||||
Source99: icu.keyring
|
||||
Source100: baselibs.conf
|
||||
Patch4: icu-fix-install-mode-files.diff
|
||||
@ -45,7 +43,6 @@ Patch6: icu-error-reporting.diff
|
||||
Patch7: icu-avoid-x87-excess-precision.diff
|
||||
Patch8: locale.diff
|
||||
Patch9: nan-undefined-conversion.patch
|
||||
Patch10: fix-ucptrietest-golden-diff.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: pkg-config
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5f37ce9ee5894df9356f02c0e55cd9e53464d7fc6c1ba2bb6885eb959f79bf13
|
||||
size 8123512
|
||||
@ -1,14 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQGzBAABCgAdFiEEDlHn8G73GfvQcngqX1blr6Y8zTMFAmF607UACgkQX1blr6Y8
|
||||
zTPfDgwAn0lt1o1kWsruOujjtPH2+6OcPjMylFub7MQOtyUf0Cncf7ANLU5znBTL
|
||||
FlHWo/aBFPZ97D8d4W0Zr7e5eGE/30FqPvs+2vGT9MXQwk9OqpI1F/R3faorLTge
|
||||
vXAekY6Fw2TlM5RT4eneFCsfLkQ0ra0m9V5nN+mYHduAYM2gaxbbDj0/7DKX2S9H
|
||||
CxU3iINf4Y7AlSyQO5qwU0bHFyCNtnVT3u/YCSP8omdaz0ojrKeRF+iJAv7oR4Fd
|
||||
zLgrYu+BO6Y7TtDSXTeqJHGMu8l4vx1iu8HZ4Uvs+p7065f1ADZcgmsVO0O7qNKk
|
||||
pBDB6f1e5Z6giVaQsYCotgVMTjU7uOR2CngNowBuPIhY+DsDoIdaAlaZ2JhrCrbG
|
||||
0Tcb5gLohvN4+2ZL/fJgguCkNBX8Zx7ky1B9tcgGTk1M0HmK5CqipKsokisL9pe2
|
||||
KBFljA0o5JMql+0PNX6iShVlL/WvUqhYCBiiVg5ECpTHzSe67nBJpFLHrWbD5ymk
|
||||
81OGVJud
|
||||
=CA6x
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5
|
||||
size 25449582
|
||||
@ -1,14 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQGzBAABCgAdFiEEDlHn8G73GfvQcngqX1blr6Y8zTMFAmF607oACgkQX1blr6Y8
|
||||
zTP9MgwAnS7+giI2jWjegkfxO1eeiux0x6Jm9FDhgDjopegUnkrXNy/nP63FIgF+
|
||||
9VmaOhif65t+GcTd23uq2fg/ZcUsBG4IN1sWYs6vBKoc+VXUZ3+Ir0/Ks9nxfZ2i
|
||||
To+OhZ6zZGghArTTOqa+6HT3b+13xt2FOCC+Abw4OXZe6CpYuRhpqu4tGQ78ueaB
|
||||
icQUTCRwc13L/XuKTfayqek23Xu8KaBC5WwMQNpCQY8dz8uOIFTJ1VNLarmXCs8h
|
||||
a2iDCbHD9AlZGzRxEUHM8J2naN1CTj2/hP7k8TAFhsHCn40HfqgYUtFHmeQsGSX0
|
||||
wb6l0/ixwpsVbARiuo9F/K4ZeuvfMtr2OZncYLdU5Q1HXIg66gM+5/qFn62kH0ie
|
||||
VuWsOERRty4kPm7kxBnldit8mc49O2USoGKtUfcwP+GIjxiPHWU2MDltEqijTeeb
|
||||
C2/eNWFNKFDDAHD3Ys481NSNR8XuD8d9gui8WY7iSWJOHU4B0OzvSzVOcN6FW4vv
|
||||
Q/k3fB9j
|
||||
=3cD+
|
||||
-----END PGP SIGNATURE-----
|
||||
3
icu4c-71_1-docs.zip
Normal file
3
icu4c-71_1-docs.zip
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b2b6ec8bc5234d0ebe47aaee3d1f80dcf3dba4fda666588531b07f5b0d9cffc8
|
||||
size 8136508
|
||||
14
icu4c-71_1-docs.zip.asc
Normal file
14
icu4c-71_1-docs.zip.asc
Normal file
@ -0,0 +1,14 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQGzBAABCgAdFiEEDlHn8G73GfvQcngqX1blr6Y8zTMFAmJPbU4ACgkQX1blr6Y8
|
||||
zTMDQwv/fYn6sve3DrCEKzO1DY94k5PFqDb4wLlv52VsRUfWaOGamSOEpTrvxRBS
|
||||
+lYdeR8hbfL09O6Iz1h7lhll4yvcgVunGBIqBUaSzee1QVhpXkRpI0uB42GhWKXQ
|
||||
ndDZadomtSJc6We6Ln3bqOuhoZeGWGv72y3McEGqjg5+tlkciom46csc+TmUJX6t
|
||||
3UiwARC6KXklKD1jIiWV5FhhPhQzXtA5+q/2ZYu3nuriAXGh6/0R1PQdad4N5ZFD
|
||||
6wjBACZwy3pfjZCUQkrsfBpC/qpOhYQNxZqTSyv2sbIbV9owOkjLeYTCvww8OiO8
|
||||
ADp13alRNRZLQ4fQK+69y0w1BMuYoPaEM9PuQkpqCfT8QNQM3J+l23PUlMSoq0DW
|
||||
k9f/JpVJw4K4pV0Am8euRLdb0NPf9IHhSwWxfxYGhJtplYyC9+BUlL/i/bbyRCGv
|
||||
yWI4SZCQbxSnE/m99QB87+z+GAqLzB5+Hi6F6krMi/NC5jnepQlsrNhoDbXKp7Nu
|
||||
K2YuBeYt
|
||||
=+TMr
|
||||
-----END PGP SIGNATURE-----
|
||||
3
icu4c-71_1-src.tgz
Normal file
3
icu4c-71_1-src.tgz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf
|
||||
size 25701340
|
||||
14
icu4c-71_1-src.tgz.asc
Normal file
14
icu4c-71_1-src.tgz.asc
Normal file
@ -0,0 +1,14 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQGzBAABCgAdFiEEDlHn8G73GfvQcngqX1blr6Y8zTMFAmJPbWAACgkQX1blr6Y8
|
||||
zTP6ZAv8CWbVfghWFO8dkBVgdYP8NnMr4AD2KWWzuURfG2TpVlo0fl1+8TyFp8uJ
|
||||
8/IUVRfmoHiGQ+/20GTKZrUnYrdGP1xVJphoVN/2tlkZZQpVRiocRCnWx1J0r7oF
|
||||
C6uuSnywR/GflpTyu3axIRwBc7kk5X0S1kwJ7IcKHCGeXQqu5JH6dQO6Aqbbq94G
|
||||
pMzCS6m1TwIEf2duM5SzyJmJq8iVmLGkDxVvAYIU8cf4OQAjaQTZ3S3KEDnxG6+C
|
||||
Hx3fKBcq1EqejQYcKvO5cGR1oq9FrgNHn7cFdpZZvRXS9zikrOflo+aBG4Mugj46
|
||||
9Q0yvrS4KIU/3rLp49IEApCGIUPKivRNPPwnbNRhAc1pndwbpcl0c5gSvhJKZwuQ
|
||||
4TMZJG0hsLPje2CslsZsgo7h9Cf4EcT5/9YGuxco3iCcyxLb+NN5mxywNrBCCg0a
|
||||
Mtu/XiQ/k5JqEc5/9ZH+mQDzW0lgR4cqne1lV6uClwykw1p50FobKH+pBGGzhTwJ
|
||||
4AeWUuYS
|
||||
=jH9v
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -9,7 +9,7 @@ Index: icu/source/common/putil.cpp
|
||||
===================================================================
|
||||
--- icu.orig/source/common/putil.cpp
|
||||
+++ icu/source/common/putil.cpp
|
||||
@@ -1607,7 +1607,7 @@ static const char *uprv_getPOSIXIDForCat
|
||||
@@ -1616,7 +1616,7 @@ static const char *uprv_getPOSIXIDForCat
|
||||
/* Solaris speaks POSIX - See IEEE Std 1003.1-2008
|
||||
* This is needed to properly handle empty env. variables
|
||||
*/
|
||||
|
||||
@ -4,9 +4,11 @@ Date: Tue, 11 May 2021 19:04:24 +0200
|
||||
Subject: [PATCH] ICU-21613 Fix undefined behaviour in
|
||||
ComplexUnitsConverter::applyRounder
|
||||
|
||||
--- a/source/i18n/units_complexconverter.cpp
|
||||
+++ b/source/i18n/units_complexconverter.cpp
|
||||
@@ -237,6 +237,11 @@ void ComplexUnitsConverter::applyRounder(MaybeStackArray<int64_t, 5> &intValues,
|
||||
Index: icu/source/i18n/units_complexconverter.cpp
|
||||
===================================================================
|
||||
--- icu.orig/source/i18n/units_complexconverter.cpp
|
||||
+++ icu/source/i18n/units_complexconverter.cpp
|
||||
@@ -242,6 +242,11 @@ void ComplexUnitsConverter::applyRounder
|
||||
}
|
||||
quantity = decimalQuantity.toDouble();
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user