From 39f656f2358936bde7fa402845d74ec2cba32984 Mon Sep 17 00:00:00 2001 From: ryoon Date: Fri, 20 Jul 2018 03:32:09 +0000 Subject: [PATCH] Update to 62.1 Changelog: Common Changes 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: Unicode 11 script metadata, collation, Chinese transliteration. Chinese collation stroke order updated from Unicode 7 to Unicode 11 after tooling bug fixes. NumberFormatter A NumberFormatter can now be constructed from a locale-neutral skeleton string (like a DateFormat) (#8610). This is particularly useful in translated messages where placeholder details should not be translated. MessageFormat recognizes the style field as a number skeleton if it is prefixed with "::", as in "Number of files: {num, number, :: round-integer group-min2}." (#13742) New "conversion" functions for getting a NumberFormatter from a DecimalFormat, and a Format from a NumberFormatter. New C API (unicode/unumberformatter.h [permanent API docs link TBD]). (#13597) Currently it supports formatting settings only via a skeleton string. Several still-draft NumberFormatter methods and helper classes have been modified or renamed; the previous versions remain temporarily (as deprecated) for one release, to help with the transition. Break Iterator Rules: "Safe" rules are no longer required for correct break iterator operation. For back compatibility, existing rule sets containing safe rules will continue to work, with the safe rules they contain being ignored. The Break Iterator binary data format has been updated to reflect this change. Line Break: The boundary rules have been updated to reflect the Unicode 11 version of UAX #14. Specifically, the handling of Emoji ZWJ sequences has been improved. ICU4C Specific Changes Under-the-hood overhaul of number parsing. See the design doc for a summary of changes; behavior is mostly compatible with previous versions, but there are some known differences. DecimalFormat now wraps the new NumberFormatter code. --- textproc/icu/Makefile | 4 ++-- textproc/icu/PLIST | 15 ++++++++------- textproc/icu/buildlink3.mk | 4 ++-- textproc/icu/distinfo | 12 ++++++------ .../patches/patch-i18n_double-conversion-utils.h | 10 +++++----- 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile index d6be302ae281..b8c9738f12f6 100644 --- a/textproc/icu/Makefile +++ b/textproc/icu/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.115 2018/04/14 07:05:08 adam Exp $ +# $NetBSD: Makefile,v 1.116 2018/07/20 03:32:09 ryoon Exp $ -DISTNAME= icu4c-61_1-src +DISTNAME= icu4c-62_1-src PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g} CATEGORIES= textproc MASTER_SITES= http://download.icu-project.org/files/icu4c/${PKGVERSION_NOREV}/ diff --git a/textproc/icu/PLIST b/textproc/icu/PLIST index c6aa4022328c..a44ca3910a98 100644 --- a/textproc/icu/PLIST +++ b/textproc/icu/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.42 2018/04/14 07:05:08 adam Exp $ +@comment $NetBSD: PLIST,v 1.43 2018/07/20 03:32:09 ryoon Exp $ bin/derb bin/genbrk bin/gencfu @@ -155,6 +155,7 @@ include/unicode/unistr.h include/unicode/unorm.h include/unicode/unorm2.h include/unicode/unum.h +include/unicode/unumberformatter.h include/unicode/unumsys.h include/unicode/uobject.h include/unicode/upluralrules.h @@ -196,27 +197,27 @@ lib/icu/pkgdata.inc lib/libicudata.a lib/libicudata.so lib/libicudata.so.${PKGVERSION} -lib/libicudata.so.61 +lib/libicudata.so.62 lib/libicui18n.a lib/libicui18n.so lib/libicui18n.so.${PKGVERSION} -lib/libicui18n.so.61 +lib/libicui18n.so.62 lib/libicuio.a lib/libicuio.so lib/libicuio.so.${PKGVERSION} -lib/libicuio.so.61 +lib/libicuio.so.62 lib/libicutest.a lib/libicutest.so lib/libicutest.so.${PKGVERSION} -lib/libicutest.so.61 +lib/libicutest.so.62 lib/libicutu.a lib/libicutu.so lib/libicutu.so.${PKGVERSION} -lib/libicutu.so.61 +lib/libicutu.so.62 lib/libicuuc.a lib/libicuuc.so lib/libicuuc.so.${PKGVERSION} -lib/libicuuc.so.61 +lib/libicuuc.so.62 lib/pkgconfig/icu-i18n.pc lib/pkgconfig/icu-io.pc lib/pkgconfig/icu-uc.pc diff --git a/textproc/icu/buildlink3.mk b/textproc/icu/buildlink3.mk index 49d8030e5574..4fb7afe3aabb 100644 --- a/textproc/icu/buildlink3.mk +++ b/textproc/icu/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.36 2018/04/14 07:05:08 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.37 2018/07/20 03:32:09 ryoon Exp $ BUILDLINK_TREE+= icu @@ -6,7 +6,7 @@ BUILDLINK_TREE+= icu ICU_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.icu+= icu>=3.4 -BUILDLINK_ABI_DEPENDS.icu+= icu>=61.1 +BUILDLINK_ABI_DEPENDS.icu+= icu>=62.1 BUILDLINK_PKGSRCDIR.icu?= ../../textproc/icu .endif # ICU_BUILDLINK3_MK diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo index 79ebfebd5aac..e0ef34356d33 100644 --- a/textproc/icu/distinfo +++ b/textproc/icu/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.76 2018/06/27 19:06:17 maya Exp $ +$NetBSD: distinfo,v 1.77 2018/07/20 03:32:09 ryoon Exp $ -SHA1 (icu4c-61_1-src.tgz) = 06ca7b1e64c28e07d5633a2e0257380884ea486b -RMD160 (icu4c-61_1-src.tgz) = 50560a899c9c55eb033f86fb7fc56a3db28f2b87 -SHA512 (icu4c-61_1-src.tgz) = 4c37691246db802e4bae0c8c5f6ac1dac64c5753b607e539c5c1c36e361fcd9dd81bd1d3b5416c2960153b83700ccdb356412847d0506ab7782ae626ac0ffb94 -Size (icu4c-61_1-src.tgz) = 23400587 bytes +SHA1 (icu4c-62_1-src.tgz) = 1884f26568cd773b984580b4fca422a3e2afe35d +RMD160 (icu4c-62_1-src.tgz) = 12a6a975d211dfc2e5a13220b07b2cf3ec7a6923 +SHA512 (icu4c-62_1-src.tgz) = 8295f2754fb6907e2cc8f515dccca05530963b544e89a2b8e323cd0ddfdbbe0c9eba8b367c1dbc04d7bb906b66b1003fd545ca05298939747c832c9d4431cf2a +Size (icu4c-62_1-src.tgz) = 23468750 bytes SHA1 (patch-Makefile.in) = 67440d3af9b62b8c0be258c490255ba17f778ab4 SHA1 (patch-acinclude.m4) = f7de1a16aad0ca77c4bbc457ba76b6171199ce09 SHA1 (patch-common_putil.cpp) = 6aa70b8698d663d3c798bafd9010a824c9609c20 @@ -18,7 +18,7 @@ SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472 SHA1 (patch-config_mh-solaris-gcc) = e1097930f577917d3583e425d9d2affa1c3dcaf2 SHA1 (patch-configure) = fdeae51f4390779dfd8df8471196e322cbb9ea3d SHA1 (patch-configure.ac) = b0291cf02351cbad9b0c7340baea9eb81cabb158 -SHA1 (patch-i18n_double-conversion-utils.h) = fb8f14bc60d572fa063aa4ed15bd034b43883699 +SHA1 (patch-i18n_double-conversion-utils.h) = 773e93ed9baffa241d5af61bd631d2d7c4a867f8 SHA1 (patch-icudefs.mk.in) = c2a9469bf896b5f0702d5795c3b1c2b394893663 SHA1 (patch-runConfigureICU) = ee780dbe797c7230208f378f73a0bc4d215b1bb2 SHA1 (patch-tools-toolutil-pkg_genc.cpp) = 3cbcf3387d6a39315b26a3e2a2ffb715507e9110 diff --git a/textproc/icu/patches/patch-i18n_double-conversion-utils.h b/textproc/icu/patches/patch-i18n_double-conversion-utils.h index 81acf9cff804..9defd00992e2 100644 --- a/textproc/icu/patches/patch-i18n_double-conversion-utils.h +++ b/textproc/icu/patches/patch-i18n_double-conversion-utils.h @@ -1,16 +1,16 @@ -$NetBSD: patch-i18n_double-conversion-utils.h,v 1.1 2018/06/27 19:06:17 maya Exp $ +$NetBSD: patch-i18n_double-conversion-utils.h,v 1.2 2018/07/20 03:32:09 ryoon Exp $ Big endian is a thing and typically has the same behaviour with regards to float sizes. ---- i18n/double-conversion-utils.h.orig 2018-03-26 13:38:30.000000000 +0000 +--- i18n/double-conversion-utils.h.orig 2018-06-21 09:38:53.000000000 +0000 +++ i18n/double-conversion-utils.h @@ -77,7 +77,7 @@ inline void abort_noreturn() { abort(); // On Linux,x86 89255e-22 != Div_double(89255.0/1e22) - // ICU PATCH: Enable ARM builds for Windows with 'defined(_M_ARM)'. + // ICU PATCH: Enable ARM32 & ARM64 builds for Windows with 'defined(_M_ARM) || defined(_M_ARM64)'. #if defined(_M_X64) || defined(__x86_64__) || \ -- defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || \ -+ defined(__ARMEL__) || defined(__ARMEB__) || defined(__avr32__) || defined(_M_ARM) || \ +- defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ ++ defined(__ARMEL__) || defined(__ARMEB__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ defined(__hppa__) || defined(__ia64__) || \ defined(__mips__) || \ defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \