summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebkit_git.bb
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-02-22 14:51:05 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-04-20 10:06:37 +0000
commitf33be06035faaa59cee17e5a97e82d079b4ab444 (patch)
tree79d1a995808932b7e9fae144e2b13ddb0b4908a2 /recipes-qt/qt5/qtwebkit_git.bb
parentc7549747b6e83e9630ae37c7e2595e41e4f1ebac (diff)
downloadmeta-qt5-f33be06035faaa59cee17e5a97e82d079b4ab444.tar.gz
qt5: upgrade to 5.11 Alpha
* use qtwebkit and qtwebkit-examples from dev branch, because there is no 5.11 branch (there isn't 5.10 as well, but because nobranch=1 in qt5-git.inc nobody noticed). * qtbase: drop qml-debug options removed from qtbase in: commit 525f8516c2580018f910cfb99ab5e0e36bd55ab1 Author: Ulf Hermann <ulf.hermann@qt.io> Date: Fri Oct 6 16:27:09 2017 +0200 Subject: Remove qml-debug configure flag and feature * qtgraphicaleffects, qtquickcontrols2, qtquickcontrols, qtvirtualkeyboard: add qtdeclarative-native dependency needed for qmlcachegen binary * qtwebkit: update LIC_FILES_CHKSUM and remove PACKAGECONFIGs referenced files disappered in: commit 6882a04fb36642862b11efe514251d32070c3d65 Author: Konstantin Tokarev <annulen@yandex.ru> Date: Thu Aug 25 19:20:41 2016 +0300 Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebkit_git.bb')
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb42
1 files changed, 3 insertions, 39 deletions
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index c8e83281..36c967f4 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -3,9 +3,7 @@ require qt5-git.inc
3 3
4LICENSE = "BSD & LGPLv2+ | GPL-2.0" 4LICENSE = "BSD & LGPLv2+ | GPL-2.0"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
7 file://Source/WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \
8 file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
9 file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee \ 7 file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee \
10" 8"
11 9
@@ -26,13 +24,6 @@ ARM_INSTRUCTION_SET_armv7a = "thumb"
26ARM_INSTRUCTION_SET_armv7r = "thumb" 24ARM_INSTRUCTION_SET_armv7r = "thumb"
27ARM_INSTRUCTION_SET_armv7ve = "thumb" 25ARM_INSTRUCTION_SET_armv7ve = "thumb"
28 26
29# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.10
30# 5.10.meta-qt5.1
31SRC_URI += "\
32 file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \
33 file://0002-Exclude-backtrace-API-for-non-glibc-libraries.patch \
34"
35
36PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel \ 27PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel \
37 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxrender', '', d)} \ 28 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxrender', '', d)} \
38 fontconfig \ 29 fontconfig \
@@ -50,27 +41,6 @@ PACKAGECONFIG[fontconfig] = "OE_FONTCONFIG_ENABLED,,fontconfig"
50 41
51do_configure_prepend() { 42do_configure_prepend() {
52 export QMAKE_CACHE_EVAL="CONFIG+=${PACKAGECONFIG_CONFARGS}" 43 export QMAKE_CACHE_EVAL="CONFIG+=${PACKAGECONFIG_CONFARGS}"
53 # disable gstreamer-1.0 test if it isn't enabled by PACKAGECONFIG
54 sed -e 's/\s\(packagesExist(".*\<gstreamer-1.0\>.*")\)/ OE_GSTREAMER_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
55 # disable gstreamer-0.10 test if it isn't enabled by PACKAGECONFIG
56 sed -e 's/\s\(packagesExist(".*\<gstreamer-0.10\>.*")\)/ OE_GSTREAMER010_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
57 # disable qtlocation test if it isn't enabled by PACKAGECONFIG
58 sed -e 's/\s\(qtHaveModule(positioning)\)/ OE_QTLOCATION_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
59 # disable qtmultimedia test if it isn't enabled by PACKAGECONFIG
60 sed -e 's/(video):\(qtHaveModule(multimediawidgets)\)/(video):OE_QTMULTIMEDIA_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
61 # disable qtsensors test if it isn't enabled by PACKAGECONFIG
62 sed -e 's/\s\(qtHaveModule(sensors)\)/ OE_QTSENSORS_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
63 # disable qtwebchannel test if it isn't enabled by PACKAGECONFIG
64 sed -e 's/\s\(qtHaveModule(webchannel)\)/ OE_QTWEBCHANNEL_ENABLED:\1/' -i ${S}/Source/WebKit2/Target.pri
65 sed -e 's/\s\(qtHaveModule(webchannel)\)/ OE_QTWEBCHANNEL_ENABLED:\1/' -i ${S}/Source/WebKit2/WebKit2.pri
66 # disable libwebp test if it isn't enabled by PACKAGECONFIG
67 sed -e 's/\s\(config_libwebp: \)/ OE_LIBWEBP_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
68 # disable libxcomposite test if it isn't enabled by PACKAGECONFIG
69 sed -e 's/\s\(config_libXcomposite: \)/ OE_LIBXCOMPOSITE_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
70 # disable libxrender test if it isn't enabled by PACKAGECONFIG
71 sed -e 's/\s\(config_libXrender: \)/ OE_LIBXRENDER_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
72 # disable fontconfig test if it isn't enabled by PACKAGECONFIG
73 sed -e 's/\s\(config_fontconfig: \)/ OE_FONTCONFIG_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
74} 44}
75 45
76# Forcibly enable ICU, so qtbase doesn't need it. 46# Forcibly enable ICU, so qtbase doesn't need it.
@@ -80,12 +50,6 @@ EXTRA_QMAKEVARS_PRE += "QT_CONFIG+=icu"
80QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0" 50QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0"
81EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" 51EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}"
82 52
83do_install_append() {
84 # Remove paths to workdir, qtwebkit is dead now, so I won't spend extra time trying to prevent this
85 # from some .prl or .prf file like for other modules
86 sed -i 's@-Wl,-no-whole-archive -L${B}[^ ]* @ @g' ${D}${libdir}/pkgconfig/Qt5WebKit.pc
87}
88
89# remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe 53# remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe
90PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples" 54PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples"
91 55
@@ -95,6 +59,6 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
95RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" 59RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
96export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" 60export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
97 61
98QT_MODULE_BRANCH = "5.9" 62QT_MODULE_BRANCH = "dev"
99 63
100SRCREV = "bd0657f98aff85b9f06d85a8cf4da6a27f61a56e" 64SRCREV = "beaeeb99881184fd368c121fcbb1a31c78b794a3"