aboutsummaryrefslogtreecommitdiff
path: root/depends/packages/qt.mk
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2020-08-18 15:20:27 +0800
committerfanquake <fanquake@gmail.com>2020-08-25 14:37:45 +0800
commitc723e4176ee3c1c2391a7c43b094a315bdd3c72e (patch)
tree134f66e0199c275bd9e7cbad3854bbfc1efd970c /depends/packages/qt.mk
parent3aaa39d436aa32489aa136d6b3d714220535ec1e (diff)
downloadbitcoin-c723e4176ee3c1c2391a7c43b094a315bdd3c72e.tar.xz
build: replace FreeType back-compat sed with a patch in qt package
Diffstat (limited to 'depends/packages/qt.mk')
-rw-r--r--depends/packages/qt.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index f5e7b21e18..596903d324 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -11,6 +11,7 @@ $(package)_qt_libs=corelib network widgets gui plugins testlib
$(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch
$(package)_patches+= fix_rcc_determinism.patch fix_riscv64_arch.patch xkb-default.patch no-xlib.patch
$(package)_patches+= fix_android_qmake_conf.patch fix_android_jni_static.patch dont_hardcode_pwd.patch
+$(package)_patches+= freetype_back_compat.patch
# Update OSX_QT_TRANSLATIONS when this is updated
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
@@ -192,7 +193,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 && \
+ patch -p1 -i $($(package)_patch_dir)/freetype_back_compat.patch && \
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 && \
patch -p1 -i $($(package)_patch_dir)/dont_hardcode_pwd.patch &&\