Patchwork [meta-qt5,2/2] qtbase: Disable fontconfig by default

login
register
mail settings
Submitter Martin Jansa
Date Oct. 10, 2013, 10:40 a.m.
Message ID <1381401639-20130-2-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/59605/
State Accepted, archived
Headers show

Comments

Martin Jansa - Oct. 10, 2013, 10:40 a.m.
* it was explicitly disabled in
  commit 1b14686657cddcc5bb37a5c7db8a35f1c4903ee3
  Author: Philip Craig <phil@blackmoth.com.au>
  Date:   Wed Jun 26 02:13:02 2013 +0000
  Subject: qtbase: disable fontconfig support by default
* and then accidentaly enabled with PACKAGECONFIG changes
  commit ebdd83f6b7e5c3296e5ebd3b7b0c1e0defe5aba5
  Author: Martin Jansa <Martin.Jansa@gmail.com>
  Date:   Sat Jul 20 00:02:57 2013 +0200
  Subject: qtbase: explicitly enable or disable all deps
* Thanks to Nicolas Dechesne for reporting it

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes-qt/qt5/qtbase.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 559f54d..d1831a1 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -40,7 +40,7 @@  RDEPENDS_${PN}-tools += "perl"
 PACKAGECONFIG_GL ?= "${@base_contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}"
 PACKAGECONFIG_FB ?= "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
 PACKAGECONFIG_X11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'xcb xvideo xsync xshape xrender xrandr xfixes xinput2 xinput xinerama xcursor gtkstyle', '', d)}"
-PACKAGECONFIG_FONTS ?= "fontconfig freetype"
+PACKAGECONFIG_FONTS ?= "freetype"
 PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib"
 PACKAGECONFIG_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
 PACKAGECONFIG_DISTRO ?= ""