Skip to content

icu: update from 77.1 to 78.1 #2546

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

Open
bgilbert wants to merge 1 commit into
base: master
Choose a base branch
from
Open

icu: update from 77.1 to 78.1 #2546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions releases.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1601,6 +1601,7 @@
"gencmn"
],
"versions": [
"78.1-1",
"77.1-3",
"77.1-2",
"77.1-1",
Expand Down
6 changes: 3 additions & 3 deletions subprojects/icu.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[wrap-file]
directory = icu
source_url = https://github.com/unicode-org/icu/releases/download/release-77-1/icu4c-77_1-src.tgz
source_filename = icu4c-77_1-src.tgz
source_hash = 588e431f77327c39031ffbb8843c0e3bc122c211374485fa87dc5f3faff24061
source_url = https://github.com/unicode-org/icu/releases/download/release-78.1/icu4c-78.1-sources.tgz
source_filename = icu4c-78.1-sources.tgz
source_hash = 6217f58ca39b23127605cfc6c7e0d3475fe4b0d63157011383d716cb41617886
patch_directory = icu

[provide]
Expand Down
6 changes: 3 additions & 3 deletions subprojects/packagefiles/icu/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
'icu',
'c',
'cpp',
version: '77.1',
version: '78.1',
license: 'BSD-2-Clause AND BSD-3-Clause AND ICU AND NAIST-2003 AND Unicode-3.0',
meson_version: '>=0.57.0',

Check warning on line 7 in subprojects/packagefiles/icu/meson.build

View workflow job for this annotation

GitHub Actions / Ubuntu (x86_64)

Minimum Meson version is 0.63.0 

0.56.0: oldest version supported by WrapDB
0.57.0: fs.read
0.63.0: cpp_std in subproject default_options
default_options: 'cpp_std=c++17',
)

Expand Down Expand Up @@ -37,7 +37,7 @@
)
add_project_arguments(
'-DWINVER=0x0601',
'-D_WIN32_WINNT=0x0601' ,
'-D_WIN32_WINNT=0x0601',
language: 'cpp',
)
add_project_arguments(
Expand All @@ -56,7 +56,7 @@
)
add_project_arguments(
'-DWINVER=0x0601',
'-D_WIN32_WINNT=0x0601' ,
'-D_WIN32_WINNT=0x0601',
language: 'c',
)
endif
Expand Down
5 changes: 1 addition & 4 deletions subprojects/packagefiles/icu/source/common/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,7 @@ icuuc_native_dep = declare_dependency(
include_directories: incdir,
dependencies: dl_native_dep,
)

if meson.version().version_compare('>=0.54.0')
meson.override_dependency('icu-uc', icuuc_dep)
endif
meson.override_dependency('icu-uc', icuuc_dep)

headers = files(
'unicode/appendable.h',
Expand Down
5 changes: 1 addition & 4 deletions subprojects/packagefiles/icu/source/data/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,5 @@ if cpp.get_argument_syntax() != 'msvc'
include_directories: incdir,
compile_args: usage_args,
)

if meson.version().version_compare('>=0.54.0')
meson.override_dependency('icu-data', icudata_dep)
endif
meson.override_dependency('icu-data', icudata_dep)
endif
5 changes: 1 addition & 4 deletions subprojects/packagefiles/icu/source/i18n/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,7 @@ icui18n_native_dep = declare_dependency(
link_with: i18n_native_lib,
dependencies: icuuc_native_dep,
)

if meson.version().version_compare('>=0.54.0')
meson.override_dependency('icu-i18n', icui18n_dep)
endif
meson.override_dependency('icu-i18n', icui18n_dep)

headers = files(
'unicode/alphaindex.h',
Expand Down
5 changes: 1 addition & 4 deletions subprojects/packagefiles/icu/source/io/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@ icuio_dep = declare_dependency(
link_with: io_lib,
dependencies: icui18n_dep,
)

if meson.version().version_compare('>=0.54.0')
meson.override_dependency('icu-io', icuio_dep)
endif
meson.override_dependency('icu-io', icuio_dep)

pkg.generate(
io_lib,
Expand Down
5 changes: 1 addition & 4 deletions subprojects/packagefiles/icu/source/layoutex/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@ layoutex_dep = declare_dependency(
link_with: layoutex_lib,
dependencies: icuuc_dep,
)

if meson.version().version_compare('>=0.54.0')
meson.override_dependency('icu-lx', layoutex_lib)
endif
meson.override_dependency('icu-lx', layoutex_lib)

pkg.generate(
layoutex_lib,
Expand Down
1 change: 0 additions & 1 deletion tools/versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ def get_upstream_versions() -> dict[str, str]:
def sub(name: str, old: str, new: str) -> None:
if name in versions:
versions[name] = re.sub(old, new, versions[name])
sub('icu', '-', '.')
sub('inih', '^', 'r')
sub('mt32emu', '_', '.')
sub('re2', '-', '')
Expand Down
Loading