Skip to content

Commit 2c67a1f

Browse files
mattleibowmattleibow
authored
[release/2.x] Update harfbuzz to 7.3.0 (#2577)
Backport of ab230d4 from #2582.
1 parent bf2d7b2 commit 2c67a1f

File tree

18 files changed

+157
-2535
lines changed

18 files changed

+157
-2535
lines changed

‎VERSIONS.txt‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# dependencies
22
mdoc release 5.8.9
3-
harfbuzz release 2.8.2
3+
harfbuzz release 7.3.0
44
skia release m88
55
xunit release 2.4.2
66
xunit.runner.console release 2.4.2
@@ -40,16 +40,18 @@ libSkiaSharp milestone 88
4040
libSkiaSharp increment 1
4141

4242
# native sonames
43+
# <milestone>.<increment>.0
4344
libSkiaSharp soname 88.1.0
44-
HarfBuzz soname 0.20802.0
45+
# 0.<60000 + major*100 + minor*10 + micro>.0
46+
HarfBuzz soname 0.60730.0
4547

4648
# SkiaSharp.dll
4749
SkiaSharp assembly 2.88.0.0
4850
SkiaSharp file 2.88.6.0
4951

5052
# HarfBuzzSharp.dll
5153
HarfBuzzSharp assembly 1.0.0.0
52-
HarfBuzzSharp file 2.8.2.6
54+
HarfBuzzSharp file 7.3.0.0
5355

5456
# nuget versions
5557
SkiaSharp nuget 2.88.6
@@ -85,18 +87,18 @@ SkiaSharp.Views.Blazor nuget 2.88.6
8587
SkiaSharp.HarfBuzz nuget 2.88.6
8688
SkiaSharp.Skottie nuget 2.88.6
8789
SkiaSharp.Vulkan.SharpVk nuget 2.88.6
88-
HarfBuzzSharp nuget 2.8.2.6
89-
HarfBuzzSharp.NativeAssets.Android nuget 2.8.2.6
90-
HarfBuzzSharp.NativeAssets.iOS nuget 2.8.2.6
91-
HarfBuzzSharp.NativeAssets.Linux nuget 2.8.2.6
92-
HarfBuzzSharp.NativeAssets.MacCatalyst nuget 2.8.2.6
93-
HarfBuzzSharp.NativeAssets.macOS nuget 2.8.2.6
94-
HarfBuzzSharp.NativeAssets.Tizen nuget 2.8.2.6
95-
HarfBuzzSharp.NativeAssets.tvOS nuget 2.8.2.6
96-
HarfBuzzSharp.NativeAssets.UWP nuget 2.8.2.6
97-
HarfBuzzSharp.NativeAssets.watchOS nuget 2.8.2.6
98-
HarfBuzzSharp.NativeAssets.WebAssembly nuget 2.8.2.6
99-
HarfBuzzSharp.NativeAssets.Win32 nuget 2.8.2.6
90+
HarfBuzzSharp nuget 7.3.0
91+
HarfBuzzSharp.NativeAssets.Android nuget 7.3.0
92+
HarfBuzzSharp.NativeAssets.iOS nuget 7.3.0
93+
HarfBuzzSharp.NativeAssets.Linux nuget 7.3.0
94+
HarfBuzzSharp.NativeAssets.MacCatalyst nuget 7.3.0
95+
HarfBuzzSharp.NativeAssets.macOS nuget 7.3.0
96+
HarfBuzzSharp.NativeAssets.Tizen nuget 7.3.0
97+
HarfBuzzSharp.NativeAssets.tvOS nuget 7.3.0
98+
HarfBuzzSharp.NativeAssets.UWP nuget 7.3.0
99+
HarfBuzzSharp.NativeAssets.watchOS nuget 7.3.0
100+
HarfBuzzSharp.NativeAssets.WebAssembly nuget 7.3.0
101+
HarfBuzzSharp.NativeAssets.Win32 nuget 7.3.0
100102

101103
# nuget replacement versions
102104
Xamarin.Forms nuget 4.8.0.1821

‎externals/skia‎

‎native/android/libHarfBuzzSharp/config.h‎

Lines changed: 0 additions & 167 deletions
This file was deleted.

‎native/android/libHarfBuzzSharp/jni/HarfBuzzSharp.mk‎

Lines changed: 6 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -3,73 +3,22 @@ include $(CLEAR_VARS)
33

44
cmd-strip = $(PRIVATE_STRIP) --strip-all $(call host-path,$1)
55

6-
src_root = ../../../../externals/skia/third_party/externals/harfbuzz/src
6+
src_root = $(abspath ../../../externals/skia/third_party/externals/harfbuzz/src)
7+
ext_root = $(abspath ../../../externals/skia/third_party/harfbuzz)
78

89
LOCAL_MODULE := HarfBuzzSharp
910

10-
LOCAL_C_INCLUDES := . $(src_root)
11+
LOCAL_C_INCLUDES := . $(src_root) $(ext_root)
1112

1213
LOCAL_LDFLAGS := -s -Wl,--gc-sections
1314

14-
LOCAL_CFLAGS := -DHAVE_CONFIG_H -DNDEBUG \
15+
LOCAL_CFLAGS := -DNDEBUG \
16+
-DHAVE_CONFIG_OVERRIDE_H -DHAVE_OT -DHB_NO_FALLBACK_SHAPE \
1517
-fno-rtti -fno-exceptions -fno-threadsafe-statics -fPIC \
1618
-g -Os -ffunction-sections -fdata-sections
1719

1820
LOCAL_CPPFLAGS := -std=c++11
1921

20-
LOCAL_SRC_FILES := $(src_root)/hb-aat-layout.cc \
21-
$(src_root)/hb-aat-map.cc \
22-
$(src_root)/hb-blob.cc \
23-
$(src_root)/hb-buffer-serialize.cc \
24-
$(src_root)/hb-buffer.cc \
25-
$(src_root)/hb-common.cc \
26-
$(src_root)/hb-draw.cc \
27-
$(src_root)/hb-face.cc \
28-
$(src_root)/hb-fallback-shape.cc \
29-
$(src_root)/hb-font.cc \
30-
$(src_root)/hb-map.cc \
31-
$(src_root)/hb-number.cc \
32-
$(src_root)/hb-ot-cff1-table.cc \
33-
$(src_root)/hb-ot-cff2-table.cc \
34-
$(src_root)/hb-ot-color.cc \
35-
$(src_root)/hb-ot-face.cc \
36-
$(src_root)/hb-ot-font.cc \
37-
$(src_root)/hb-ot-layout.cc \
38-
$(src_root)/hb-ot-map.cc \
39-
$(src_root)/hb-ot-math.cc \
40-
$(src_root)/hb-ot-meta.cc \
41-
$(src_root)/hb-ot-metrics.cc \
42-
$(src_root)/hb-ot-name.cc \
43-
$(src_root)/hb-ot-shape-complex-arabic.cc \
44-
$(src_root)/hb-ot-shape-complex-default.cc \
45-
$(src_root)/hb-ot-shape-complex-hangul.cc \
46-
$(src_root)/hb-ot-shape-complex-hebrew.cc \
47-
$(src_root)/hb-ot-shape-complex-indic-table.cc \
48-
$(src_root)/hb-ot-shape-complex-indic.cc \
49-
$(src_root)/hb-ot-shape-complex-khmer.cc \
50-
$(src_root)/hb-ot-shape-complex-myanmar.cc \
51-
$(src_root)/hb-ot-shape-complex-syllabic.cc \
52-
$(src_root)/hb-ot-shape-complex-thai.cc \
53-
$(src_root)/hb-ot-shape-complex-use.cc \
54-
$(src_root)/hb-ot-shape-complex-vowel-constraints.cc \
55-
$(src_root)/hb-ot-shape-fallback.cc \
56-
$(src_root)/hb-ot-shape-normalize.cc \
57-
$(src_root)/hb-ot-shape.cc \
58-
$(src_root)/hb-ot-tag.cc \
59-
$(src_root)/hb-ot-var.cc \
60-
$(src_root)/hb-set.cc \
61-
$(src_root)/hb-shape-plan.cc \
62-
$(src_root)/hb-shape.cc \
63-
$(src_root)/hb-shaper.cc \
64-
$(src_root)/hb-static.cc \
65-
$(src_root)/hb-style.cc \
66-
$(src_root)/hb-subset-cff-common.cc \
67-
$(src_root)/hb-subset-cff1.cc \
68-
$(src_root)/hb-subset-cff2.cc \
69-
$(src_root)/hb-subset-input.cc \
70-
$(src_root)/hb-subset-plan.cc \
71-
$(src_root)/hb-subset.cc \
72-
$(src_root)/hb-ucd.cc \
73-
$(src_root)/hb-unicode.cc
22+
LOCAL_SRC_FILES := $(src_root)/harfbuzz-subset.cc
7423

7524
include $(BUILD_SHARED_LIBRARY)

0 commit comments

Comments
 (0)