diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-02-19 14:12:59 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-05-06 12:48:05 +0200 |
| commit | 0e5756c97ace089ddd9714f0eafffd71dd15c6ab (patch) | |
| tree | 6ae1b404abfe8879f6634c64c09f09bd2137c6e5 | |
| parent | 8034aa98076649e452798ff23285249dac7f19fc (diff) | |
qtwebkit: add PACKAGECONFIGs for libxcomposite, libxrender, fontconfig
* fixes following QA:
WARNING: qtwebkit-5.6.99+5.7.0-alpha+gitAUTOINC+e9b369b16f-r0 do_package_qa: QA Issue: qtwebkit rdepends on libxcomposite, but it isn't a build dependency? [build-deps]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtwebkit_git.bb | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 22efe82b..58b86c8a 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -24,7 +24,10 @@ SRC_URI += "\ file://0003-Exclude-backtrace-API-for-non-glibc-libraries.patch \ " -PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel" +PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxrender', '', d)} \ + fontconfig \ +" PACKAGECONFIG[gstreamer] = "OE_GSTREAMER_ENABLED,,gstreamer1.0 gstreamer1.0-plugins-base" PACKAGECONFIG[gstreamer010] = "OE_GSTREAMER010_ENABLED,,gstreamer gst-plugins-base" PACKAGECONFIG[qtlocation] = "OE_QTLOCATION_ENABLED,,qtlocation" @@ -32,6 +35,9 @@ PACKAGECONFIG[qtmultimedia] = "OE_QTMULTIMEDIA_ENABLED,,qtmultimedia" PACKAGECONFIG[qtsensors] = "OE_QTSENSORS_ENABLED,,qtsensors" PACKAGECONFIG[qtwebchannel] = "OE_QTWEBCHANNEL_ENABLED,,qtwebchannel" PACKAGECONFIG[libwebp] = "OE_LIBWEBP_ENABLED,,libwebp" +PACKAGECONFIG[libxcomposite] = "OE_LIBXCOMPOSITE_ENABLED,,libxcomposite" +PACKAGECONFIG[libxrender] = "OE_LIBXRENDER_ENABLED,,libxrender" +PACKAGECONFIG[fontconfig] = "OE_FONTCONFIG_ENABLED,,fontconfig" do_configure_prepend() { export QMAKE_CACHE_EVAL="CONFIG+=${PACKAGECONFIG_CONFARGS}" @@ -50,6 +56,12 @@ do_configure_prepend() { sed -e 's/\s\(qtHaveModule(webchannel)\)/ OE_QTWEBCHANNEL_ENABLED:\1/' -i ${S}/Source/WebKit2/WebKit2.pri # disable libwebp test if it isn't enabled by PACKAGECONFIG sed -e 's/\s\(config_libwebp: \)/ OE_LIBWEBP_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf + # disable libxcomposite test if it isn't enabled by PACKAGECONFIG + sed -e 's/\s\(config_libXcomposite: \)/ OE_LIBXCOMPOSITE_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf + # disable libxrender test if it isn't enabled by PACKAGECONFIG + sed -e 's/\s\(config_libXrender: \)/ OE_LIBXRENDER_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf + # disable fontconfig test if it isn't enabled by PACKAGECONFIG + sed -e 's/\s\(config_fontconfig: \)/ OE_FONTCONFIG_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf } # qtwebkit gets terribly big when linking with all debug info, disable by default |