From 100d38f88f26547e8068e8a88c69f8e58092942a608324a24ac275a6eab7230b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 5 Apr 2018 00:33:27 +0000 Subject: [PATCH] - Update to new upstream release 61.1 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=87 --- baselibs.conf | 4 ++-- icu-number-grouping.diff | 24 ++++++++++++++++++++++++ icu-versioning.diff | 16 ++++++++-------- icu.changes | 7 +++++++ icu.spec | 13 +++++++------ icu4c-60_2-docs.zip | 3 --- icu4c-60_2-src.tgz | 3 --- icu4c-61_1-docs.zip | 3 +++ icu4c-61_1-src.tgz | 3 +++ 9 files changed, 54 insertions(+), 22 deletions(-) create mode 100644 icu-number-grouping.diff delete mode 100644 icu4c-60_2-docs.zip delete mode 100644 icu4c-60_2-src.tgz create mode 100644 icu4c-61_1-docs.zip create mode 100644 icu4c-61_1-src.tgz diff --git a/baselibs.conf b/baselibs.conf index 12b7bbf..8d2fa93 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libicu60_2 +libicu61_1 libicu-devel requires -libicu- - requires "libicu60_2- = " + requires "libicu61_1- = " diff --git a/icu-number-grouping.diff b/icu-number-grouping.diff new file mode 100644 index 0000000..7ac690b --- /dev/null +++ b/icu-number-grouping.diff @@ -0,0 +1,24 @@ +From: Jan Engelhardt +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 {}; + } + } + diff --git a/icu-versioning.diff b/icu-versioning.diff index cd827dc..936ef4e 100644 --- a/icu-versioning.diff +++ b/icu-versioning.diff @@ -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 60 -+#define U_ICU_VERSION_MAJOR_STR "60" + #define U_ICU_VERSION_MAJOR_NUM 61 ++#define U_ICU_VERSION_MAJOR_STR "61" /** The current ICU minor version as an integer. * This value will change in the subsequent releases of ICU @@ -87,19 +87,19 @@ 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 _60 +-#define U_ICU_VERSION_SUFFIX _61 +#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) /** * \def U_DEF2_ICU_ENTRY_POINT_RENAME -@@ -125,7 +128,7 @@ - * This value will change in the subsequent releases of ICU - * @stable ICU 2.6 +@@ -132,7 +135,7 @@ + * + * @stable ICU 2.6 */ --#define U_ICU_VERSION_SHORT "60" -+#define U_ICU_VERSION_SHORT "60_2" +-#define U_ICU_VERSION_SHORT "61" ++#define U_ICU_VERSION_SHORT "61_1" #ifndef U_HIDE_INTERNAL_API /** Data version in ICU4C. diff --git a/icu.changes b/icu.changes index 3069217..019a6d6 100644 --- a/icu.changes +++ b/icu.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 4 20:22:42 UTC 2018 - jengelh@inai.de + +- Update to new upstream release 61.1 + * ICU 61 upgrades to CLDR 33 locale data. +- Add icu-number-grouping.diff + ------------------------------------------------------------------- Tue Dec 26 13:45:03 UTC 2017 - jengelh@inai.de diff --git a/icu.spec b/icu.spec index b551752..c8d2c48 100644 --- a/icu.spec +++ b/icu.spec @@ -1,7 +1,7 @@ # # spec file for package icu # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,16 +16,16 @@ # -%define lname libicu60_2 -%define amajor 60 -%define aversion 60_2 +%define lname libicu61_1 +%define amajor 61 +%define aversion 61_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: 60.2 +Version: 61.1 Release: 0 Summary: International Components for Unicode License: ICU @@ -39,6 +39,7 @@ 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 @@ -138,7 +139,7 @@ This package contains the HTML documentation. %prep %setup -q -n icu -%patch -P 3 -P 4 -P 6 -P 7 -P 8 -p1 +%patch -P 3 -P 4 -P 6 -P 7 -P 8 -P 9 -p1 # docs are special mkdir html pushd html/ diff --git a/icu4c-60_2-docs.zip b/icu4c-60_2-docs.zip deleted file mode 100644 index 40b215c..0000000 --- a/icu4c-60_2-docs.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac652c2dc5c2c934f7419d0d013b04bb5288e346775a5dcf1c4e915330bf01eb -size 7255513 diff --git a/icu4c-60_2-src.tgz b/icu4c-60_2-src.tgz deleted file mode 100644 index 4cd376f..0000000 --- a/icu4c-60_2-src.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418 -size 23317835 diff --git a/icu4c-61_1-docs.zip b/icu4c-61_1-docs.zip new file mode 100644 index 0000000..b7851c2 --- /dev/null +++ b/icu4c-61_1-docs.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62bb6b1bee62472a1e3a0ee0b58c19b4bd24bed278d328db985075b65851dd2a +size 7270472 diff --git a/icu4c-61_1-src.tgz b/icu4c-61_1-src.tgz new file mode 100644 index 0000000..c25759f --- /dev/null +++ b/icu4c-61_1-src.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef +size 23400587