From 1bfa838469f2d5f4df37b4be0f19e23e36c32f66 Mon Sep 17 00:00:00 2001 From: Mengna-Li <543250287@qq.com> Date: Thu, 27 Apr 2023 08:39:00 +0000 Subject: [PATCH 1/3] update to 73.1 --- ports/icu/portfile.cmake | 5 ++--- ports/icu/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/i-/icu.json | 5 +++++ 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index 87c757ef720d55..449d272206bd7d 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} string(REGEX MATCH "^[0-9]*" ICU_VERSION_MAJOR "${VERSION}") string(REPLACE "." "_" VERSION2 "${VERSION}") string(REPLACE "." "-" VERSION3 "${VERSION}") @@ -7,7 +6,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 848c341b37c0ff077e34a95d92c6200d5aaddd0ee5e06134101a74e04deb08256a5e817c8aefab020986abe810b7827dd7b2169a60dacd250c298870518dcae8 + SHA512 e788e372716eecebc39b56bbc88f3a458e21c3ef20631c2a3d7ef05794a678fe8dad482a03a40fdb9717109a613978c7146682e98ee16fade5668d641d5c48f8 ) vcpkg_extract_source_archive(SOURCE_PATH @@ -200,4 +199,4 @@ vcpkg_fixup_pkgconfig() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/icu/bin/icu-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json index 8e3696afb46d99..88a574b25a5f92 100644 --- a/ports/icu/vcpkg.json +++ b/ports/icu/vcpkg.json @@ -1,7 +1,6 @@ { "name": "icu", - "version": "72.1", - "port-version": 4, + "version": "73.1", "description": "Mature and widely used Unicode and localization library.", "homepage": "https://icu.unicode.org/home", "license": "ICU", diff --git a/versions/baseline.json b/versions/baseline.json index 2f6c86740d8e30..c2acb074e68d77 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3145,8 +3145,8 @@ "port-version": 0 }, "icu": { - "baseline": "72.1", - "port-version": 4 + "baseline": "73.1", + "port-version": 0 }, "ideviceinstaller": { "baseline": "1.1.2.23", diff --git a/versions/i-/icu.json b/versions/i-/icu.json index fbd2ecbdcb183a..267029639a8ba4 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6d375b9e2843669c58d66d9d28dc680dddb2e260", + "version": "73.1", + "port-version": 0 + }, { "git-tree": "1a0b575f86d37844108f940fd5f6a312a68d234c", "version": "72.1", From 0d66bbae59491bdf139c84df89ae3a6c81880040 Mon Sep 17 00:00:00 2001 From: Mengna-Li <543250287@qq.com> Date: Thu, 27 Apr 2023 10:00:06 +0000 Subject: [PATCH 2/3] add arm-android to ci.baseline --- scripts/ci.baseline.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index db07c3fa91c547..bd43011b81f517 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -554,6 +554,7 @@ hwloc:arm-neon-android=fail hwloc:arm64-android=fail hwloc:x64-android=fail hyperscan:x64-android=fail +icu:arm64-android=fail idevicerestore:x64-linux=fail idevicerestore:x64-osx=fail ignition-common1:x64-linux=fail From f9da5b3fdfea1452843282638f4a887a32002fc2 Mon Sep 17 00:00:00 2001 From: Mengna-Li <543250287@qq.com> Date: Tue, 20 Jun 2023 02:33:09 +0000 Subject: [PATCH 3/3] remove ci.baseline fail --- scripts/ci.baseline.txt | 1 - versions/i-/icu.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 93d5852d8fe01e..aa3f2df280fc8e 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -576,7 +576,6 @@ hwloc:arm-neon-android=fail hwloc:arm64-android=fail hwloc:x64-android=fail hyperscan:x64-android=fail -icu:arm64-android=fail idevicerestore:x64-linux=fail idevicerestore:x64-osx=fail ignition-common1:x64-linux=fail diff --git a/versions/i-/icu.json b/versions/i-/icu.json index fd3b5bc6f883e6..7cd3b924823572 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "6d375b9e2843669c58d66d9d28dc680dddb2e260", + "git-tree": "acc3cf9137af5fc8fdd3e8607377026cf88f144d", "version": "73.1", "port-version": 0 },