Skip to content

Commit afa249f

Browse files
authored
[harfbuzz] Update to 15.0.0 (#54591)
1 parent b3df23b commit afa249f

5 files changed

Lines changed: 45 additions & 3 deletions

File tree

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
diff --git a/util/meson.build b/util/meson.build
2+
index 8b188a259..b895d0aea 100644
3+
--- a/util/meson.build
4+
+++ b/util/meson.build
5+
@@ -124,6 +124,7 @@ if conf.get('HAVE_GLIB', 0) == 1
6+
cpp_args: cpp_args,
7+
include_directories: [incconfig, incsrc],
8+
link_with: [libharfbuzz],
9+
+ link_language: 'cpp',
10+
install: false,
11+
)
12+
13+
@@ -132,6 +133,7 @@ if conf.get('HAVE_GLIB', 0) == 1
14+
cpp_args: cpp_args,
15+
include_directories: [incconfig, incsrc],
16+
link_with: [libharfbuzz, libharfbuzz_vector],
17+
+ link_language: 'cpp',
18+
install: false,
19+
)
20+
endif
21+
@@ -140,6 +142,7 @@ if conf.get('HAVE_GLIB', 0) == 1
22+
cpp_args: cpp_args,
23+
include_directories: [incconfig, incsrc],
24+
link_with: [libharfbuzz],
25+
+ link_language: 'cpp',
26+
install: false,
27+
)
28+
29+
@@ -199,6 +202,7 @@ if conf.get('HAVE_GLIB', 0) == 1
30+
include_directories: [incconfig, incsrc],
31+
dependencies: util_deps,
32+
link_with: [libharfbuzz, libharfbuzz_subset],
33+
+ link_language: 'cpp',
34+
install: false,
35+
),
36+
workdir : meson.current_source_dir(),

‎ports/harfbuzz/portfile.cmake‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ vcpkg_from_github(
22
OUT_SOURCE_PATH SOURCE_PATH
33
REPO harfbuzz/harfbuzz
44
REF "${VERSION}"
5-
SHA512 46a7b6aca73bd3ff0d0559c63cbb17e1bcb004902916a75a37455812b5b1060fbe8332a557e0fc7e23e39bdb69570bf14fd9db86c278fe32a5cb0316c98a951e
5+
SHA512 9208e8436cf388bd07cd3aa4a7d5f757405f19cf2a84cd324cb57f085806a58b6ed5ff8549b124647a98b5a9f2e28bc0adee3bd37c5c7258e5a2103a3a7d5bb2
66
HEAD_REF master
77
PATCHES
88
${ANDROID_LOCALECONV_L_PATCH}
99
no-threads-on-emscripten.patch
10+
fix-meson-cxx-link.patch
1011
)
1112

1213
if("icu" IN_LIST FEATURES)

‎ports/harfbuzz/vcpkg.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "harfbuzz",
3-
"version": "14.6.0",
3+
"version": "15.0.0",
44
"description": "HarfBuzz OpenType text shaping engine",
55
"homepage": "https://github.com/harfbuzz/harfbuzz",
66
"license": "MIT-Modern-Variant AND MIT",

‎versions/baseline.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3817,7 +3817,7 @@
38173817
"port-version": 0
38183818
},
38193819
"harfbuzz": {
3820-
"baseline": "14.6.0",
3820+
"baseline": "15.0.0",
38213821
"port-version": 0
38223822
},
38233823
"hash-library": {

‎versions/h-/harfbuzz.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "4d3f8e1f6ad49bca16499f244b76a69af02ba2d3",
5+
"version": "15.0.0",
6+
"port-version": 0
7+
},
38
{
49
"git-tree": "34757718aafa908834d6d6a225d7ce144ca82df6",
510
"version": "14.6.0",

0 commit comments

Comments
 (0)