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 <obi@opendreambox.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
parent
deb2473ee9
commit
69d2f31df6
|
@ -3,10 +3,6 @@
|
||||||
|
|
||||||
inherit qmake5
|
inherit qmake5
|
||||||
|
|
||||||
# Qt5 is dependent on icu for localization
|
|
||||||
ICU = "icu "
|
|
||||||
ICU_powerpc = "pango"
|
|
||||||
|
|
||||||
PACKAGECONFIG_OPENSSL ?= "openssl"
|
PACKAGECONFIG_OPENSSL ?= "openssl"
|
||||||
|
|
||||||
QT_MODULE ?= "${BPN}"
|
QT_MODULE ?= "${BPN}"
|
||||||
|
|
|
@ -116,7 +116,7 @@ PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb"
|
||||||
PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm"
|
PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm"
|
||||||
PACKAGECONFIG[kms] = "-kms,-no-kms,kms"
|
PACKAGECONFIG[kms] = "-kms,-no-kms,kms"
|
||||||
# needed for qtdeclarative (qtdeclarative.do_configure fails to find quick module without)
|
# 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"
|
PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev"
|
||||||
# use -openssl-linked here to ensure that RDEPENDS for libcrypto and libssl are detected
|
# use -openssl-linked here to ensure that RDEPENDS for libcrypto and libssl are detected
|
||||||
PACKAGECONFIG[openssl] = "-openssl-linked,-no-openssl,openssl"
|
PACKAGECONFIG[openssl] = "-openssl-linked,-no-openssl,openssl"
|
||||||
|
|
|
@ -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/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
|
||||||
file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee"
|
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 gets terribly big when linking with all debug info, disable by default
|
||||||
QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0"
|
QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0"
|
||||||
|
|
Loading…
Reference in New Issue