From f4af792fb4e79d6d5f4ed3bbe80dc82353d3a014 Mon Sep 17 00:00:00 2001 From: langerhans Date: Sat, 20 Jan 2018 11:11:56 -0800 Subject: [PATCH 1/3] Re-add printer support to Qt --- depends/packages/qt.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 045ec4862f5..2b0afc5503b 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -78,8 +78,6 @@ $(package)_config_opts += -reduce-exports $(package)_config_opts += -static $(package)_config_opts += -silent $(package)_config_opts += -v -$(package)_config_opts += -no-feature-printer -$(package)_config_opts += -no-feature-printdialog ifneq ($(build_os),darwin) $(package)_config_opts_darwin = -xplatform macx-clang-linux From 7e513bbf73ce3df5b224a865899915ced8d209bb Mon Sep 17 00:00:00 2001 From: langerhans Date: Sat, 20 Jan 2018 11:12:06 -0800 Subject: [PATCH 2/3] Set fixed size for paper wallet dialog --- src/qt/utilitydialog.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index 3c154b8071f..e25e8cf7bc0 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -208,6 +208,7 @@ PaperWalletDialog::PaperWalletDialog(QWidget *parent) : ui->privateKeyText->setFont(font); ui->addressText->setAlignment(Qt::AlignJustify); ui->privateKeyText->setAlignment(Qt::AlignJustify); + setFixedSize(size()); } void PaperWalletDialog::setClientModel(ClientModel *_clientModel) From 0c61d5734390770cc10ecb0a0347eb5b8225f1d7 Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Wed, 2 Aug 2017 18:50:34 -0400 Subject: [PATCH 3/3] depends: fix fontconfig with newer glibc See comment for more detail --- depends/packages/fontconfig.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/depends/packages/fontconfig.mk b/depends/packages/fontconfig.mk index fb97e0b9ec1..12695db4b9f 100644 --- a/depends/packages/fontconfig.mk +++ b/depends/packages/fontconfig.mk @@ -13,7 +13,13 @@ define $(package)_config_cmds $($(package)_autoconf) endef +# 2.12.1 uses CHAR_WIDTH which is reserved and clashes with some glibc versions, but newer versions of fontconfig +# have broken makefiles which needlessly attempt to re-generate headers with gperf. +# Instead, change all uses of CHAR_WIDTH, and disable the rule that forces header re-generation. +# This can be removed once the upstream build is fixed. define $(package)_build_cmds + sed -i 's/CHAR_WIDTH/CHARWIDTH/g' fontconfig/fontconfig.h src/fcobjshash.gperf src/fcobjs.h src/fcobjshash.h && \ + sed -i 's/fcobjshash.h: fcobjshash.gperf/fcobjshash.h:/' src/Makefile && \ $(MAKE) endef