diff options
| author | Cory Fields <[email protected]> | 2018-09-28 08:58:39 -0400 |
|---|---|---|
| committer | Cory Fields <[email protected]> | 2018-09-28 09:04:13 -0400 |
| commit | 430bf6c7a1a24a59050e7c9dac56b64b820edb43 (patch) | |
| tree | 47cc478ab82120835f3e851f6781bad267cb2890 | |
| parent | Merge #14310: [wallet] Ensure wallet is unlocked before signing (diff) | |
| download | discoin-430bf6c7a1a24a59050e7c9dac56b64b820edb43.tar.xz discoin-430bf6c7a1a24a59050e7c9dac56b64b820edb43.zip | |
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.
| -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 5286f89c3..d15f147cd 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 && \ |