From patchwork Tue Mar 14 22:57:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danomi Manchego X-Patchwork-Id: 738973 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vjVW01cfKz9s1h for ; Wed, 15 Mar 2017 09:57:32 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DD0EB8853B; Tue, 14 Mar 2017 22:57:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nV5RbqZu9BEg; Tue, 14 Mar 2017 22:57:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 56FF688178; Tue, 14 Mar 2017 22:57:28 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 534491C1011 for ; Tue, 14 Mar 2017 22:57:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4ADFF88178 for ; Tue, 14 Mar 2017 22:57:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5_U1egpeOuQu for ; Tue, 14 Mar 2017 22:57:26 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from resqmta-ch2-02v.sys.comcast.net (resqmta-ch2-02v.sys.comcast.net [69.252.207.34]) by fraxinus.osuosl.org (Postfix) with ESMTPS id C78D38816D for ; Tue, 14 Mar 2017 22:57:26 +0000 (UTC) Received: from resomta-ch2-09v.sys.comcast.net ([69.252.207.105]) by resqmta-ch2-02v.sys.comcast.net with SMTP id nvMlcPtIbWRJ0nvNdch1TM; Tue, 14 Mar 2017 22:57:25 +0000 Received: from dmocelo-Aspire-E5-575G.hsd1.nj.comcast.net ([IPv6:2601:87:c200:2d0d:c416:72b2:547e:159b]) by resomta-ch2-09v.sys.comcast.net with SMTP id nvNYcrVQWQcYynvNcc0NiR; Tue, 14 Mar 2017 22:57:25 +0000 From: Danomi Manchego To: buildroot@buildroot.org Date: Tue, 14 Mar 2017 18:57:16 -0400 Message-Id: <1489532236-21401-1-git-send-email-danomimanchego123@gmail.com> X-Mailer: git-send-email 2.7.4 X-CMAE-Envelope: MS4wfMUtBQaODIZaTek5C1n31VDcaEOlVt+RU8NlnJjLh1EJTU7qbkno0lQg/TK0sayi+WzsEpak0aUNMRaop/Fkm8LhA0v9pQhWhO5LKqZ4YCzzdo/R3AWX PM6ilM1AUN8uM0nET/In1Z4uTs6tGL+jldtCGMLibX14Kfu5ljdpr913/gLh2CX3O3OiT1aDxuT8HJ5YXfDIBwsz2YQSNbDC1oz8wjfSEvVopsLKE1KI95Sb i5ZPqSs9BgIwTSfIj0wpYg== Subject: [Buildroot] [PATCH v3] qt: add enable for truetype font installation X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 Reviewed-by: Peter Seiderer --- 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