Skip to content

Commit 4182ad7

Browse files
committed
Merge branch 'feature-update-harfbuzz' into testing-testapps-rework
2 parents c0c3fa8 + 6137f31 commit 4182ad7

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

pythonforandroid/recipes/harfbuzz/__init__.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ class HarfbuzzRecipe(Recipe):
2020
https://sourceforge.net/projects/freetype/files/freetype2/2.5.3/
2121
"""
2222

23-
version = '0.9.40'
24-
url = 'http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-{version}.tar.bz2' # noqa
23+
version = '2.6.4'
24+
url = 'http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-{version}.tar.xz' # noqa
2525
opt_depends = ['freetype']
2626
built_libraries = {'libharfbuzz.so': 'src/.libs'}
2727

@@ -50,15 +50,17 @@ def build_arch(self, arch):
5050
configure = sh.Command('./configure')
5151
shprint(
5252
configure,
53-
'--without-icu',
5453
'--host={}'.format(arch.command_prefix),
5554
'--prefix={}'.format(self.get_build_dir(arch.arch)),
5655
'--with-freetype={}'.format(
5756
'yes'
5857
if 'freetype' in self.ctx.recipe_build_order
5958
else 'no'
6059
),
61-
'--without-glib',
60+
'--with-icu=no',
61+
'--with-cairo=no',
62+
'--with-fontconfig=no',
63+
'--with-glib=no',
6264
_env=env,
6365
)
6466
shprint(sh.make, '-j', str(cpu_count()), _env=env)

0 commit comments

Comments
 (0)