From 69d2f31df603244dff240163df04133756a1a0d3 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Fri, 28 Feb 2014 21:15:05 +0100 Subject: [PATCH] qtbase/qtwebkit: drop ICU variable Pango doesn't seem to be a drop-in replacement for ICU, so using it as a dependency for the -icu option won't work. QtWebKit has a hard dependency on icu. Signed-off-by: Andreas Oberritter Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5.inc | 4 ---- recipes-qt/qt5/qtbase.inc | 2 +- recipes-qt/qt5/qtwebkit.inc | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index e2a1662121..dfc1c7674b 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -3,10 +3,6 @@ inherit qmake5 -# Qt5 is dependent on icu for localization -ICU = "icu " -ICU_powerpc = "pango" - PACKAGECONFIG_OPENSSL ?= "openssl" QT_MODULE ?= "${BPN}" diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 378f229b40..4fe6bd5e6f 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -116,7 +116,7 @@ PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb" PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm" PACKAGECONFIG[kms] = "-kms,-no-kms,kms" # needed for qtdeclarative (qtdeclarative.do_configure fails to find quick module without) -PACKAGECONFIG[icu] = "-icu,-no-icu,${ICU}" +PACKAGECONFIG[icu] = "-icu,-no-icu,icu" PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" # use -openssl-linked here to ensure that RDEPENDS for libcrypto and libssl are detected PACKAGECONFIG[openssl] = "-openssl-linked,-no-openssl,openssl" diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index aea9dad089..c35504e79c 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee" -DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3 glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt" +DEPENDS += "qtdeclarative qtlocation qtsensors icu ruby-native sqlite3 glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt" # qtwebkit gets terribly big when linking with all debug info, disable by default QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0"