diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-09-29 14:22:57 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-09-29 14:23:21 +0200 |
| commit | c9327306b580bb161d1732c0a0260b46c0df015c (patch) | |
| tree | 63f7898da000a7969391a53782b3707470ba8bd6 | |
| parent | 0809e68a9084630ff4d11ec0503a3d0ab52bc6d7 (diff) | |
| parent | 430bf6c7a1a24a59050e7c9dac56b64b820edb43 (diff) | |
Merge #14348: depends: fix bitcoin-qt back-compat with older freetype versions at runtime
430bf6c7a1a24a59050e7c9dac56b64b820edb43 depends: fix bitcoin-qt back-compat with older freetype versions at runtime (Cory Fields)
Pull request description:
Fixes #14339. Thanks to @fanquake for confirming.
A few years ago, libfreetype introduced ```FT_Get_Font_Format()``` as an alias for ```FT_Get_X11_Font_Format()```, but ```FT_Get_X11_Font_Format()``` was kept for abi backwards-compatibility.
Our qt bump to 5.9 introduced a call to```FT_Get_Font_Format()```. Replace it with ```FT_Get_X11_Font_Format()``` in order to remain compatibile with older freetype, which is still used by e.g. Ubuntu Trusty.
Needs 0.17 backport.
Tree-SHA512: 89c7b268c7d397c5195f5fb6f27473dbf5bdd6c85f7c6f6b35b49c719df1dbc117e105275f1d31bc2b80fecf5f8a852dc89247c4e4537a788f8e76ad34c72d64
| -rw-r--r-- | depends/packages/qt.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 5286f89c30..d15f147cd7 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -120,6 +120,7 @@ define $(package)_extract_cmds endef define $(package)_preprocess_cmds + sed -i.old "s|FT_Get_Font_Format|FT_Get_X11_Font_Format|" qtbase/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp && \ sed -i.old "s|updateqm.commands = \$$$$\$$$$LRELEASE|updateqm.commands = $($(package)_extract_dir)/qttools/bin/lrelease|" qttranslations/translations/translations.pro && \ sed -i.old "/updateqm.depends =/d" qttranslations/translations/translations.pro && \ sed -i.old "s/src_plugins.depends = src_sql src_network/src_plugins.depends = src_network/" qtbase/src/src.pro && \ |