[v3] qt: add enable for truetype font installation

Submitted by Danomi Manchego on March 14, 2017, 10:57 p.m.

Details

Message ID 1489532236-21401-1-git-send-email-danomimanchego123@gmail.com
State Superseded
Headers show

Commit Message

Danomi Manchego March 14, 2017, 10:57 p.m.
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 <danomimanchego123@gmail.com>

---

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(-)

Comments

Peter Seiderer March 15, 2017, 9:18 p.m.
Hello Danomi,

On Tue, 14 Mar 2017 18:57:16 -0400, Danomi Manchego <danomimanchego123@gmail.com> 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 <danomimanchego123@gmail.com>
> 
> ---
> 
> 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 <ps.report@gmx.net>

And thanks for the additional effort rewriting the commit message ;-)

Regards,
Peter

Patch hide | download patch | download mbox

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