Merge remote-tracking branch 'qtyocto/upstream/master' into 5.9

* qtyocto/upstream/master:

  qtwebengine: add patch for long paths
  qtwebengine: update 0004-Force-host-toolchain-configuration.patch
  qtwebengine: fix build with glibc-2.26
  qt: upgrade to latest revision in 5.9 branch
  qt: refresh remaining patches and add links to meta-qt5 repos
  qtwebengine: add a fix for building demobrowser without printing support
  Upgrade to Qt 5.9.0
  qtbase, qtgraphicaleffect, qtmultimedia, qtscript, qtlocation, qtwayland:
     disable gold to work around binutils bug
  qtwebengine: disable SECURITY_STRINGFORMAT to fix the build
  meta-toolchain-qt5: don't rely on COREBASE/LICENSE
  qtbase: fix Krogoth build regression from efa8aaf
  qt3d: refresh patches
  qtwebengine: refresh patches
  qtbase: refresh the patches
  gstreamer1.0-plugins-bad: add qt5 packageconfig
  qtbase: remove qtbase-native from DEPENDS
  qt3d: Fix build with clang
  qtwebkit: Backport a patch to fix build with icu-59
  quazip: update to 0.7.3 and add missing metadata
  qtbase: Use sched_yield instead of pthread_yield
  qtbase: Fix ptests with clang
  qt5-ptest: fix build with yocto < 2.3 (pyro)
  qtbase: add ptest
  qwt-qt5.inc: fix QA warning
  qt5-git.inc: set CVE_PRODUCT to qt
  python-pyqt5: include QtWidgets module
  qt5-creator: Link with libexecinfo on musl
  qtvirtualkeyboard: Include sys/time.h
  qtwebengine: Fix build on musl
  qt5-creator: Fix build with NO_ACCESSIBILITY
  maliit-framework-qt5: Always have optimize flags
  qtbase-native: Fix qdbuscpp2xml segfault
  qt5-ptest.inc: append do_populate_sysroot only for target
  qtwebengine: fix build with gcc7
  qwt-qt5: Fix rpath issues
  qtquickcontrols2: fix compilation of examples/texteditor
  qtquick1: add ptest
  qtdeclarative: add ptest
  qtxmlpatterns: add ptest
  qt5: add qt5-ptest.inc

QtSystems module not updated as newer version fails to build
with Yocto.

Conflicts:
  recipes-qt/qt5/nativesdk-qtbase_git.bb
  recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
  recipes-qt/qt5/qt3d_git.bb
  recipes-qt/qt5/qtbase-native_git.bb
  recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
  recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch
  recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch
  recipes-qt/qt5/qtbase_git.bb
  recipes-qt/qt5/qtcharts_git.bb
  recipes-qt/qt5/qtdeclarative_git.bb
  recipes-qt/qt5/qtenginio_git.bb
  recipes-qt/qt5/qtgraphicaleffects_git.bb
  recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch
  recipes-qt/qt5/qtlocation_git.bb
  recipes-qt/qt5/qtmultimedia_git.bb
  recipes-qt/qt5/qtquick1_git.bb
  recipes-qt/qt5/qtquickcontrols_git.bb
  recipes-qt/qt5/qtremoteobjects_git.bb
  recipes-qt/qt5/qtscript_git.bb
  recipes-qt/qt5/qtsensors_git.bb
  recipes-qt/qt5/qtsvg_git.bb
  recipes-qt/qt5/qttools_git.bb
  recipes-qt/qt5/qtwayland_git.bb
  recipes-qt/qt5/qtwebchannel_git.bb
  recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch
  recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
  recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch
  recipes-qt/qt5/qtwebengine_git.bb
  recipes-qt/qt5/qtwebkit-examples_git.bb
  recipes-qt/qt5/qtwebkit_git.bb
  recipes-qt/qt5/qtwebsockets_git.bb
  recipes-qt/qt5/qtwebview_git.bb

Task-number: QTBUG-62635
Change-Id: I32dbc0b9c26916d57865a08ec6d55cd175c28fd0

1 files changed, 55 insertions, 5 deletions

diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 0b559174..6e5a34cc 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -16,7 +16,7 @@ DEPENDS += " \
     ninja-native \
     yasm-native \
     qtwebchannel \
-    qtbase qtdeclarative qtxmlpatterns qtquickcontrols \
+    qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtquickcontrols2 \
     qtlocation \
     libdrm fontconfig pixman openssl pango cairo icu pciutils \
     libcap \
@@ -24,9 +24,23 @@ DEPENDS += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \
 "
 
-EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm GYP_CONFIG+=generate_character_data=0"
+DEPENDS_append_libc-musl = " libexecinfo"
+
+EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm \
+                        GYP_CONFIG+=generate_character_data=0 \
+                        GYP_CONFIG+=use_allocator=none \
+                        GYP_CONFIG+=use_experimental_allocator_shim=false \
+"
 EXTRA_QMAKEVARS_CONFIGURE += "-feature-system-ninja -no-feature-system-gn"
 
+# chromium/third_party/openh264/openh264.gyp adds
+# -Wno-format to openh264_cflags_add
+# similarly chromium/third_party/openh264/BUILD.gn for newer qtwebengine
+# causing following error, because -Wformat-security cannot be used together with -Wno-format
+# cc1plus: error: -Wformat-security ignored without -Wformat [-Werror=format-security]
+# http://errors.yoctoproject.org/Errors/Details/150333/
+SECURITY_STRINGFORMAT = ""
+
 # To use system ffmpeg you need to enable also libwebp, opus, vpx											    
 # Only depenedencies available in oe-core are enabled by default
 PACKAGECONFIG ??= "libwebp flac libevent libxslt speex nss"
@@ -39,6 +53,7 @@ PACKAGECONFIG[libevent] = "WEBENGINE_CONFIG+=use_system_libevent,,libevent"
 PACKAGECONFIG[libxslt] = "WEBENGINE_CONFIG+=use_system_libxslt,,libxslt"
 PACKAGECONFIG[speex] = "WEBENGINE_CONFIG+=use_system_speex,,speex"
 PACKAGECONFIG[vpx] = "WEBENGINE_CONFIG+=use_system_vpx,,libvpx"
+PACKAGECONFIG[webrtc] = "WEBENGINE_CONFIG+=use_webrtc,,libvpx"
 PACKAGECONFIG[nss] = "WEBENGINE_CONFIG+=use_nss,,nss"
 
 EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
@@ -88,6 +103,13 @@ do_configure() {
         ${EXTRA_QMAKEVARS_CONFIGURE}
 }
 
+do_configure_prepend_libc-musl() {
+        for f in `find ${S}/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/ -name config.h -o -name config.asm`; do
+                sed -i -e "s:define HAVE_SYSCTL 1:define HAVE_SYSCTL 0:g" $f
+        done
+        sed -i -e "s:define HAVE_STRUCT_MALLINFO 1:/*undef HAVE_STRUCT_MALLINFO */:g" ${S}/src/3rdparty/chromium/third_party/tcmalloc/chromium/src/config_linux.h
+}
+
 do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+"
 
 do_install_append() {
@@ -106,11 +128,39 @@ RDEPENDS_${PN}-examples += " \
 
 QT_MODULE_BRANCH_CHROMIUM = "56-based"
 
+# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9
+# 5.9.meta-qt5.3
 SRC_URI += " \
     ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
-    file://0001-Force-host-toolchain-configuration.patch \
-    file://0001-chromium-workaround-for-too-long-.rps-file-name.patch \
-    file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \
+    file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \
+    file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \
+    file://0003-Include-dependency-to-QCoreApplication-translate.patch \
+    file://0004-Force-host-toolchain-configuration.patch \
+    file://0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch \
+"
+
+# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based 
+# 56-based.meta-qt5.2
+SRC_URI += " \
+    file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \
+    file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \
+    file://0003-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
+"
+
+SRC_URI_append_libc-musl = "\
+    file://0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \
+    file://0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \
+    file://0006-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \
+    file://0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \
+    file://0008-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \
+    file://0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \
+    file://0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \
+    file://0011-chromium-musl-Match-syscalls-to-match-musl.patch;patchdir=src/3rdparty \
+    file://0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \
+    file://0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \
+    file://0014-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \
+    file://0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \
+    file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \
 "
 
 SRCREV_qtwebengine = "0f6908b5f9eca09cf086410344a862b9d59ef727"