From 86dba54c068184d27eecc5f37c4be4dcc0bc4cb3 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Mon, 14 Aug 2023 19:05:55 -0500 Subject: [PATCH] =?UTF-8?q?feat(core):=20icu=20build=20fix=20=F0=9F=99=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - trim some more files For: #9121 --- core/subprojects/packagefiles/icu/meson.build | 4 ++ .../icu/source/common/meson.build | 56 +++++++++---------- .../packagefiles/icu/source/i18n/meson.build | 2 +- 3 files changed, 33 insertions(+), 29 deletions(-) diff --git a/core/subprojects/packagefiles/icu/meson.build b/core/subprojects/packagefiles/icu/meson.build index b525a35ae8..128fc9fbf9 100644 --- a/core/subprojects/packagefiles/icu/meson.build +++ b/core/subprojects/packagefiles/icu/meson.build @@ -43,6 +43,10 @@ uconfig.set('UCONFIG_NO_FORMATTING', 1) uconfig.set('UCONFIG_NO_TRANSLITERATION', 1) uconfig.set('UCONFIG_NO_REGULAR_EXPRESSIONS', 0) # want these for transforms #7375 uconfig.set('UCONFIG_NO_SERVICE', 1) +uconfig.set('U_OVERRIDE_CXX_ALLOCATION', 1) +uconfig.set('UCONFIG_NO_CONVERSION', 1) +uconfig.set('UCONFIG_USE_WINDOWS_LCID_MAPPING_API', 0) + uconfig_local = configure_file( diff --git a/core/subprojects/packagefiles/icu/source/common/meson.build b/core/subprojects/packagefiles/icu/source/common/meson.build index 4653d88383..4694499a86 100644 --- a/core/subprojects/packagefiles/icu/source/common/meson.build +++ b/core/subprojects/packagefiles/icu/source/common/meson.build @@ -75,10 +75,10 @@ sources = files( 'stringpiece.cpp', 'stringtriebuilder.cpp', 'uarrsort.cpp', - 'ubidi.cpp', + # 'ubidi.cpp', 'ubidi_props.cpp', - 'ubidiln.cpp', - 'ubidiwrt.cpp', + # 'ubidiln.cpp', + # 'ubidiwrt.cpp', 'ubrk.cpp', 'ucase.cpp', 'ucasemap.cpp', @@ -91,29 +91,29 @@ sources = files( 'uchriter.cpp', 'ucln_cmn.cpp', 'ucmndata.cpp', - 'ucnv.cpp', - 'ucnv2022.cpp', - 'ucnv_bld.cpp', - 'ucnv_cb.cpp', - 'ucnv_cnv.cpp', - 'ucnv_ct.cpp', - 'ucnv_err.cpp', - 'ucnv_ext.cpp', - 'ucnv_io.cpp', - 'ucnv_lmb.cpp', - 'ucnv_set.cpp', - 'ucnv_u16.cpp', - 'ucnv_u32.cpp', - 'ucnv_u7.cpp', - 'ucnv_u8.cpp', - 'ucnvbocu.cpp', - 'ucnvdisp.cpp', - 'ucnvhz.cpp', - 'ucnvisci.cpp', - 'ucnvlat1.cpp', - 'ucnvmbcs.cpp', - 'ucnvscsu.cpp', - 'ucnvsel.cpp', + # 'ucnv.cpp', + # 'ucnv2022.cpp', + # 'ucnv_bld.cpp', + # 'ucnv_cb.cpp', + # 'ucnv_cnv.cpp', + # 'ucnv_ct.cpp', + # 'ucnv_err.cpp', + # 'ucnv_ext.cpp', + # 'ucnv_io.cpp', + # 'ucnv_lmb.cpp', + # 'ucnv_set.cpp', + # 'ucnv_u16.cpp', + # 'ucnv_u32.cpp', + # 'ucnv_u7.cpp', + # 'ucnv_u8.cpp', + # 'ucnvbocu.cpp', + # 'ucnvdisp.cpp', + # 'ucnvhz.cpp', + # 'ucnvisci.cpp', + # 'ucnvlat1.cpp', + # 'ucnvmbcs.cpp', + # 'ucnvscsu.cpp', + # 'ucnvsel.cpp', 'ucol_swp.cpp', 'ucptrie.cpp', 'ucurr.cpp', @@ -287,8 +287,8 @@ headers = files( 'unicode/stringpiece.h', 'unicode/stringtriebuilder.h', 'unicode/symtable.h', - 'unicode/ubidi.h', - 'unicode/ubiditransform.h', + # 'unicode/ubidi.h', + # 'unicode/ubiditransform.h', 'unicode/ubrk.h', 'unicode/ucasemap.h', 'unicode/ucat.h', diff --git a/core/subprojects/packagefiles/icu/source/i18n/meson.build b/core/subprojects/packagefiles/icu/source/i18n/meson.build index 787afe3390..b2e64e63be 100644 --- a/core/subprojects/packagefiles/icu/source/i18n/meson.build +++ b/core/subprojects/packagefiles/icu/source/i18n/meson.build @@ -52,7 +52,7 @@ sources = files( 'dayperiodrules.cpp', 'dcfmtsym.cpp', 'decContext.cpp', - 'decNumber.cpp', + # 'decNumber.cpp', 'decimfmt.cpp', 'displayoptions.cpp', 'double-conversion-bignum-dtoa.cpp',