From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Fri, 11 Oct 2013 20:12:19 +0000 (+0200)
Subject: qtbase: Disable freetype by default
X-Git-Tag: rev_ivi_2015_02_04~993
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1263f2d3ea38078175ca775832920cba37ef5fe3;p=scm%2Fbb%2Ftizen-distro.git

qtbase: Disable freetype by default

* building qbasicfontdatabase fails without fontconfig enabled
  | /home/jenkins/webos-ports/workspace/webos-ports/tmp-eglibc/sysroots/a500/usr/include/ft2build.h:56:38:
    fatal error: freetype/config/ftheader.h: No such file or directory
  |  #include <freetype/config/ftheader.h>
  |                                       ^
  | compilation terminated.
  | make[2]: *** [.obj/release-shared/qbasicfontdatabase.o] Error 1
  | make[2]: *** Waiting for unfinished jobs....

(From meta-qt5 rev: 4c177a661fd1ef599835de56776b0ebda6d78e3c)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
---

diff --git a/meta-qt5/recipes-qt/qt5/qtbase.inc b/meta-qt5/recipes-qt/qt5/qtbase.inc
index d1831a1..b752a06 100644
--- a/meta-qt5/recipes-qt/qt5/qtbase.inc
+++ b/meta-qt5/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 ?= "freetype"
+PACKAGECONFIG_FONTS ?= ""
 PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib"
 PACKAGECONFIG_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
 PACKAGECONFIG_DISTRO ?= ""