icu: updated to 66.1 ICU 66 It updates to Unicode 13 & CLDR 36.1. New, extra Q1 releases for low-risk integration of Unicode 13. ICU 65 It updates to CLDR 36 locale data with many additions and corrections, and some new measurement units. The Java LocaleMatcher API is improved, and ported to C++. For building ICU data, there are new filtering options, and new tracing support for data loading in ICU4C.diff -r1.129 -r1.130 pkgsrc/textproc/icu/Makefile
(adam)
@@ -1,30 +1,31 @@ | @@ -1,30 +1,31 @@ | |||
1 | # $NetBSD: Makefile,v 1.129 2020/03/18 00:26:28 rillig Exp $ | 1 | # $NetBSD: Makefile,v 1.130 2020/04/12 07:06:43 adam Exp $ | |
2 | 2 | |||
3 | DISTNAME= icu4c-64_2-src | 3 | DISTNAME= icu4c-66_1-src | |
4 | PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g} | 4 | PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g} | |
5 | PKGREVISION= 2 | |||
6 | CATEGORIES= textproc | 5 | CATEGORIES= textproc | |
7 | MASTER_SITES= http://download.icu-project.org/files/icu4c/${PKGVERSION_NOREV}/ | 6 | MASTER_SITES= ${MASTER_SITE_GITHUB:=unicode-org/} | |
8 | EXTRACT_SUFX= .tgz | 7 | EXTRACT_SUFX= .tgz | |
8 | GITHUB_PROJECT= icu | |||
9 | GITHUB_RELEASE= release-66-1 | |||
9 | 10 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 11 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= http://www.icu-project.org/ | 12 | HOMEPAGE= http://site.icu-project.org/ | |
12 | COMMENT= Robust and full-featured Unicode services | 13 | COMMENT= Robust and full-featured Unicode services | |
13 | LICENSE= mit | 14 | LICENSE= mit | |
14 | 15 | |||
15 | WRKSRC= ${WRKDIR}/icu/source | 16 | WRKSRC= ${WRKDIR}/icu/source | |
16 | USE_LANGUAGES= c99 c++ | 17 | USE_LANGUAGES= c99 c++ | |
17 | USE_TOOLS+= gmake | 18 | USE_TOOLS+= gmake pkg-config | |
18 | GCC_REQD+= 4.8 | 19 | GCC_REQD+= 4.8 | |
19 | TEST_TARGET= check | 20 | TEST_TARGET= check | |
20 | UNLIMIT_RESOURCES+= datasize | 21 | UNLIMIT_RESOURCES+= datasize | |
21 | GNU_CONFIGURE= yes | 22 | GNU_CONFIGURE= yes | |
22 | CONFIGURE_ARGS+= --enable-static | 23 | CONFIGURE_ARGS+= --enable-static | |
23 | CONFIGURE_ENV+= U_MAKE=${TOOLS_GMAKE} | 24 | CONFIGURE_ENV+= U_MAKE=${TOOLS_GMAKE} | |
24 | 25 | |||
25 | CHECK_SSP_SKIP= lib/libicudata.so* | 26 | CHECK_SSP_SKIP= lib/libicudata.so* | |
26 | 27 | |||
27 | PYTHON_FOR_BUILD_ONLY= tool | 28 | PYTHON_FOR_BUILD_ONLY= tool | |
28 | 29 | |||
29 | .include "../../mk/pthread.buildlink3.mk" | 30 | .include "../../mk/pthread.buildlink3.mk" | |
30 | 31 |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.45 2019/04/03 00:12:59 ryoon Exp $ | 1 | @comment $NetBSD: PLIST,v 1.46 2020/04/12 07:06:43 adam Exp $ | |
2 | bin/derb | 2 | bin/derb | |
3 | bin/genbrk | 3 | bin/genbrk | |
4 | bin/gencfu | 4 | bin/gencfu | |
5 | bin/gencnval | 5 | bin/gencnval | |
6 | bin/gendict | 6 | bin/gendict | |
7 | bin/genrb | 7 | bin/genrb | |
8 | bin/icu-config | 8 | bin/icu-config | |
9 | bin/icuinfo | 9 | bin/icuinfo | |
10 | bin/makeconv | 10 | bin/makeconv | |
11 | bin/pkgdata | 11 | bin/pkgdata | |
12 | bin/uconv | 12 | bin/uconv | |
13 | include/unicode/alphaindex.h | 13 | include/unicode/alphaindex.h | |
14 | include/unicode/appendable.h | 14 | include/unicode/appendable.h | |
@@ -46,26 +46,27 @@ include/unicode/errorcode.h | @@ -46,26 +46,27 @@ include/unicode/errorcode.h | |||
46 | include/unicode/fieldpos.h | 46 | include/unicode/fieldpos.h | |
47 | include/unicode/filteredbrk.h | 47 | include/unicode/filteredbrk.h | |
48 | include/unicode/fmtable.h | 48 | include/unicode/fmtable.h | |
49 | include/unicode/format.h | 49 | include/unicode/format.h | |
50 | include/unicode/formattedvalue.h | 50 | include/unicode/formattedvalue.h | |
51 | include/unicode/fpositer.h | 51 | include/unicode/fpositer.h | |
52 | include/unicode/gender.h | 52 | include/unicode/gender.h | |
53 | include/unicode/gregocal.h | 53 | include/unicode/gregocal.h | |
54 | include/unicode/icudataver.h | 54 | include/unicode/icudataver.h | |
55 | include/unicode/icuplug.h | 55 | include/unicode/icuplug.h | |
56 | include/unicode/idna.h | 56 | include/unicode/idna.h | |
57 | include/unicode/listformatter.h | 57 | include/unicode/listformatter.h | |
58 | include/unicode/localebuilder.h | 58 | include/unicode/localebuilder.h | |
59 | include/unicode/localematcher.h | |||
59 | include/unicode/localpointer.h | 60 | include/unicode/localpointer.h | |
60 | include/unicode/locdspnm.h | 61 | include/unicode/locdspnm.h | |
61 | include/unicode/locid.h | 62 | include/unicode/locid.h | |
62 | include/unicode/measfmt.h | 63 | include/unicode/measfmt.h | |
63 | include/unicode/measunit.h | 64 | include/unicode/measunit.h | |
64 | include/unicode/measure.h | 65 | include/unicode/measure.h | |
65 | include/unicode/messagepattern.h | 66 | include/unicode/messagepattern.h | |
66 | include/unicode/msgfmt.h | 67 | include/unicode/msgfmt.h | |
67 | include/unicode/normalizer2.h | 68 | include/unicode/normalizer2.h | |
68 | include/unicode/normlzr.h | 69 | include/unicode/normlzr.h | |
69 | include/unicode/nounit.h | 70 | include/unicode/nounit.h | |
70 | include/unicode/numberformatter.h | 71 | include/unicode/numberformatter.h | |
71 | include/unicode/numberrangeformatter.h | 72 | include/unicode/numberrangeformatter.h | |
@@ -194,47 +195,47 @@ include/unicode/utrace.h | @@ -194,47 +195,47 @@ include/unicode/utrace.h | |||
194 | include/unicode/utrans.h | 195 | include/unicode/utrans.h | |
195 | include/unicode/utypes.h | 196 | include/unicode/utypes.h | |
196 | include/unicode/uvernum.h | 197 | include/unicode/uvernum.h | |
197 | include/unicode/uversion.h | 198 | include/unicode/uversion.h | |
198 | include/unicode/vtzone.h | 199 | include/unicode/vtzone.h | |
199 | lib/icu/${PKGVERSION}/Makefile.inc | 200 | lib/icu/${PKGVERSION}/Makefile.inc | |
200 | lib/icu/${PKGVERSION}/pkgdata.inc | 201 | lib/icu/${PKGVERSION}/pkgdata.inc | |
201 | lib/icu/Makefile.inc | 202 | lib/icu/Makefile.inc | |
202 | lib/icu/current | 203 | lib/icu/current | |
203 | lib/icu/pkgdata.inc | 204 | lib/icu/pkgdata.inc | |
204 | lib/libicudata.a | 205 | lib/libicudata.a | |
205 | lib/libicudata.so | 206 | lib/libicudata.so | |
206 | lib/libicudata.so.${PKGVERSION} | 207 | lib/libicudata.so.${PKGVERSION} | |
207 | lib/libicudata.so.64 | 208 | lib/libicudata.so.66 | |
208 | lib/libicui18n.a | 209 | lib/libicui18n.a | |
209 | lib/libicui18n.so | 210 | lib/libicui18n.so | |
210 | lib/libicui18n.so.${PKGVERSION} | 211 | lib/libicui18n.so.${PKGVERSION} | |
211 | lib/libicui18n.so.64 | 212 | lib/libicui18n.so.66 | |
212 | lib/libicuio.a | 213 | lib/libicuio.a | |
213 | lib/libicuio.so | 214 | lib/libicuio.so | |
214 | lib/libicuio.so.${PKGVERSION} | 215 | lib/libicuio.so.${PKGVERSION} | |
215 | lib/libicuio.so.64 | 216 | lib/libicuio.so.66 | |
216 | lib/libicutest.a | 217 | lib/libicutest.a | |
217 | lib/libicutest.so | 218 | lib/libicutest.so | |
218 | lib/libicutest.so.${PKGVERSION} | 219 | lib/libicutest.so.${PKGVERSION} | |
219 | lib/libicutest.so.64 | 220 | lib/libicutest.so.66 | |
220 | lib/libicutu.a | 221 | lib/libicutu.a | |
221 | lib/libicutu.so | 222 | lib/libicutu.so | |
222 | lib/libicutu.so.${PKGVERSION} | 223 | lib/libicutu.so.${PKGVERSION} | |
223 | lib/libicutu.so.64 | 224 | lib/libicutu.so.66 | |
224 | lib/libicuuc.a | 225 | lib/libicuuc.a | |
225 | lib/libicuuc.so | 226 | lib/libicuuc.so | |
226 | lib/libicuuc.so.${PKGVERSION} | 227 | lib/libicuuc.so.${PKGVERSION} | |
227 | lib/libicuuc.so.64 | 228 | lib/libicuuc.so.66 | |
228 | lib/pkgconfig/icu-i18n.pc | 229 | lib/pkgconfig/icu-i18n.pc | |
229 | lib/pkgconfig/icu-io.pc | 230 | lib/pkgconfig/icu-io.pc | |
230 | lib/pkgconfig/icu-uc.pc | 231 | lib/pkgconfig/icu-uc.pc | |
231 | man/man1/derb.1 | 232 | man/man1/derb.1 | |
232 | man/man1/genbrk.1 | 233 | man/man1/genbrk.1 | |
233 | man/man1/gencfu.1 | 234 | man/man1/gencfu.1 | |
234 | man/man1/gencnval.1 | 235 | man/man1/gencnval.1 | |
235 | man/man1/gendict.1 | 236 | man/man1/gendict.1 | |
236 | man/man1/genrb.1 | 237 | man/man1/genrb.1 | |
237 | man/man1/icu-config.1 | 238 | man/man1/icu-config.1 | |
238 | man/man1/makeconv.1 | 239 | man/man1/makeconv.1 | |
239 | man/man1/pkgdata.1 | 240 | man/man1/pkgdata.1 | |
240 | man/man1/uconv.1 | 241 | man/man1/uconv.1 |
@@ -1,23 +1,23 @@ | @@ -1,23 +1,23 @@ | |||
1 | $NetBSD: distinfo,v 1.87 2019/07/24 17:02:06 rin Exp $ | 1 | $NetBSD: distinfo,v 1.88 2020/04/12 07:06:43 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (icu4c-64_2-src.tgz) = 3127155ecf2b75ab4835f501b7478e39c07bb852 | 3 | SHA1 (icu4c-66_1-src.tgz) = 68e87ea2044e92a5d86be6072b0eb3557f252d9f | |
4 | RMD160 (icu4c-64_2-src.tgz) = 23e00d87c106aa079c48701c0b8a823ef2c79202 | 4 | RMD160 (icu4c-66_1-src.tgz) = 1bd67bd30b161681a5040244e58c4d87bbdce6ce | |
5 | SHA512 (icu4c-64_2-src.tgz) = 5ecb4c230ba45918747a1cf9aef86f555aa07d5b29b1d07ab674e8013f46dfb907a0e9d6945db41155f9dc3012fd94e1152ffc19f61a68b6dfcbabdcb8ae9d78 | 5 | SHA512 (icu4c-66_1-src.tgz) = 78d87bce65a7bdf7e9a19bda13e353c60846816ff34025f829d1ff15f9ac49aa6061eb192173742be0eca105684ce0e39e95656147afe848520bf60274c8d246 | |
6 | Size (icu4c-64_2-src.tgz) = 24013250 bytes | 6 | Size (icu4c-66_1-src.tgz) = 24361305 bytes | |
7 | SHA1 (patch-Makefile.in) = 67440d3af9b62b8c0be258c490255ba17f778ab4 | 7 | SHA1 (patch-Makefile.in) = 67440d3af9b62b8c0be258c490255ba17f778ab4 | |
8 | SHA1 (patch-acinclude.m4) = f7de1a16aad0ca77c4bbc457ba76b6171199ce09 | 8 | SHA1 (patch-acinclude.m4) = f7de1a16aad0ca77c4bbc457ba76b6171199ce09 | |
9 | SHA1 (patch-common_putil.cpp) = 6aa70b8698d663d3c798bafd9010a824c9609c20 | 9 | SHA1 (patch-common_putil.cpp) = 6aa70b8698d663d3c798bafd9010a824c9609c20 | |
10 | SHA1 (patch-common_putilimp.h) = a68faa97c2bffeecaca1586e26f5bbe48e71b262 | 10 | SHA1 (patch-common_putilimp.h) = 0924d38a780b626fea78754aa2da6cf3ca19b9b7 | |
11 | SHA1 (patch-common_ubidiimp.h) = 99fbd68d5a05303696cb5cccb71045b470827369 | 11 | SHA1 (patch-common_ubidiimp.h) = 99fbd68d5a05303696cb5cccb71045b470827369 | |
12 | SHA1 (patch-common_umutex.h) = b22b7c02b4645a87f71d54885d858d0cf9005988 | 12 | SHA1 (patch-common_umutex.h) = b22b7c02b4645a87f71d54885d858d0cf9005988 | |
13 | SHA1 (patch-common_unicode_platform.h) = 8b7b8bcf6f5185225a1ca516ac212a495f7b47e8 | 13 | SHA1 (patch-common_unicode_platform.h) = 8b7b8bcf6f5185225a1ca516ac212a495f7b47e8 | |
14 | SHA1 (patch-common_uposixdefs.h) = 4739ca7d4662335adcb322cd0943770651d548ce | 14 | SHA1 (patch-common_uposixdefs.h) = 4739ca7d4662335adcb322cd0943770651d548ce | |
15 | SHA1 (patch-config_Makefile.inc.in) = e7cee161315321d2580074054d87714b55319886 | 15 | SHA1 (patch-config_Makefile.inc.in) = e7cee161315321d2580074054d87714b55319886 | |
16 | SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501 | 16 | SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501 | |
17 | SHA1 (patch-config_mh-darwin) = 4fd2c664b23078692b61557ebb66693712d333cd | 17 | SHA1 (patch-config_mh-darwin) = 4fd2c664b23078692b61557ebb66693712d333cd | |
18 | SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472 | 18 | SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472 | |
19 | SHA1 (patch-configure) = 1f96ffb2c2c023b38a45326c0273be0ae9cc02ff | 19 | SHA1 (patch-configure) = 1f96ffb2c2c023b38a45326c0273be0ae9cc02ff | |
20 | SHA1 (patch-configure.ac) = 2cb4601e20ee6b93e08e8790df3f8212510aeb1b | 20 | SHA1 (patch-configure.ac) = 2cb4601e20ee6b93e08e8790df3f8212510aeb1b | |
21 | SHA1 (patch-i18n_double-conversion-utils.h) = 132e9878f0bd9d53f7a2c060529fd70b6040f2bb | 21 | SHA1 (patch-i18n_double-conversion-utils.h) = 132e9878f0bd9d53f7a2c060529fd70b6040f2bb | |
22 | SHA1 (patch-icudefs.mk.in) = c2a9469bf896b5f0702d5795c3b1c2b394893663 | 22 | SHA1 (patch-icudefs.mk.in) = c2a9469bf896b5f0702d5795c3b1c2b394893663 | |
23 | SHA1 (patch-runConfigureICU) = 3cd60613104fa4f1b81529795e75d5cf7f477b64 | 23 | SHA1 (patch-runConfigureICU) = 3cd60613104fa4f1b81529795e75d5cf7f477b64 |
@@ -1,24 +1,15 @@ | @@ -1,24 +1,15 @@ | |||
1 | $NetBSD: patch-common_putilimp.h,v 1.4 2013/11/05 15:25:37 ryoon Exp $ | 1 | $NetBSD: patch-common_putilimp.h,v 1.5 2020/04/12 07:06:43 adam Exp $ | |
2 | 2 | |||
3 | * GCC for arm does not have __sync_add_and_fetch() etc. | 3 | MirBSD support. | |
4 | 4 | |||
5 | --- common/putilimp.h.orig 2013-10-04 20:49:30.000000000 +0000 | 5 | --- common/putilimp.h.orig 2020-03-11 18:16:11.000000000 +0000 | |
6 | +++ common/putilimp.h | 6 | +++ common/putilimp.h | |
7 | @@ -128,6 +128,8 @@ typedef size_t uintptr_t; | 7 | @@ -128,6 +128,8 @@ typedef size_t uintptr_t; | |
8 | /* not defined */ | 8 | /* not defined */ | |
9 | #elif U_PLATFORM == U_PF_IPHONE | 9 | #elif U_PLATFORM == U_PF_IPHONE | |
10 | /* not defined */ | 10 | /* not defined */ | |
11 | +#elif defined(__MirBSD__) | 11 | +#elif defined(__MirBSD__) | |
12 | + /* not defined */ | 12 | + /* not defined */ | |
13 | #else | 13 | #else | |
14 | # define U_TIMEZONE timezone | 14 | # define U_TIMEZONE timezone | |
15 | #endif | 15 | #endif | |
16 | @@ -187,7 +189,7 @@ typedef size_t uintptr_t; | |||
17 | /* Use the predefined value. */ | |||
18 | #elif U_PLATFORM == U_PF_MINGW | |||
19 | #define U_HAVE_GCC_ATOMICS 0 | |||
20 | -#elif U_GCC_MAJOR_MINOR >= 404 || defined(__clang__) | |||
21 | +#elif (U_GCC_MAJOR_MINOR >= 404 && !defined(__arm__)) || defined(__clang__) | |||
22 | /* TODO: Intel icc and IBM xlc on AIX also support gcc atomics. (Intel originated them.) | |||
23 | * Add them for these compilers. | |||
24 | * Note: Clang sets __GNUC__ defines for version 4.2, so misses the 4.4 test here. |