mirror of
http://code.qt.io/yocto/meta-qt6.git
synced 2026-01-01 13:58:07 +00:00
qtwebengine: update to 94-based chromium
QtWebEngine based on 94 chromium can be build with python3.
Remove all references to python2 and its meta layer.
Latest oe-core has version of ICU, freetype, harfbuzz and ffmpeg
that are not compatible with Chromium. Disable those PACKAGECONFIGs
by default.
Cherry-picked without qtpdf which is not supported on lts-6.2.
Change-Id: Ie2e38db14df0f51aaa87ecde7e0487b31be0bddd
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 57b22c6ea0)
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
This commit is contained in:
parent
c51ee614ce
commit
72cf04bedb
|
|
@ -8,7 +8,6 @@ URI: https://git.openembedded.org/openembedded-core/
|
|||
and optionally:
|
||||
|
||||
URI: https://git.openembedded.org/meta-openembedded/
|
||||
URI: https://git.openembedded.org/meta-python2
|
||||
|
||||
Yocto version support
|
||||
---------------------
|
||||
|
|
|
|||
|
|
@ -130,7 +130,6 @@ instructions:
|
|||
bitbake-layers add-layer ../meta-openembedded/meta-python
|
||||
bitbake-layers add-layer ../meta-openembedded/meta-multimedia
|
||||
bitbake-layers add-layer ../meta-mingw
|
||||
bitbake-layers add-layer ../meta-python2
|
||||
bitbake-layers add-layer ${SOURCE_DIR}
|
||||
|
||||
for conf in ${TEST_CONFIGS}; do
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ require recipes-qt/qt6/qtwebengine.inc
|
|||
inherit native
|
||||
|
||||
OECMAKE_SOURCEPATH = "${S}/src/gn"
|
||||
OECMAKE_TARGET_COMPILE = "gn"
|
||||
|
||||
cmake_do_install() {
|
||||
eval DESTDIR='${D}' ${CMAKE_VERBOSE} cmake --install '${B}'
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
LICENSE = "BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( LGPL-3.0-only | The-Qt-Company-Commercial )"
|
||||
LICENSE = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( LGPL-3.0 | The-Qt-Company-Commercial )"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://src/3rdparty/chromium/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \
|
||||
file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \
|
||||
file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
|
||||
file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
|
||||
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
|
||||
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
|
||||
file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
|
|
@ -16,20 +16,14 @@ include recipes-qt/qt6/qt6.inc
|
|||
|
||||
inherit gettext
|
||||
inherit perlnative
|
||||
|
||||
inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "pythonnative", "", d)}
|
||||
|
||||
python() {
|
||||
if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
|
||||
raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
|
||||
}
|
||||
inherit python3native
|
||||
|
||||
# we don't want gettext.bbclass to append --enable-nls
|
||||
def gettext_oeconf(d):
|
||||
return ""
|
||||
|
||||
QT_MODULE = "qtwebengine"
|
||||
QT_MODULE_BRANCH_CHROMIUM = "90-based"
|
||||
QT_MODULE_BRANCH_CHROMIUM = "94-based"
|
||||
|
||||
FILESEXTRAPATHS:prepend := "${THISDIR}/qtwebengine:"
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ DEPENDS += " \
|
|||
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxcursor libxi libxrandr libxtst libxkbfile', '', d)} \
|
||||
qtbase qtdeclarative qtdeclarative-native \
|
||||
gn-native \
|
||||
python3-html5lib-native \
|
||||
"
|
||||
|
||||
EXTRA_OECMAKE += "\
|
||||
|
|
@ -25,10 +26,7 @@ SECURITY_STRINGFORMAT = ""
|
|||
|
||||
PACKAGECONFIG ??= "\
|
||||
${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)} \
|
||||
freetype \
|
||||
glib \
|
||||
harfbuzz \
|
||||
icu \
|
||||
libevent \
|
||||
libjpeg \
|
||||
libpci \
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user