* [icu] Update to upstream version 71.1

* [icu] warn if autoconf-archive is not installed

* [icu] update version database and add license field
This commit is contained in:
Daniel Schürmann 2022-05-05 04:25:20 +02:00 committed by GitHub
parent b47a6fa051
commit 2930fd4571
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 4 deletions

View File

@ -0,0 +1,14 @@
diff --git a/source/configure.ac b/source/configure.ac
index d194c6d..33fcb2f 100644
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -208,6 +208,8 @@ fi
#AC_CHECK_PROG(AUTOCONF, autoconf, autoconf, true)
#AC_CHECK_PROG(STRIP, strip, strip, true)
+m4_ifndef([AX_CHECK_COMPILE_FLAG], [AC_MSG_ERROR(['autoconf-archive' is missing])])
+
# TODO(ICU-20301): Remove fallback to Python 2.
AC_CHECK_PROGS(PYTHON, python3 "py -3" python "py")
AC_SUBST(PYTHON)

View File

@ -1,4 +1,4 @@
set(ICU_VERSION_MAJOR 70)
set(ICU_VERSION_MAJOR 71)
set(ICU_VERSION_MINOR 1)
set(VERSION "${ICU_VERSION_MAJOR}.${ICU_VERSION_MINOR}")
set(VERSION2 "${ICU_VERSION_MAJOR}_${ICU_VERSION_MINOR}")
@ -8,7 +8,7 @@ vcpkg_download_distfile(
ARCHIVE
URLS "https://github.com/unicode-org/icu/releases/download/release-${VERSION3}/icu4c-${VERSION2}-src.tgz"
FILENAME "icu4c-${VERSION2}-src.tgz"
SHA512 0b26ae7207155cb65a8fdb25f7b2fa4431e74b12bccbed0884a17feaae3c96833d12451064dd152197fd6ea5fd3adfd95594284a463e66c82e0d860f645880c9
SHA512 1fd2a20aef48369d1f06e2bb74584877b8ad0eb529320b976264ec2db87420bae242715795f372dbc513ea80047bc49077a064e78205cd5e8b33d746fd2a2912
)
vcpkg_extract_source_archive_ex(
@ -22,6 +22,7 @@ vcpkg_extract_source_archive_ex(
mingw-dll-install.patch
disable-static-prefix.patch # https://gitlab.kitware.com/cmake/cmake/-/issues/16617; also mingw.
fix-win-build.patch
check-autoconf-archive.patch
)
vcpkg_find_acquire_program(PYTHON3)

View File

@ -1,8 +1,9 @@
{
"name": "icu",
"version": "70.1",
"version": "71.1",
"description": "Mature and widely used Unicode and localization library.",
"homepage": "https://icu.unicode.org/home",
"license": "ICU",
"supports": "!uwp",
"dependencies": [
{

View File

@ -2817,7 +2817,7 @@
"port-version": 0
},
"icu": {
"baseline": "70.1",
"baseline": "71.1",
"port-version": 0
},
"ideviceinstaller": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "13fe0c9056059654ea7e482cd06ff70c26f9e029",
"version": "71.1",
"port-version": 0
},
{
"git-tree": "2d082108b0899697c9b6253c260188728374e56b",
"version": "70.1",