Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[icu] update to 70.1 #23445

Merged
merged 12 commits into from
Apr 11, 2022
Merged

[icu] update to 70.1 #23445

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
27b6879
[icu] update to 70.1
FrankXie05 Mar 9, 2022
3066b34
update version
FrankXie05 Mar 9, 2022
3b35055
reset patch
FrankXie05 Mar 9, 2022
a662f96
overwrite version
FrankXie05 Mar 9, 2022
1fae216
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/…
FrankXie05 Mar 9, 2022
b6e77f9
Merge branch 'master' into dev/Frank/22914
FrankXie05 Apr 8, 2022
2f22901
reset version
FrankXie05 Apr 8, 2022
25e4a1a
overwrite version
FrankXie05 Apr 8, 2022
cd59d87
Fix configure
Apr 8, 2022
2cc87ab
Merge branch 'dev/Frank/22914' of https://github.com/FrankXie05/vcpkg…
Apr 8, 2022
008b313
version
FrankXie05 Apr 8, 2022
ea19963
update version
FrankXie05 Apr 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ports/icu/disable-escapestr-tool.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
diff --git a/source/tools/Makefile.in b/source/tools/Makefile.in
index c3f81d6..dc41af3 100644
index e0896f1..5ead980 100644
--- a/source/tools/Makefile.in
+++ b/source/tools/Makefile.in
@@ -19,9 +19,9 @@ SUBDIRS = toolutil ctestfw makeconv genrb genbrk \
gencnval gensprep icuinfo genccode gencmn icupkg pkgdata \
gentest gennorm2 gencfu gendict
gentest gennorm2 gencfu gendict icuexportdata

-ifneq (@platform_make_fragment_name@,mh-cygwin-msvc)
-SUBDIRS += escapesrc
Expand Down
4 changes: 2 additions & 2 deletions ports/icu/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
set(ICU_VERSION_MAJOR 69)
set(ICU_VERSION_MAJOR 70)
set(ICU_VERSION_MINOR 1)
set(VERSION "${ICU_VERSION_MAJOR}.${ICU_VERSION_MINOR}")
set(VERSION2 "${ICU_VERSION_MAJOR}_${ICU_VERSION_MINOR}")
Expand All @@ -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 d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7
SHA512 0b26ae7207155cb65a8fdb25f7b2fa4431e74b12bccbed0884a17feaae3c96833d12451064dd152197fd6ea5fd3adfd95594284a463e66c82e0d860f645880c9
)
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
Expand Down
3 changes: 1 addition & 2 deletions ports/icu/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "icu",
"version": "69.1",
"port-version": 18,
"version": "70.1",
"description": "Mature and widely used Unicode and localization library.",
"homepage": "https://icu.unicode.org/home",
"supports": "!uwp",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2761,8 +2761,8 @@
"port-version": 0
},
"icu": {
"baseline": "69.1",
"port-version": 18
"baseline": "70.1",
"port-version": 0
},
"ideviceinstaller": {
"baseline": "1.1.2.23",
Expand Down
5 changes: 5 additions & 0 deletions versions/i-/icu.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "61cd63ec740b0a7e4de70baa4a343661ade3dbec",
"version": "70.1",
"port-version": 0
},
{
"git-tree": "789755812260e6c4759e305d1591938513023c07",
"version": "69.1",
Expand Down