Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5c74c13

Browse files
committed
BLD: Update harfbuzz and sheenbidi to latest version
1 parent9e63cc8 commit5c74c13

File tree

5 files changed

+72
-18
lines changed

5 files changed

+72
-18
lines changed

‎extern/meson.build

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,29 @@ endif
3333
ifget_option('system-libraqm')
3434
libraqm_dep=dependency('raqm',version:'>=0.10.2')
3535
else
36-
LOCAL_LIBRAQM_VERSION='0.10.2'
37-
3836
subproject('harfbuzz',
3937
default_options: [
4038
'default_library=static',
39+
'cairo=disabled',
40+
'coretext=disabled',
41+
'directwrite=disabled',
42+
'fontations=disabled',
4143
'freetype=enabled',
44+
'gdi=disabled',
4245
'glib=disabled',
4346
'gobject=disabled',
44-
'cairo=disabled',
47+
'harfruzz=disabled',
4548
'icu=disabled',
4649
'tests=disabled',
4750
]
4851
)
4952
subproject('sheenbidi',default_options: ['default_library=static'])
50-
libraqm_proj=subproject(
51-
f'libraqm-@LOCAL_LIBRAQM_VERSION@',
52-
default_options: ['default_library=static','sheenbidi=true'])
53+
libraqm_proj=subproject('libraqm-0.10.2',
54+
default_options: [
55+
'default_library=static',
56+
'sheenbidi=true',
57+
]
58+
)
5359
libraqm_dep= libraqm_proj.get_variable('libraqm_dep')
5460
endif
5561

‎subprojects/harfbuzz.wrap

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
[wrap-file]
2-
directory = harfbuzz-11.2.0
3-
source_url = https://github.com/harfbuzz/harfbuzz/releases/download/11.2.0/harfbuzz-11.2.0.tar.xz
4-
source_filename = harfbuzz-11.2.0.tar.xz
5-
source_hash = 50f7d0a208367e606dbf6eecc5cfbecc01a47be6ee837ae7aff2787e24b09b45
2+
directory = harfbuzz-11.2.1
3+
source_url = https://github.com/harfbuzz/harfbuzz/releases/download/11.2.1/harfbuzz-11.2.1.tar.xz
4+
source_filename = harfbuzz-11.2.1.tar.xz
5+
source_hash = 093714c8548a285094685f0bdc999e202d666b59eeb3df2ff921ab68b8336a49
6+
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/harfbuzz_11.2.1-1/harfbuzz-11.2.1.tar.xz
7+
wrapdb_version = 11.2.1-1
68

7-
# This patch allows using our bundled FreeType.
8-
diff_files = harfbuzz-11.2.0-bundle-freetype.patch
9+
[provide]
10+
dependency_names = harfbuzz, harfbuzz-cairo, harfbuzz-gobject, harfbuzz-icu, harfbuzz-subset

‎subprojects/libraqm-0.10.2.wrap

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ source_url = https://github.com/HOST-Oman/libraqm/archive/v0.10.2/libraqm-0.10.2
33
source_filename = libraqm-0.10.2.tar.gz
44
source_hash = db68fd9f034fc40ece103e511ffdf941d69f5e935c48ded8a31590468e42ba72
55

6-
# This patch allows using our bundled FreeType.
7-
diff_files = libraqm-0.10.2-bundle-freetype.patch
6+
# First patch allows using our bundled FreeType.
7+
# Second patch is for latest SheenBidi.
8+
diff_files = libraqm-0.10.2-bundle-freetype.patch, libraqm-support-sheenbidi29.patch
89

910
[provide]
1011
libraqm-0.10.2 = libraqm_dep
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
From 520164c36c94daabc20f49ed1e9f30bf0674d8a1 Mon Sep 17 00:00:00 2001
2+
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
3+
Date: Wed, 16 Jul 2025 01:06:00 -0400
4+
Subject: [PATCH] Add support for SheenBidi 2.9
5+
6+
This release moved the main header from globally available to within a
7+
`SheenBidi` subdirectory.
8+
---
9+
meson.build | 6 ++++++
10+
src/raqm.c | 4 ++++
11+
2 files changed, 10 insertions(+)
12+
13+
diff --git a/meson.build b/meson.build
14+
index e4c8e93..34fffc7 100644
15+
--- a/meson.build
16+
+++ b/meson.build
17+
@@ -78,6 +78,12 @@ if get_option('sheenbidi')
18+
'sheenbidi',
19+
fallback: ['sheenbidi', 'sheenbidi_dep'],
20+
)
21+
+ if sheenbidi.version().version_compare('>= 2.9')
22+
+ sheenbidi = declare_dependency(
23+
+ compile_args: ['-DRAQM_SHEENBIDI_GT_2_9'],
24+
+ dependencies: sheenbidi
25+
+ )
26+
+ endif
27+
else
28+
fribidi = dependency(
29+
'fribidi',
30+
diff --git a/src/raqm.c b/src/raqm.c
31+
index fbeb172..2ded35b 100644
32+
--- a/src/raqm.c
33+
+++ b/src/raqm.c
34+
@@ -30,7 +30,11 @@
35+
#include <string.h>
36+
37+
#ifdef RAQM_SHEENBIDI
38+
+#ifdef RAQM_SHEENBIDI_GT_2_9
39+
+#include <SheenBidi/SheenBidi.h>
40+
+#else
41+
#include <SheenBidi.h>
42+
+#endif
43+
#else
44+
#include <fribidi.h>
45+
#endif

‎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.8
3-
source_url = https://github.com/Tehreer/SheenBidi/archive/refs/tags/v2.8/sheenbidi-2.8.tar.gz
4-
source_filename = sheenbidi-2.8.tar.gz
5-
source_hash =6f27d5f347447f593bde573e4cb477925f7ed96afa4f936e7852803e1ddf3fea
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

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp