Skip to content

Commit 3c21611

Browse files
committed
MNT: Update bundled font libraries
libraqm 0.10.5 fixes some minor issues. SheenBidi 3.0.0 adds new text editing and analysis API, but that does not directly affect us as it is used by libraqm only. HarfBuzz 12.3.1 and 12.3.2 fix several bugs and vulnerabilities. HarfBuzz 13 adds experimental raster and vector rendering libraries. These may be useful for implementing colour emoji, but we remain using FreeType right now. HarfBuzz 14 adds a GPU text rasterization library. This is again not useful for us right now, unless we start making a GPU backend. As we have disabled these new features, there should be no size change in the resulting Python extensions, or increased compile time.
1 parent 5b7f8e7 commit 3c21611

File tree

4 files changed

+23
-15
lines changed

4 files changed

+23
-15
lines changed

extern/meson.build

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,24 @@ else
4242
'gdi=disabled',
4343
'glib=disabled',
4444
'gobject=disabled',
45+
'gpu=disabled',
46+
'gpu_demo=disabled',
4547
'harfrust=disabled',
4648
'icu=disabled',
4749
'introspection=disabled',
4850
'kbts=disabled',
51+
'png=disabled',
52+
'raster=disabled',
53+
'subset=disabled',
4954
'tests=disabled',
5055
'utilities=disabled',
56+
'vector=disabled',
5157
'wasm=disabled',
58+
'zlib=disabled',
5259
]
5360
)
5461
subproject('sheenbidi', default_options: ['default_library=static'])
55-
libraqm_proj = subproject('libraqm-0.10.4',
62+
libraqm_proj = subproject('libraqm',
5663
default_options: [
5764
'default_library=static',
5865
'sheenbidi=true',

subprojects/harfbuzz.wrap

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[wrap-file]
2-
directory = harfbuzz-12.3.0
3-
source_url = https://github.com/harfbuzz/harfbuzz/releases/download/12.3.0/harfbuzz-12.3.0.tar.xz
4-
source_filename = harfbuzz-12.3.0.tar.xz
5-
source_hash = 8660ebd3c27d9407fc8433b5d172bafba5f0317cb0bb4339f28e5370c93d42b7
6-
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/harfbuzz_12.3.0-1/harfbuzz-12.3.0.tar.xz
7-
wrapdb_version = 12.3.0-1
2+
directory = harfbuzz-14.1.0
3+
source_url = https://github.com/harfbuzz/harfbuzz/releases/download/14.1.0/harfbuzz-14.1.0.tar.xz
4+
source_filename = harfbuzz-14.1.0.tar.xz
5+
source_hash = ee0eb3a1da2c5a28147f12dff55f6c7d60aeeeb29ac7ef334eabe84c8476c105
6+
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/harfbuzz_14.1.0-1/harfbuzz-14.1.0.tar.xz
7+
wrapdb_version = 14.1.0-1
88

99
[provide]
10-
dependency_names = harfbuzz, harfbuzz-cairo, harfbuzz-gobject, harfbuzz-icu, harfbuzz-subset
10+
dependency_names = harfbuzz, harfbuzz-cairo, harfbuzz-gobject, harfbuzz-gpu, harfbuzz-icu, harfbuzz-raster, harfbuzz-subset, harfbuzz-vector
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
[wrap-file]
2-
source_url = https://github.com/HOST-Oman/libraqm/archive/v0.10.4/libraqm-0.10.4.tar.gz
3-
source_filename = libraqm-0.10.4.tar.gz
4-
source_hash = 6b583fb0eb159a3727a1e8c653bb0294173a14af8eb60195a775879de72320a3
2+
directory = libraqm-0.10.5
3+
source_url = https://github.com/HOST-Oman/libraqm/archive/v0.10.5/libraqm-0.10.5.tar.gz
4+
source_filename = libraqm-0.10.5.tar.gz
5+
source_hash = 7f3dd21b4b3bd28a36f2c911d31d91a9d69341697713923ef1aac65d56ebcafd
56

67
# First patch allows using our bundled FreeType.
78
diff_files = libraqm-0.10.2-bundle-freetype.patch

subprojects/sheenbidi.wrap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[wrap-file]
2-
directory = SheenBidi-2.9.0
3-
source_url = https://github.com/Tehreer/SheenBidi/archive/refs/tags/v2.9.0/sheenbidi-2.9.0.tar.gz
4-
source_filename = sheenbidi-2.9.0.tar.gz
5-
source_hash = e90ae142c6fc8b94366f3526f84b349a2c10137f87093db402fe51f6eace6d13
2+
directory = SheenBidi-3.0.0
3+
source_url = https://github.com/Tehreer/SheenBidi/archive/refs/tags/v3.0.0/sheenbidi-3.0.0.tar.gz
4+
source_filename = sheenbidi-3.0.0.tar.gz
5+
source_hash = 86c56014034739ba39a24c23eb00323b0bf6f737354f665786015fca842af786

0 commit comments

Comments
 (0)