From 1f2542247f98169838d8cb2a45fc02e6b5e34344 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Tue, 5 Apr 2022 17:58:38 -0400 Subject: [PATCH] LibUnicode: Upgrade to CLDR version 41.0.0 Release notes: https://cldr.unicode.org/index/downloads/cldr-41 Note that the HourCycleRegion enum now contains 272 entires, thus needs to be bumped from u8 to u16. --- Meta/CMake/unicode_data.cmake | 8 ++------ Userland/Libraries/LibUnicode/Forward.h | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Meta/CMake/unicode_data.cmake b/Meta/CMake/unicode_data.cmake index dfce43fe92..b0c66d4edc 100644 --- a/Meta/CMake/unicode_data.cmake +++ b/Meta/CMake/unicode_data.cmake @@ -1,11 +1,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/utils.cmake) set(UCD_VERSION 14.0.0) -set(CLDR_VERSION 40.0.0-updated) - -# FIXME: When the CLDR is bumped to version 41, we can remove this. A bugfix to the CLDR was released with the same -# version number, so the CLDR_VERSION number above is a fake number to force a redownload. -set(CLDR_REAL_VERSION 40.0.0) +set(CLDR_VERSION 41.0.0) set(UCD_PATH "${CMAKE_BINARY_DIR}/UCD" CACHE PATH "Download location for UCD files") set(CLDR_PATH "${CMAKE_BINARY_DIR}/CLDR" CACHE PATH "Download location for CLDR files") @@ -67,7 +63,7 @@ set(WORD_BREAK_PROP_PATH "${UCD_PATH}/${WORD_BREAK_PROP_SOURCE}") set(SENTENCE_BREAK_PROP_SOURCE "auxiliary/SentenceBreakProperty.txt") set(SENTENCE_BREAK_PROP_PATH "${UCD_PATH}/${SENTENCE_BREAK_PROP_SOURCE}") -set(CLDR_ZIP_URL "https://github.com/unicode-org/cldr-json/releases/download/${CLDR_REAL_VERSION}/cldr-${CLDR_REAL_VERSION}-json-modern.zip") +set(CLDR_ZIP_URL "https://github.com/unicode-org/cldr-json/releases/download/${CLDR_VERSION}/cldr-${CLDR_VERSION}-json-modern.zip") set(CLDR_ZIP_PATH "${CLDR_PATH}/cldr.zip") set(CLDR_BCP47_SOURCE cldr-bcp47) diff --git a/Userland/Libraries/LibUnicode/Forward.h b/Userland/Libraries/LibUnicode/Forward.h index 7dffc51a73..a872e156aa 100644 --- a/Userland/Libraries/LibUnicode/Forward.h +++ b/Userland/Libraries/LibUnicode/Forward.h @@ -23,7 +23,7 @@ enum class Era : u8; enum class GeneralCategory : u8; enum class GraphemeBreakProperty : u8; enum class HourCycle : u8; -enum class HourCycleRegion : u8; +enum class HourCycleRegion : u16; enum class Key : u8; enum class KeywordCalendar : u8; enum class KeywordColCaseFirst : u8;