godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ICU4C: Update to version 73.2 

(cherry picked from commit 1061912c7f)
This commit is contained in:
bruvzg 2023-07-10 11:37:51 +03:00 committed by Yuri Sizov
parent 346d0bba07
commit c1ba321815
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
thirdparty/README.md vendored
View File

@ -264,7 +264,7 @@ Files extracted from upstream source:
## icu4c ## icu4c
- Upstream: https://github.com/unicode-org/icu - Upstream: https://github.com/unicode-org/icu
- Version: 73.1 (5861e1fd52f1d7673eee38bc3c965aa18b336062, 2023) - Version: 73.2 (680f521746a3bd6a86f25f25ee50a62d88b489cf, 2023)
- License: Unicode - License: Unicode
Files extracted from upstream source: Files extracted from upstream source:
@ -280,10 +280,11 @@ Files generated from upstream source:
https://github.com/unicode-org/icu/blob/master/docs/userguide/icu_data/buildtool.md https://github.com/unicode-org/icu/blob/master/docs/userguide/icu_data/buildtool.md
for instructions). for instructions).
- Step 1: Build ICU with default options - `./runConfigureICU {PLATFORM} && make`. - Step 1: Download and extract both `icu4c-{version}-src.tgz` and `icu4c-{version}-data.zip` (replace `data` subfolder from the main source archive).
- Step 2: Reconfigure ICU with custom data config - `ICU_DATA_FILTER_FILE={GODOT_SOURCE}/thirdparty/icu4c/godot_data.json ./runConfigureICU {PLATFORM} --with-data-packaging=common`. - Step 2: Build ICU with default options - `./runConfigureICU {PLATFORM} && make`.
- Step 3: Delete `data/out` folder and rebuild data - `cd data && rm -rf ./out && make`. - Step 3: Reconfigure ICU with custom data config - `ICU_DATA_FILTER_FILE={GODOT_SOURCE}/thirdparty/icu4c/godot_data.json ./runConfigureICU {PLATFORM} --with-data-packaging=common`.
- Step 4: Copy `source/data/out/icudt73l.dat` to the `{GODOT_SOURCE}/thirdparty/icu4c/icudt73l.dat`. - Step 4: Delete `data/out` folder and rebuild data - `cd data && rm -rf ./out && make`.
- Step 5: Copy `source/data/out/icudt73l.dat` to the `{GODOT_SOURCE}/thirdparty/icu4c/icudt73l.dat`.
## jpeg-compressor ## jpeg-compressor

9
thirdparty/icu4c/common/unicode/ures.h vendored
View File

@ -25,6 +25,7 @@
#ifndef URES_H #ifndef URES_H
#define URES_H #define URES_H
#include "unicode/char16ptr.h"
#include "unicode/utypes.h" #include "unicode/utypes.h"
#include "unicode/uloc.h" #include "unicode/uloc.h"
@ -812,7 +813,7 @@ inline UnicodeString
ures_getUnicodeString(const UResourceBundle *resB, UErrorCode* status) { ures_getUnicodeString(const UResourceBundle *resB, UErrorCode* status) {
UnicodeString result; UnicodeString result;
int32_t len = 0; int32_t len = 0;
const char16_t *r = ures_getString(resB, &len, status); const char16_t *r = ConstChar16Ptr(ures_getString(resB, &len, status));
if(U_SUCCESS(*status)) { if(U_SUCCESS(*status)) {
result.setTo(true, r, len); result.setTo(true, r, len);
} else { } else {
@ -837,7 +838,7 @@ inline UnicodeString
ures_getNextUnicodeString(UResourceBundle *resB, const char ** key, UErrorCode* status) { ures_getNextUnicodeString(UResourceBundle *resB, const char ** key, UErrorCode* status) {
UnicodeString result; UnicodeString result;
int32_t len = 0; int32_t len = 0;
const char16_t* r = ures_getNextString(resB, &len, key, status); const char16_t* r = ConstChar16Ptr(ures_getNextString(resB, &len, key, status));
if(U_SUCCESS(*status)) { if(U_SUCCESS(*status)) {
result.setTo(true, r, len); result.setTo(true, r, len);
} else { } else {
@ -859,7 +860,7 @@ inline UnicodeString
ures_getUnicodeStringByIndex(const UResourceBundle *resB, int32_t indexS, UErrorCode* status) { ures_getUnicodeStringByIndex(const UResourceBundle *resB, int32_t indexS, UErrorCode* status) {
UnicodeString result; UnicodeString result;
int32_t len = 0; int32_t len = 0;
const char16_t* r = ures_getStringByIndex(resB, indexS, &len, status); const char16_t* r = ConstChar16Ptr(ures_getStringByIndex(resB, indexS, &len, status));
if(U_SUCCESS(*status)) { if(U_SUCCESS(*status)) {
result.setTo(true, r, len); result.setTo(true, r, len);
} else { } else {
@ -882,7 +883,7 @@ inline UnicodeString
ures_getUnicodeStringByKey(const UResourceBundle *resB, const char* key, UErrorCode* status) { ures_getUnicodeStringByKey(const UResourceBundle *resB, const char* key, UErrorCode* status) {
UnicodeString result; UnicodeString result;
int32_t len = 0; int32_t len = 0;
const char16_t* r = ures_getStringByKey(resB, key, &len, status); const char16_t* r = ConstChar16Ptr(ures_getStringByKey(resB, key, &len, status));
if(U_SUCCESS(*status)) { if(U_SUCCESS(*status)) {
result.setTo(true, r, len); result.setTo(true, r, len);
} else { } else {

6
thirdparty/icu4c/common/unicode/uvernum.h vendored
View File

@ -59,7 +59,7 @@
* This value will change in the subsequent releases of ICU * This value will change in the subsequent releases of ICU
* @stable ICU 2.6 * @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. /** The current ICU patchlevel version as an integer.
* This value will change in the subsequent releases of ICU * This value will change in the subsequent releases of ICU
@ -132,7 +132,7 @@
* This value will change in the subsequent releases of ICU * This value will change in the subsequent releases of ICU
* @stable ICU 2.4 * @stable ICU 2.4
*/ */
#define U_ICU_VERSION "73.1" #define U_ICU_VERSION "73.2"
/** /**
* The current ICU library major version number as a string, for library name suffixes. * The current ICU library major version number as a string, for library name suffixes.
@ -151,7 +151,7 @@
/** Data version in ICU4C. /** Data version in ICU4C.
* @internal ICU 4.4 Internal Use Only * @internal ICU 4.4 Internal Use Only
**/ **/
#define U_ICU_DATA_VERSION "73.1" #define U_ICU_DATA_VERSION "73.2"
#endif /* U_HIDE_INTERNAL_API */ #endif /* U_HIDE_INTERNAL_API */
/*=========================================================================== /*===========================================================================

BIN
thirdparty/icu4c/icudt73l.dat vendored
View File

Binary file not shown.