Accepting request 627863 from X11:common:Factory
- Update to new upstream release 62.1 OBS-URL: https://build.opensuse.org/request/show/627863 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icu?expand=0&rev=62
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
2cc3f310cb
@ -1,4 +1,4 @@
|
||||
libicu-suse61_1
|
||||
libicu-suse62_1
|
||||
libicu-devel
|
||||
requires -libicu-<targettype>
|
||||
requires "libicu-suse61_1-<targettype> = <version>"
|
||||
requires "libicu-suse62_1-<targettype> = <version>"
|
||||
|
||||
@ -1,17 +1,38 @@
|
||||
---
|
||||
source/i18n/precision.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: icu/source/i18n/precision.cpp
|
||||
---
|
||||
source/test/intltest/dcfmapts.cpp | 10 ++++++----
|
||||
1 file changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
Index: icu/source/test/intltest/dcfmapts.cpp
|
||||
===================================================================
|
||||
--- icu.orig/source/i18n/precision.cpp
|
||||
+++ icu/source/i18n/precision.cpp
|
||||
@@ -227,7 +227,7 @@ FixedPrecision::initVisibleDigits(
|
||||
--- icu.orig/source/test/intltest/dcfmapts.cpp
|
||||
+++ icu/source/test/intltest/dcfmapts.cpp
|
||||
@@ -851,7 +851,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));
|
||||
- ASSERT_EQUAL(345678901234567890LL, fd.getPluralOperand(PLURAL_OPERAND_I));
|
||||
+ volatile double xxa = fd.getPluralOperand(PLURAL_OPERAND_I);
|
||||
+ ASSERT_EQUAL(345678901234567890LL, xxa);
|
||||
ASSERT_EQUAL(FALSE, fd.hasIntegerValue());
|
||||
ASSERT_EQUAL(FALSE, fd.isNegative());
|
||||
|
||||
@@ -947,14 +948,15 @@ void IntlTestDecimalFormatAPI::TestFixed
|
||||
// note: going through DigitList path to FixedDecimal, which is trimming
|
||||
// int64_t fields to 18 digits. See ticket Ticket #10374
|
||||
// ASSERT_EQUAL(223372036854775807LL, fd.getPluralOperand(PLURAL_OPERAND_I);
|
||||
+ volatile double xxb = fd.getPluralOperand(PLURAL_OPERAND_I);
|
||||
if (!(
|
||||
- fd.getPluralOperand(PLURAL_OPERAND_I) == 223372036854775807LL ||
|
||||
- fd.getPluralOperand(PLURAL_OPERAND_I) == 9223372036854775807LL)) {
|
||||
+ xxb == 223372036854775807LL ||
|
||||
+ xxb == 9223372036854775807LL)) {
|
||||
dataerrln(
|
||||
"File %s, Line %d, fd.getPluralOperand(PLURAL_OPERAND_I = %lld",
|
||||
__FILE__,
|
||||
__LINE__,
|
||||
- fd.getPluralOperand(PLURAL_OPERAND_I));
|
||||
+ xxb);
|
||||
}
|
||||
// Try to find n such that value * 10^n is an integer
|
||||
int32_t n = -1;
|
||||
- double scaled;
|
||||
+ volatile double scaled; // make sure scaled is in memory to avoid excess precision with x87 math
|
||||
for (int32_t i = 0; i < UPRV_LENGTHOF(gPower10); ++i) {
|
||||
scaled = value * gPower10[i];
|
||||
if (scaled > MAX_INT64_IN_DOUBLE || scaled < -MAX_INT64_IN_DOUBLE) {
|
||||
ASSERT_EQUAL(TRUE, fd.hasIntegerValue());
|
||||
ASSERT_EQUAL(FALSE, fd.isNegative());
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: 2018-04-05 01:42:48.090215154 +0200
|
||||
|
||||
make the compiler and rpmlint happy
|
||||
|
||||
[ 59s] number_grouping.cpp: In static member function 'static icu_61_1::number::impl::Grouper icu_61_1::number::impl::Grouper::forStrategy(UGroupingStrategy)':
|
||||
[ 59s] number_grouping.cpp:52:1: warning: control reaches end of non-void function [-Wreturn-type]
|
||||
|
||||
---
|
||||
source/i18n/number_grouping.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
Index: icu/source/i18n/number_grouping.cpp
|
||||
===================================================================
|
||||
--- icu.orig/source/i18n/number_grouping.cpp
|
||||
+++ icu/source/i18n/number_grouping.cpp
|
||||
@@ -48,6 +48,7 @@ Grouper Grouper::forStrategy(UGroupingSt
|
||||
return {3, 3, 1};
|
||||
default:
|
||||
U_ASSERT(FALSE);
|
||||
+ return {};
|
||||
}
|
||||
}
|
||||
|
||||
@ -78,8 +78,8 @@ Index: icu/source/common/unicode/uvernum.h
|
||||
@@ -59,6 +59,7 @@
|
||||
* @stable ICU 2.4
|
||||
*/
|
||||
#define U_ICU_VERSION_MAJOR_NUM 61
|
||||
+#define U_ICU_VERSION_MAJOR_STR "61"
|
||||
#define U_ICU_VERSION_MAJOR_NUM 62
|
||||
+#define U_ICU_VERSION_MAJOR_STR "62"
|
||||
|
||||
/** The current ICU minor version as an integer.
|
||||
* This value will change in the subsequent releases of ICU
|
||||
@ -87,7 +87,7 @@ Index: icu/source/common/unicode/uvernum.h
|
||||
* This value will change in the subsequent releases of ICU
|
||||
* @stable ICU 2.6
|
||||
*/
|
||||
-#define U_ICU_VERSION_SUFFIX _61
|
||||
-#define U_ICU_VERSION_SUFFIX _62
|
||||
+#define ___icu_version_expand(major, minor) _ ## major ## _ ## minor
|
||||
+#define ___icu_version_glue(major, minor) ___icu_version_expand(major, minor)
|
||||
+#define U_ICU_VERSION_SUFFIX ___icu_version_glue(U_ICU_VERSION_MAJOR_NUM, U_ICU_VERSION_MINOR_NUM)
|
||||
@ -98,8 +98,8 @@ Index: icu/source/common/unicode/uvernum.h
|
||||
*
|
||||
* @stable ICU 2.6
|
||||
*/
|
||||
-#define U_ICU_VERSION_SHORT "61"
|
||||
+#define U_ICU_VERSION_SHORT "61_1"
|
||||
-#define U_ICU_VERSION_SHORT "62"
|
||||
+#define U_ICU_VERSION_SHORT "62_1"
|
||||
|
||||
#ifndef U_HIDE_INTERNAL_API
|
||||
/** Data version in ICU4C.
|
||||
|
||||
14
icu.changes
14
icu.changes
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 29 09:20:28 UTC 2018 - jengelh@inai.de
|
||||
|
||||
- Update to new upstream release 62.1
|
||||
* Unicode 11: 684 new characters, including 7 new scripts,
|
||||
Mtavruli Georgian capital letters, 5 new Han characters, and
|
||||
66 new emoji characters.
|
||||
* CLDR 33.1
|
||||
* Under-the-hood overhaul of number parsing. Behavior is mostly
|
||||
compatible with previous versions, but there are some known
|
||||
differences.
|
||||
- Remove xlocale.patch (code to patch is gone),
|
||||
icu-number-grouping.diff (merged upstream)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 4 07:53:56 UTC 2018 - jengelh@inai.de
|
||||
|
||||
|
||||
12
icu.spec
12
icu.spec
@ -16,16 +16,16 @@
|
||||
#
|
||||
|
||||
|
||||
%define lname libicu-suse61_1
|
||||
%define amajor 61
|
||||
%define aversion 61_1
|
||||
%define lname libicu-suse62_1
|
||||
%define amajor 62
|
||||
%define aversion 62_1
|
||||
%ifarch %armb hppa mips mips64 ppc ppc64 %sparc s390 s390x m68k
|
||||
%define be_platform 1
|
||||
%else
|
||||
%define be_platform 0
|
||||
%endif
|
||||
Name: icu
|
||||
Version: 61.1
|
||||
Version: 62.1
|
||||
Release: 0
|
||||
Summary: International Components for Unicode
|
||||
License: ICU
|
||||
@ -39,8 +39,6 @@ Patch3: icu-susevers.diff
|
||||
Patch4: icu-fix-install-mode-files.diff
|
||||
Patch6: icu-error-reporting.diff
|
||||
Patch7: icu-avoid-x87-excess-precision.diff
|
||||
Patch8: xlocale.patch
|
||||
Patch9: icu-number-grouping.diff
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: pkg-config
|
||||
@ -140,7 +138,7 @@ This package contains the HTML documentation.
|
||||
|
||||
%prep
|
||||
%setup -q -n icu
|
||||
%patch -P 2 -P 3 -P 4 -P 6 -P 7 -P 8 -P 9 -p1
|
||||
%patch -P 2 -P 3 -P 4 -P 6 -P 7 -p1
|
||||
# docs are special
|
||||
mkdir html
|
||||
pushd html/
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:62bb6b1bee62472a1e3a0ee0b58c19b4bd24bed278d328db985075b65851dd2a
|
||||
size 7270472
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef
|
||||
size 23400587
|
||||
3
icu4c-62_1-docs.zip
Normal file
3
icu4c-62_1-docs.zip
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d775f17996f94b22fee948991defc35eb3c5a4ed493e8790d2568fdd2243f9a9
|
||||
size 7404744
|
||||
3
icu4c-62_1-src.tgz
Normal file
3
icu4c-62_1-src.tgz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3dd9868d666350dda66a6e305eecde9d479fb70b30d5b55d78a1deffb97d5aa3
|
||||
size 23468750
|
||||
@ -1,25 +0,0 @@
|
||||
From: Andrews Schwab <schwab@suse.de>
|
||||
Date: Mon, 31 Jul 2017 12:19:40 +0000
|
||||
|
||||
don't use obsolete <xlocale.h>
|
||||
|
||||
---
|
||||
source/i18n/digitlst.cpp | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
Index: icu/source/i18n/digitlst.cpp
|
||||
===================================================================
|
||||
--- icu.orig/source/i18n/digitlst.cpp
|
||||
+++ icu/source/i18n/digitlst.cpp
|
||||
@@ -62,11 +62,7 @@
|
||||
#endif
|
||||
|
||||
#if U_USE_STRTOD_L
|
||||
-# if U_HAVE_XLOCALE_H
|
||||
-# include <xlocale.h>
|
||||
-# else
|
||||
# include <locale.h>
|
||||
-# endif
|
||||
#endif
|
||||
|
||||
// ***************************************************************************
|
||||
Loading…
Reference in New Issue
Block a user