aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2018-09-28 08:58:39 -0400
committerWladimir J. van der Laan <laanwj@gmail.com>2018-09-29 14:24:02 +0200
commit480d6bb07832576c7e861ef8d65405938605c5f8 (patch)
tree87b9d07bb69c9c51498aabe2257f0c44dc016eac
parentc64128df5882e8dc1f76ae7c1e998ed57b8645fe (diff)
depends: fix bitcoin-qt back-compat with older freetype versions at runtime
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. Github-Pull: #14348 Rebased-From: 430bf6c7a1a24a59050e7c9dac56b64b820edb43 Tree-SHA512: fd22b824e7251a7975d9e9222eff06d2b04ebf30e13aeccab580596c042b3abe2f62da1f0ef75106b0b171368ee1062ef2f459cfa435aa54826766a9005b80df
-rw-r--r--depends/packages/qt.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 65ecadb43b..113b8dbc3b 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -119,6 +119,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 && \