Skip to contentSkip to conversation

gspd: disable qt4 support by default

PATCH New Martin Jansa 1 participant 2 messages Jan 7, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 gspd: disable qt4 support by default

* now with qt4 moved to separate meta-qt4 we shouldn't enable it by default

---
 meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb +1 -1
index 6ae2f30..f444ffc 100644
@@ -34,7 +34,7 @@ SYSTEMD_OESCONS = "${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false
 export STAGING_INCDIR
 export STAGING_LIBDIR
 
-PACKAGECONFIG ??= "qt ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
 PACKAGECONFIG[bluez] = "bluez='true',bluez='false',${BLUEZ}"
 PACKAGECONFIG[qt] = "qt='yes',qt='no',qt4-x11-free"
 EXTRA_OESCONS = " \
Signature · 1 line
2.7.0
#1 lore raw

PATCH 2/2 navit: disable qt4 support by default

* now with qt4 moved to separate meta-qt4 we shouldn't enable it by default

---
 meta-oe/recipes-navigation/navit/navit.inc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
meta-oe/recipes-navigation/navit/navit.inc +2 -3
index 26b91b3..1c0bfda 100644
@@ -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 \
Signature · 1 line
2.7.0