SHA256
1
0
forked from pool/icu

- Remove xlocale.patch (code to patch is gone),

icu-number-grouping.diff (merged upstream)

OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=92
This commit is contained in:
Jan Engelhardt 2018-07-29 10:17:10 +00:00 committed by Git OBS Bridge
parent 988afcaa7d
commit e7a70e6ab8
3 changed files with 28 additions and 4 deletions

View File

@ -0,0 +1,24 @@
---
source/i18n/plurrule.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: icu/source/i18n/plurrule.cpp
===================================================================
--- icu.orig/source/i18n/plurrule.cpp
+++ icu/source/i18n/plurrule.cpp
@@ -1566,13 +1566,13 @@ int64_t FixedDecimal::getFractionalDigit
return 0;
}
n = fabs(n);
- double fract = n - floor(n);
+ volatile double fract = n - floor(n);
switch (v) {
case 1: return (int64_t)(fract*10.0 + 0.5);
case 2: return (int64_t)(fract*100.0 + 0.5);
case 3: return (int64_t)(fract*1000.0 + 0.5);
default:
- double scaled = floor(fract * pow(10.0, (double)v) + 0.5);
+ volatile double scaled = floor(fract * pow(10.0, (double)v) + 0.5);
if (scaled > U_INT64_MAX) {
return U_INT64_MAX;
} else {

View File

@ -9,9 +9,8 @@ Sun Jul 29 09:20:28 UTC 2018 - jengelh@inai.de
* Under-the-hood overhaul of number parsing. Behavior is mostly * Under-the-hood overhaul of number parsing. Behavior is mostly
compatible with previous versions, but there are some known compatible with previous versions, but there are some known
differences. differences.
- Remove icu-avoid-x87-excess-precision.diff, xlocale.patch - Remove xlocale.patch (code to patch is gone),
(code to patch is gone), icu-number-grouping.diff (merged icu-number-grouping.diff (merged upstream)
upstream)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 4 07:53:56 UTC 2018 - jengelh@inai.de Mon Jun 4 07:53:56 UTC 2018 - jengelh@inai.de

View File

@ -38,6 +38,7 @@ Patch2: icu-versioning.diff
Patch3: icu-susevers.diff Patch3: icu-susevers.diff
Patch4: icu-fix-install-mode-files.diff Patch4: icu-fix-install-mode-files.diff
Patch6: icu-error-reporting.diff Patch6: icu-error-reporting.diff
Patch7: icu-avoid-x87-excess-precision.diff
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkg-config BuildRequires: pkg-config
@ -137,7 +138,7 @@ This package contains the HTML documentation.
%prep %prep
%setup -q -n icu %setup -q -n icu
%patch -P 2 -P 3 -P 4 -P 6 -p1 %patch -P 2 -P 3 -P 4 -P 6 -P 7 -p1
# docs are special # docs are special
mkdir html mkdir html
pushd html/ pushd html/