Skip to content

Commit 920865d

Browse files
Roll HarfBuzz to 11.0.0 (flutter#166596)
Fixes flutter#162819
1 parent b44137f commit 920865d

File tree

8 files changed

+337
-34
lines changed

8 files changed

+337
-34
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ deps = {
244244
Var('flutter_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b',
245245

246246
'engine/src/flutter/third_party/harfbuzz':
247-
Var('flutter_git') + '/third_party/harfbuzz' + '@' + 'ea8f97c615f0ba17dc25013ef67dbd6bfaaa76f2',
247+
Var('flutter_git') + '/third_party/harfbuzz' + '@' + 'ea6a172f84f2cbcfed803b5ae71064c7afb6b5c2',
248248

249249
'engine/src/flutter/third_party/libcxx':
250250
Var('llvm_git') + '/llvm-project/libcxx' + '@' + 'bd557f6f764d1e40b62528a13b124ce740624f8f',
Lines changed: 177 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,177 @@
1+
# Copyright 2013 The Flutter Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
config("harfbuzz_config") {
6+
include_dirs = [ "src" ]
7+
}
8+
9+
config("harfbuzz_flags") {
10+
cflags = []
11+
if (is_clang) {
12+
cflags += [
13+
"-Wno-missing-field-initializers",
14+
"-Wno-unused-variable",
15+
"-Wno-sign-compare",
16+
]
17+
}
18+
19+
defines = [
20+
"HAVE_OT",
21+
"HAVE_ICU",
22+
"HAVE_ICU_BUILTIN",
23+
"HB_NO_VISIBILITY",
24+
]
25+
26+
if (is_linux || is_android || is_fuchsia) {
27+
defines += [ "HAVE_PTHREAD" ]
28+
}
29+
}
30+
31+
source_set("harfbuzz_sources") {
32+
sources = [
33+
"src/hb-aat-layout.cc",
34+
"src/hb-aat-map.cc",
35+
"src/hb-blob.cc",
36+
"src/hb-buffer-serialize.cc",
37+
"src/hb-buffer-verify.cc",
38+
"src/hb-buffer.cc",
39+
"src/hb-common.cc",
40+
"src/hb-draw.cc",
41+
"src/hb-face-builder.cc",
42+
"src/hb-face.cc",
43+
"src/hb-fallback-shape.cc",
44+
"src/hb-font.cc",
45+
"src/hb-map.cc",
46+
"src/hb-number.cc",
47+
"src/hb-ot-cff1-table.cc",
48+
"src/hb-ot-cff2-table.cc",
49+
"src/hb-ot-color.cc",
50+
"src/hb-ot-face.cc",
51+
"src/hb-ot-font.cc",
52+
"src/hb-ot-layout.cc",
53+
"src/hb-ot-map.cc",
54+
"src/hb-ot-math.cc",
55+
"src/hb-ot-meta.cc",
56+
"src/hb-ot-metrics.cc",
57+
"src/hb-ot-name.cc",
58+
"src/hb-ot-shape-fallback.cc",
59+
"src/hb-ot-shape-normalize.cc",
60+
"src/hb-ot-shape.cc",
61+
"src/hb-ot-shaper-arabic.cc",
62+
"src/hb-ot-shaper-default.cc",
63+
"src/hb-ot-shaper-hangul.cc",
64+
"src/hb-ot-shaper-hebrew.cc",
65+
"src/hb-ot-shaper-indic-table.cc",
66+
"src/hb-ot-shaper-indic.cc",
67+
"src/hb-ot-shaper-khmer.cc",
68+
"src/hb-ot-shaper-myanmar.cc",
69+
"src/hb-ot-shaper-syllabic.cc",
70+
"src/hb-ot-shaper-thai.cc",
71+
"src/hb-ot-shaper-use.cc",
72+
"src/hb-ot-shaper-vowel-constraints.cc",
73+
"src/hb-ot-tag.cc",
74+
"src/hb-ot-var.cc",
75+
"src/hb-outline.cc",
76+
"src/hb-paint-extents.cc",
77+
"src/hb-paint.cc",
78+
"src/hb-set.cc",
79+
"src/hb-shape-plan.cc",
80+
"src/hb-shape.cc",
81+
"src/hb-shaper.cc",
82+
"src/hb-static.cc",
83+
"src/hb-style.cc",
84+
"src/hb-ucd.cc",
85+
"src/hb-unicode.cc",
86+
]
87+
88+
configs += [ ":harfbuzz_flags" ]
89+
90+
public_configs = [ ":harfbuzz_config" ]
91+
92+
deps = [
93+
"//third_party/freetype2",
94+
"//third_party/icu:icuuc",
95+
]
96+
}
97+
98+
source_set("harfbuzz_subset") {
99+
sources = [
100+
"src/graph/gsubgpos-context.cc",
101+
"src/hb-aat-layout.cc",
102+
"src/hb-aat-map.cc",
103+
"src/hb-blob.cc",
104+
"src/hb-buffer-serialize.cc",
105+
"src/hb-buffer-verify.cc",
106+
"src/hb-buffer.cc",
107+
"src/hb-common.cc",
108+
"src/hb-draw.cc",
109+
"src/hb-face-builder.cc",
110+
"src/hb-face.cc",
111+
"src/hb-fallback-shape.cc",
112+
"src/hb-font.cc",
113+
"src/hb-map.cc",
114+
"src/hb-number.cc",
115+
"src/hb-ot-cff1-table.cc",
116+
"src/hb-ot-cff2-table.cc",
117+
"src/hb-ot-color.cc",
118+
"src/hb-ot-face.cc",
119+
"src/hb-ot-font.cc",
120+
"src/hb-ot-layout.cc",
121+
"src/hb-ot-map.cc",
122+
"src/hb-ot-math.cc",
123+
"src/hb-ot-meta.cc",
124+
"src/hb-ot-metrics.cc",
125+
"src/hb-ot-name.cc",
126+
"src/hb-ot-shape-fallback.cc",
127+
"src/hb-ot-shape-normalize.cc",
128+
"src/hb-ot-shape.cc",
129+
"src/hb-ot-shaper-arabic.cc",
130+
"src/hb-ot-shaper-default.cc",
131+
"src/hb-ot-shaper-hangul.cc",
132+
"src/hb-ot-shaper-hebrew.cc",
133+
"src/hb-ot-shaper-indic-table.cc",
134+
"src/hb-ot-shaper-indic.cc",
135+
"src/hb-ot-shaper-khmer.cc",
136+
"src/hb-ot-shaper-myanmar.cc",
137+
"src/hb-ot-shaper-syllabic.cc",
138+
"src/hb-ot-shaper-thai.cc",
139+
"src/hb-ot-shaper-use.cc",
140+
"src/hb-ot-shaper-vowel-constraints.cc",
141+
"src/hb-ot-tag.cc",
142+
"src/hb-ot-var.cc",
143+
"src/hb-outline.cc",
144+
"src/hb-paint-extents.cc",
145+
"src/hb-paint.cc",
146+
"src/hb-set.cc",
147+
"src/hb-shape-plan.cc",
148+
"src/hb-shape.cc",
149+
"src/hb-shaper.cc",
150+
"src/hb-static.cc",
151+
"src/hb-style.cc",
152+
"src/hb-subset-cff-common.cc",
153+
"src/hb-subset-cff1.cc",
154+
"src/hb-subset-cff2.cc",
155+
"src/hb-subset-input.cc",
156+
"src/hb-subset-instancer-iup.cc",
157+
"src/hb-subset-instancer-solver.cc",
158+
"src/hb-subset-plan.cc",
159+
"src/hb-subset.cc",
160+
"src/hb-ucd.cc",
161+
"src/hb-unicode.cc",
162+
]
163+
164+
configs += [ ":harfbuzz_flags" ]
165+
166+
public_configs = [ ":harfbuzz_config" ]
167+
168+
deps = [
169+
"//third_party/freetype2",
170+
"//third_party/icu:icuuc",
171+
]
172+
}
173+
174+
source_set("harfbuzz") {
175+
output_name = "harfbuzz"
176+
public_deps = [ ":harfbuzz_sources" ]
177+
}

engine/src/flutter/ci/licenses.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ function verify_licenses() (
173173

174174
local actualLicenseCount
175175
actualLicenseCount="$(tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9')"
176-
local expectedLicenseCount=842
176+
local expectedLicenseCount=846
177177

178178
if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then
179179
echo "=============================== ERROR ==============================="

engine/src/flutter/ci/licenses_golden/excluded_files

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1944,7 +1944,6 @@
19441944
../../../flutter/third_party/harfbuzz/CMakeLists.txt
19451945
../../../flutter/third_party/harfbuzz/CONFIG.md
19461946
../../../flutter/third_party/harfbuzz/NEWS
1947-
../../../flutter/third_party/harfbuzz/README
19481947
../../../flutter/third_party/harfbuzz/README.md
19491948
../../../flutter/third_party/harfbuzz/README.mingw.md
19501949
../../../flutter/third_party/harfbuzz/README.python.md
@@ -1953,16 +1952,9 @@
19531952
../../../flutter/third_party/harfbuzz/TESTING.md
19541953
../../../flutter/third_party/harfbuzz/THANKS
19551954
../../../flutter/third_party/harfbuzz/docs
1956-
../../../flutter/third_party/harfbuzz/git.mk
1957-
../../../flutter/third_party/harfbuzz/m4/ax_check_link_flag.m4
1958-
../../../flutter/third_party/harfbuzz/m4/ax_code_coverage.m4
1959-
../../../flutter/third_party/harfbuzz/m4/ax_cxx_compile_stdcxx.m4
1960-
../../../flutter/third_party/harfbuzz/m4/ax_pthread.m4
19611955
../../../flutter/third_party/harfbuzz/meson.build
1962-
../../../flutter/third_party/harfbuzz/perf/README.md
1963-
../../../flutter/third_party/harfbuzz/perf/meson.build
1956+
../../../flutter/third_party/harfbuzz/perf
19641957
../../../flutter/third_party/harfbuzz/replace-enum-strings.cmake
1965-
../../../flutter/third_party/harfbuzz/src/Makefile.sources
19661958
../../../flutter/third_party/harfbuzz/src/addTable.py
19671959
../../../flutter/third_party/harfbuzz/src/check-c-linkage-decls.py
19681960
../../../flutter/third_party/harfbuzz/src/check-externs.py
@@ -1972,6 +1964,7 @@
19721964
../../../flutter/third_party/harfbuzz/src/check-static-inits.py
19731965
../../../flutter/third_party/harfbuzz/src/check-symbols.py
19741966
../../../flutter/third_party/harfbuzz/src/fix_get_types.py
1967+
../../../flutter/third_party/harfbuzz/src/fontations/meson.build
19751968
../../../flutter/third_party/harfbuzz/src/gen-arabic-joining-list.py
19761969
../../../flutter/third_party/harfbuzz/src/gen-arabic-pua.py
19771970
../../../flutter/third_party/harfbuzz/src/gen-arabic-table.py
@@ -1986,6 +1979,10 @@
19861979
../../../flutter/third_party/harfbuzz/src/gen-ucd-table.py
19871980
../../../flutter/third_party/harfbuzz/src/gen-use-table.py
19881981
../../../flutter/third_party/harfbuzz/src/gen-vowel-constraints.py
1982+
../../../flutter/third_party/harfbuzz/src/hb-bit-vector.hh
1983+
../../../flutter/third_party/harfbuzz/src/hb-directwrite-shape.cc
1984+
../../../flutter/third_party/harfbuzz/src/hb-directwrite.hh
1985+
../../../flutter/third_party/harfbuzz/src/hb-fontations.h
19891986
../../../flutter/third_party/harfbuzz/src/justify.py
19901987
../../../flutter/third_party/harfbuzz/src/meson.build
19911988
../../../flutter/third_party/harfbuzz/src/relative_to.py

0 commit comments

Comments
 (0)