From f74faae1642bfae131c60db84eb91e75aa9bd2ce Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 7 Jan 2016 16:49:28 +0100 Subject: [PATCH] navit: disable qt4 support by default * now with qt4 moved to separate meta-qt4 we shouldn't enable it by default Signed-off-by: Martin Jansa --- meta-oe/recipes-navigation/navit/navit.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-navigation/navit/navit.inc b/meta-oe/recipes-navigation/navit/navit.inc index 26b91b3da9..1c0bfdaae0 100644 --- a/meta-oe/recipes-navigation/navit/navit.inc +++ b/meta-oe/recipes-navigation/navit/navit.inc @@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ed539d099d6ce08de6ea0dfed9ecb333 \ SECTION = "x11/applications" DEPENDS = "glib-2.0 gd gypsy librsvg-native" RDEPENDS_${PN} = " ${PN}-icons ${PN}-config " -RDEPENDS_${PN}-gui-qml = "qt4-plugin-imageformat-svg" RRECOMMENDS_${PN} = "gpsd ${PN}-dbus ${PN}-speech-cmdline ${PN}-gui-internal ${PN}-graphics-gtk" RSUGGESTS_${PN} = "flite-alsa espeak ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-qt ${PN}-maptool" @@ -20,12 +19,12 @@ PNBLACKLIST[navit] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 inherit autotools gettext pkgconfig -PACKAGECONFIG ?= "qt" +PACKAGECONFIG ?= "" PACKAGECONFIG[fribidi] = "--enable-fribidi,--disable-fribidi,fribidi" PACKAGECONFIG[imlib2] = "--enable-imlib2,--disable-imlib2,imlib2" PACKAGECONFIG[sdl] = "--enable-graphics-sdl,--disable-graphics-sdl,libsdl" PACKAGECONFIG[gtk] = "--enable-graphics-gtk-drawing-area --enable-gui-gtk,--disable-graphics-gtk-drawing-area --disable-gui-gtk,gtk+" -PACKAGECONFIG[qt] = "--enable-graphics-qt-qpainter --enable-gui-qml,--disable-graphics-qt-qpainter --disable-gui-qml,qt4-x11-free" +PACKAGECONFIG[qt] = "--enable-graphics-qt-qpainter --enable-gui-qml,--disable-graphics-qt-qpainter --disable-gui-qml,qt4-x11-free,qt4-plugin-imageformat-svg" EXTRA_OECONF += " \ --disable-binding-python \