From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Seiderer Date: Wed, 15 Mar 2017 22:18:23 +0100 Subject: [Buildroot] [PATCH v3] qt: add enable for truetype font installation In-Reply-To: <1489532236-21401-1-git-send-email-danomimanchego123@gmail.com> References: <1489532236-21401-1-git-send-email-danomimanchego123@gmail.com> Message-ID: <20170315221823.4c197ea4@gmx.net> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Hello Danomi, On Tue, 14 Mar 2017 18:57:16 -0400, Danomi Manchego wrote: > Currently, qt.mk installs DejaVu/Vera TrueType fonts when Qt is configured for > freetype support. However, some users may prefer to limit the installed fonts > to only Qt's prerendered fonts (micro, fixed, helvetica, etc.). Or, there may > be a preference to use seperately installed TrueType fonts. This commit adds > a switch to explicitly control the installation of the TrueType fonts, similar > to the existing prerendered font enables. > > Signed-off-by: Danomi Manchego > > --- > > Changes V2->V3: > - Add back some detail to commit log. (Thomas Petazzoni) > > Changes V1->V2: > - Drop detailed explanation from commit log. (Peter Seiderer) > - Rename option from ..DEJAVU to ..TRUETYPE. (Peter Seiderer) > - Replace depends-on test with equivalent but more verbose expression. (Peter Seiderer) > --- > package/qt/Config.in | 8 ++++++++ > package/qt/qt.mk | 2 +- > 2 files changed, 9 insertions(+), 1 deletion(-) > > diff --git a/package/qt/Config.in b/package/qt/Config.in > index fa5235d..294df0e 100644 > --- a/package/qt/Config.in > +++ b/package/qt/Config.in > @@ -185,6 +185,14 @@ endmenu > > menu "Fonts" > > +config BR2_PACAKGE_QT_FONT_TRUETYPE > + bool "dejavu/vera" > + depends on BR2_PACKAGE_QT_QTFREETYPE || BR2_PACKAGE_QT_SYSTEMFREETYPE > + default y > + > +comment "dejavu/vera fonts need freetype support" > + depends on !BR2_PACKAGE_QT_QTFREETYPE && !BR2_PACKAGE_QT_SYSTEMFREETYPE > + > config BR2_PACKAGE_QT_FONT_MICRO > bool "micro" > default y > diff --git a/package/qt/qt.mk b/package/qt/qt.mk > index e82bdfe8..cc478f1 100644 > --- a/package/qt/qt.mk > +++ b/package/qt/qt.mk > @@ -689,7 +689,7 @@ QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.Unifont > endif > endif # QT_FONTS > > -ifeq ($(BR2_PACKAGE_QT_QTFREETYPE)$(BR2_PACKAGE_QT_SYSTEMFREETYPE),y) > +ifeq ($(BR2_PACAKGE_QT_FONT_TRUETYPE),y) > define QT_INSTALL_TARGET_FONTS_TTF > mkdir -p $(TARGET_DIR)/usr/lib/fonts > cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts Reviewed-by: Peter Seiderer And thanks for the additional effort rewriting the commit message ;-) Regards, Peter