Skip to content

Commit

Permalink
deps: update icu to 74.2
Browse files Browse the repository at this point in the history
Refs: https://github.com/unicode-org/icu/releases/tag/release-74-2
PR-URL: #51723
Backport-PR-URL: #51973
Refs: #51721
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Yagiz Nizipli <yagiz.nizipli@sentry.io>
Reviewed-By: LiviaMedeiros <livia@cirno.name>
Reviewed-By: Steven R Loomis <srl295@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Refs: #51933
  • Loading branch information
targos authored and richardlau committed Mar 18, 2024
1 parent 3184bef commit f9b229e
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions deps/icu-small/source/common/unicode/uvernum.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.6
*/
#define U_ICU_VERSION_MINOR_NUM 1
#define U_ICU_VERSION_MINOR_NUM 2

/** The current ICU patchlevel version as an integer.
* This value will change in the subsequent releases of ICU
Expand Down Expand Up @@ -132,7 +132,7 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.4
*/
#define U_ICU_VERSION "74.1"
#define U_ICU_VERSION "74.2"

/**
* The current ICU library major version number as a string, for library name suffixes.
Expand All @@ -151,7 +151,7 @@
/** Data version in ICU4C.
* @internal ICU 4.4 Internal Use Only
**/
#define U_ICU_DATA_VERSION "74.1"
#define U_ICU_DATA_VERSION "74.2"
#endif /* U_HIDE_INTERNAL_API */

/*===========================================================================
Expand Down
Binary file modified deps/icu-small/source/data/in/icudt74l.dat.bz2
Binary file not shown.
4 changes: 2 additions & 2 deletions deps/icu-small/source/i18n/dtptngen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1023,7 +1023,7 @@ struct DateTimePatternGenerator::AvailableFormatsSink : public ResourceSink {
AvailableFormatsSink(DateTimePatternGenerator& _dtpg) : dtpg(_dtpg) {}
virtual ~AvailableFormatsSink();

virtual void put(const char *key, ResourceValue &value, UBool isRoot,
virtual void put(const char *key, ResourceValue &value, UBool /*isRoot*/,
UErrorCode &errorCode) override {
const UnicodeString formatKey(key, -1, US_INV);
if (!dtpg.isAvailableFormatSet(formatKey) ) {
Expand All @@ -1032,7 +1032,7 @@ struct DateTimePatternGenerator::AvailableFormatsSink : public ResourceSink {
// derived from std patterns, but not a previous availableFormats entry:
const UnicodeString& formatValue = value.getUnicodeString(errorCode);
conflictingPattern.remove();
dtpg.addPatternWithSkeleton(formatValue, &formatKey, !isRoot, conflictingPattern, errorCode);
dtpg.addPatternWithSkeleton(formatValue, &formatKey, true, conflictingPattern, errorCode);
}
}
};
Expand Down
12 changes: 6 additions & 6 deletions test/parallel/test-icu-env.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,19 +123,19 @@ if (isMockable) {
locales.map((LANG) => runEnvOutside({ LANG, TZ: 'Europe/Zurich' }, 'new Date(333333333333).toLocaleString()')),
[
'7/25/1980, 1:35:33 AM',
'1980/7/25 1:35:33',
'1980/7/25 01:35:33',
'25/7/1980, 1:35:33 am',
'25/7/1980, 1:35:33',
'25/07/1980 1:35:33',
'25/07/1980 01:35:33',
'٢٥‏/٧‏/١٩٨٠، ١:٣٥:٣٣ ص',
'২৫/৭/১৯৮০, ১:৩৫:৩৩ AM',
'25.07.1980, 1:35:33',
'25/07/1980, 1:35:33',
'25.07.1980, 01:35:33',
'25/07/1980, 01:35:33',
'25/7/1980، 1:35:33 AM',
'25/7/1980, 01.35.33',
'25.7.1980, 1:35:33',
'25.7.1980, 01:35:33',
'1980/7/25 1:35:33',
'25/7/1980 1:35:33',
'25/7/1980 01:35:33',
'२५/७/१९८०, १:३५:३३ AM',
'25/7/1980 1:35:33 AM',
]
Expand Down
4 changes: 2 additions & 2 deletions tools/icu/current_ver.dep
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[
{
"url": "https://github.com/unicode-org/icu/releases/download/release-74-1/icu4c-74_1-src.tgz",
"md5": "71e60b22697c4f35820a1897417dbab4"
"url": "https://github.com/unicode-org/icu/releases/download/release-74-2/icu4c-74_2-src.tgz",
"md5": "94c0b370f43123ea92b146ebea9c709d"
}
]

0 comments on commit f9b229e

Please sign in to comment.