summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill Burtsev <kirill.burtsev@qt.io>2019-08-23 15:09:25 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2022-03-17 10:14:58 +0100
commit1c12bb220ad686ef0184d814d6722f904e2b5432 (patch)
tree3678c8b4d82ac8a1cf7800b5c781e3d69bc995f2
parent53a7d121e3277be886a4c66e648edceb26a6f6cc (diff)
downloadqtwebengine-chromium-1c12bb220ad686ef0184d814d6722f904e2b5432.tar.gz
Fix compilation with system ICU
Update shim headers - https://unicode-org.atlassian.net/browse/ICU-20601 - https://github.com/unicode-org/icu/pull/759 Change-Id: Ie05c005ebcded9a228386db5d9abe9863787ec2b Fixes: QTBUG-78911 Reviewed-by: Jimi Huotari <chiitoo@gentoo.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--chromium/third_party/icu/BUILD.gn24
1 files changed, 16 insertions, 8 deletions
diff --git a/chromium/third_party/icu/BUILD.gn b/chromium/third_party/icu/BUILD.gn
index 55af04697c9..eab63c2314b 100644
--- a/chromium/third_party/icu/BUILD.gn
+++ b/chromium/third_party/icu/BUILD.gn
@@ -467,9 +467,7 @@ shim_headers("icui18n_shim") {
prefix = "unicode/"
headers = [
# This list can easily be updated using the command below:
- # find third_party/icu/source/i18n/unicode \
- # -iname '*.h' -printf '"%p",\n' | \
- # sed -e 's|third_party/icu/source/i18n/unicode/||' | sort -u
+ # find third_party/icu/source/i18n/unicode -iname '*.h' -printf '%f\n' | sort -Vu | sed -e 's/.*/"&",/'
"alphaindex.h",
"basictz.h",
"calendar.h",
@@ -491,15 +489,18 @@ shim_headers("icui18n_shim") {
"fieldpos.h",
"fmtable.h",
"format.h",
+ "formattedvalue.h",
"fpositer.h",
"gender.h",
"gregocal.h",
+ "listformatter.h",
"measfmt.h",
"measunit.h",
"measure.h",
"msgfmt.h",
"nounit.h",
"numberformatter.h",
+ "numberrangeformatter.h",
"numfmt.h",
"numsys.h",
"plurfmt.h",
@@ -535,11 +536,15 @@ shim_headers("icui18n_shim") {
"udatpg.h",
"ufieldpositer.h",
"uformattable.h",
+ "uformattedvalue.h",
"ugender.h",
+ "ulistformatter.h",
"ulocdata.h",
"umsg.h",
"unirepl.h",
"unum.h",
+ "unumberformatter.h",
+ "unumberrangeformatter.h",
"unumsys.h",
"upluralrules.h",
"uregex.h",
@@ -558,9 +563,7 @@ shim_headers("icuuc_shim") {
prefix = "unicode/"
headers = [
# This list can easily be updated using the command below:
- # find third_party/icu/source/common/unicode \
- # -iname '*.h' -printf '"%p",\n' | \
- # sed -e 's|third_party/icu/source/common/unicode/||' | sort -u
+ # find third_party/icu/source/common/unicode -iname '*.h' -printf '%f\n' | sort -Vu | sed -e 's/.*/"&",/'
"appendable.h",
"brkiter.h",
"bytestream.h",
@@ -580,6 +583,8 @@ shim_headers("icuuc_shim") {
"icudataver.h",
"icuplug.h",
"idna.h",
+ "localebuilder.h",
+ "localematcher.h",
"localpointer.h",
"locdspnm.h",
"locid.h",
@@ -613,10 +618,12 @@ shim_headers("icuuc_shim") {
"uchriter.h",
"uclean.h",
"ucnv.h",
+ "ucnvsel.h",
"ucnv_cb.h",
"ucnv_err.h",
- "ucnvsel.h",
"uconfig.h",
+ "ucpmap.h",
+ "ucptrie.h",
"ucurr.h",
"udata.h",
"udisplaycontext.h",
@@ -627,6 +634,7 @@ shim_headers("icuuc_shim") {
"uloc.h",
"umachine.h",
"umisc.h",
+ "umutablecptrie.h",
"unifilt.h",
"unifunct.h",
"unimatch.h",
@@ -647,9 +655,9 @@ shim_headers("icuuc_shim") {
"ustringtrie.h",
"utext.h",
"utf.h",
+ "utf8.h",
"utf16.h",
"utf32.h",
- "utf8.h",
"utf_old.h",
"utrace.h",
"utypes.h",