diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-10-10 12:37:26 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-10-10 12:39:36 +0200 |
commit | af6014e3bc82b0f9998978819e217b6e020ccdc0 (patch) | |
tree | be33310c60e0805754dda1a47fc89b59bd4d33ed | |
parent | 3e95350611d0e58e4e773c9b3b004a7a161f94f7 (diff) | |
download | meta-qt5-af6014e3bc82b0f9998978819e217b6e020ccdc0.tar.gz |
qtbase: Disable fontconfig by default
* 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>
-rw-r--r-- | recipes-qt/qt5/qtbase.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 559f54d4..d1831a1a 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc | |||
@@ -40,7 +40,7 @@ RDEPENDS_${PN}-tools += "perl" | |||
40 | PACKAGECONFIG_GL ?= "${@base_contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" | 40 | PACKAGECONFIG_GL ?= "${@base_contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" |
41 | PACKAGECONFIG_FB ?= "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" | 41 | PACKAGECONFIG_FB ?= "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" |
42 | PACKAGECONFIG_X11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'xcb xvideo xsync xshape xrender xrandr xfixes xinput2 xinput xinerama xcursor gtkstyle', '', d)}" | 42 | PACKAGECONFIG_X11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'xcb xvideo xsync xshape xrender xrandr xfixes xinput2 xinput xinerama xcursor gtkstyle', '', d)}" |
43 | PACKAGECONFIG_FONTS ?= "fontconfig freetype" | 43 | PACKAGECONFIG_FONTS ?= "freetype" |
44 | PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" | 44 | PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" |
45 | PACKAGECONFIG_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" | 45 | PACKAGECONFIG_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" |
46 | PACKAGECONFIG_DISTRO ?= "" | 46 | PACKAGECONFIG_DISTRO ?= "" |