mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 17:12:47 +08:00
icu 71.1 (#24512)
* [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:
parent
b47a6fa051
commit
2930fd4571
14
ports/icu/check-autoconf-archive.patch
Normal file
14
ports/icu/check-autoconf-archive.patch
Normal 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)
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
set(ICU_VERSION_MAJOR 70)
|
set(ICU_VERSION_MAJOR 71)
|
||||||
set(ICU_VERSION_MINOR 1)
|
set(ICU_VERSION_MINOR 1)
|
||||||
set(VERSION "${ICU_VERSION_MAJOR}.${ICU_VERSION_MINOR}")
|
set(VERSION "${ICU_VERSION_MAJOR}.${ICU_VERSION_MINOR}")
|
||||||
set(VERSION2 "${ICU_VERSION_MAJOR}_${ICU_VERSION_MINOR}")
|
set(VERSION2 "${ICU_VERSION_MAJOR}_${ICU_VERSION_MINOR}")
|
||||||
@ -8,7 +8,7 @@ vcpkg_download_distfile(
|
|||||||
ARCHIVE
|
ARCHIVE
|
||||||
URLS "https://github.com/unicode-org/icu/releases/download/release-${VERSION3}/icu4c-${VERSION2}-src.tgz"
|
URLS "https://github.com/unicode-org/icu/releases/download/release-${VERSION3}/icu4c-${VERSION2}-src.tgz"
|
||||||
FILENAME "icu4c-${VERSION2}-src.tgz"
|
FILENAME "icu4c-${VERSION2}-src.tgz"
|
||||||
SHA512 0b26ae7207155cb65a8fdb25f7b2fa4431e74b12bccbed0884a17feaae3c96833d12451064dd152197fd6ea5fd3adfd95594284a463e66c82e0d860f645880c9
|
SHA512 1fd2a20aef48369d1f06e2bb74584877b8ad0eb529320b976264ec2db87420bae242715795f372dbc513ea80047bc49077a064e78205cd5e8b33d746fd2a2912
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_extract_source_archive_ex(
|
vcpkg_extract_source_archive_ex(
|
||||||
@ -22,6 +22,7 @@ vcpkg_extract_source_archive_ex(
|
|||||||
mingw-dll-install.patch
|
mingw-dll-install.patch
|
||||||
disable-static-prefix.patch # https://gitlab.kitware.com/cmake/cmake/-/issues/16617; also mingw.
|
disable-static-prefix.patch # https://gitlab.kitware.com/cmake/cmake/-/issues/16617; also mingw.
|
||||||
fix-win-build.patch
|
fix-win-build.patch
|
||||||
|
check-autoconf-archive.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_find_acquire_program(PYTHON3)
|
vcpkg_find_acquire_program(PYTHON3)
|
||||||
|
@ -1,8 +1,9 @@
|
|||||||
{
|
{
|
||||||
"name": "icu",
|
"name": "icu",
|
||||||
"version": "70.1",
|
"version": "71.1",
|
||||||
"description": "Mature and widely used Unicode and localization library.",
|
"description": "Mature and widely used Unicode and localization library.",
|
||||||
"homepage": "https://icu.unicode.org/home",
|
"homepage": "https://icu.unicode.org/home",
|
||||||
|
"license": "ICU",
|
||||||
"supports": "!uwp",
|
"supports": "!uwp",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
{
|
{
|
||||||
|
@ -2817,7 +2817,7 @@
|
|||||||
"port-version": 0
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"icu": {
|
"icu": {
|
||||||
"baseline": "70.1",
|
"baseline": "71.1",
|
||||||
"port-version": 0
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"ideviceinstaller": {
|
"ideviceinstaller": {
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "13fe0c9056059654ea7e482cd06ff70c26f9e029",
|
||||||
|
"version": "71.1",
|
||||||
|
"port-version": 0
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "2d082108b0899697c9b6253c260188728374e56b",
|
"git-tree": "2d082108b0899697c9b6253c260188728374e56b",
|
||||||
"version": "70.1",
|
"version": "70.1",
|
||||||
|
Loading…
Reference in New Issue
Block a user