Skip to contentSkip to conversation

qtwebkit: Always enable icu in QT_CONFIG

PATCH New Andreas Oberritter 1 participant 2 messages Nov 30, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 qtwebkit: Always enable icu in QT_CONFIG

Allow qtwebkit to be built even if qtbase was configured without icu.

---
 recipes-qt/qt5/qtwebkit_git.bb | 3 +++
 1 file changed, 3 insertions(+)
recipes-qt/qt5/qtwebkit_git.bb +3 -0
index 78ca1f5..d0d7ee8 100644
@@ -64,6 +64,9 @@ do_configure_prepend() {
     sed -e 's/\s\(config_fontconfig: \)/ OE_FONTCONFIG_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
 }
 
+# Forcibly enable ICU, so qtbase doesn't need it.
+EXTRA_QMAKEVARS_PRE += "QT_CONFIG+=icu"
+
 # qtwebkit gets terribly big when linking with all debug info, disable by default
 QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0"
 EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}"
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/2 qtbase: Remove comments about ICU and QtWebKit

QtWebKit doesn't depend on icu in qtbase. It just didn't enable it manually before.

---
 recipes-qt/qt5/qtbase_git.bb | 5 -----
 1 file changed, 5 deletions(-)
recipes-qt/qt5/qtbase_git.bb +0 -5
index 223383d..6541973 100644
@@ -37,10 +37,6 @@ DEPENDS += "qtbase-native"
 RDEPENDS_${PN}-tools += "perl"
 
 # separate some parts of PACKAGECONFIG which are often changed
-# be aware that you need to add icu to build qtwebkit, default
-# PACKAGECONFIG is kept rather minimal for people who don't need
-# stuff like webkit (and it's easier to add options than remove)
-
 PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}"
 PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
 PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xsync xshape xrender xrandr xfixes xinput2 xcursor glib xkb', '', d)}"
@@ -124,7 +120,6 @@ PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb"
 PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb"
 PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm"
 PACKAGECONFIG[kms] = "-kms,-no-kms,virtual/mesa virtual/egl"
-# needed for qtwebkit
 PACKAGECONFIG[icu] = "-icu,-no-icu,icu"
 PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev"
 PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl"
Signature · 1 line
2.7.4