From 3ae86cb32edd1449f702e0a094929ae9b21ce191 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 12 Jun 2017 18:32:35 -0400 Subject: qtbase: respect "ld-is-gold" DISTRO_FEATURES If not set explicitly, some modules like QtWebKit and QtQuick1 can fail: | make[2]: Entering directory '/OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/build/Source' | rm -f libQt5WebKit.so.5.8.0 libQt5WebKit.so libQt5WebKit.so.5 libQt5WebKit.so.5.8 | linking ../lib/libQt5WebKit.so.5.8.0 | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `__bss_start' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `__bss_start' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `_edata' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `_edata' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `_end' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `_end' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Gui.so:(*IND*+0x0): multiple definition of `__bss_start' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Gui.so:(*IND*+0x0): multiple definition of `_edata' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Gui.so:(*IND*+0x0): multiple definition of `_end' | collect2: error: ld returned 1 exit status | Makefile.api:92: recipe for target '../lib/libQt5WebKit.so.5.8.0' failed | make[2]: *** [../lib/libQt5WebKit.so.5.8.0] Error 1 | make[2]: Leaving directory '/OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/build/Source' | Makefile.QtWebKit:44: recipe for target 'sub-api-pri-make_first-ordered' failed | make[1]: *** [sub-api-pri-make_first-ordered] Error 2 Signed-off-by: Denys Dmytriyenko Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 27d0de1a..5cfbcfa9 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -126,6 +126,7 @@ PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput" PACKAGECONFIG[journald] = "-journald,-no-journald,systemd" QT_CONFIG_FLAGS += " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-use-gold-linker', '-no-use-gold-linker', d)} \ -shared \ -silent \ -no-pch \ -- cgit v1.2.3 From 6a42ca074f2fea52985049d49057c178363d847c Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Tue, 20 Jun 2017 06:28:32 +0200 Subject: qttools: DEPENDS on icu This fixes a following QA issue: | QA Issue: nativesdk-qtbase-tools rdepends on nativesdk-libicui18n, but it isn't a build dependency. | QA Issue: nativesdk-qtbase-tools rdepends on nativesdk-libicuuc, but it isn't a build dependency. | QA Issue: nativesdk-qtbase-tools rdepends on nativesdk-libicudata, but it isn't a build dependency. Signed-off-by: Ming Liu Signed-off-by: Martin Jansa --- recipes-qt/qt5/qttools_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 5c0f51cc..11083906 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = " \ inherit ptest -DEPENDS += "qtbase qtdeclarative qtxmlpatterns" +DEPENDS += "qtbase qtdeclarative qtxmlpatterns icu" SRC_URI += " \ file://run-ptest \ -- cgit v1.2.3 From 2940d8421579de855ce37e8a069911ce6968df38 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 27 Jun 2017 14:08:46 +0200 Subject: Revert "qttools: DEPENDS on icu" This reverts commit 6a42ca074f2fea52985049d49057c178363d847c. http://lists.openembedded.org/pipermail/openembedded-devel/2017-June/113308.html Signed-off-by: Martin Jansa --- recipes-qt/qt5/qttools_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 11083906..5c0f51cc 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = " \ inherit ptest -DEPENDS += "qtbase qtdeclarative qtxmlpatterns icu" +DEPENDS += "qtbase qtdeclarative qtxmlpatterns" SRC_URI += " \ file://run-ptest \ -- cgit v1.2.3 From 800d4c169786c08caf831b7fc9759172c89d7e71 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Fri, 23 Jun 2017 16:24:53 +1000 Subject: libconnman-qt5: update to 1.1.10 Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa --- recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb b/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb index 3ceb3558..9605777d 100644 --- a/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb +++ b/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb @@ -5,9 +5,9 @@ HOMEPAGE = "https://git.merproject.org/mer-core/libconnman-qt" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88" DEPENDS += "qtbase qtdeclarative" -PV = "1.0.98+git${SRCPV}" +PV = "1.1.10+git${SRCPV}" -SRCREV = "8d4580a55ca02b84fc3db374c6530e39c94e0d92" +SRCREV = "4d6def3053eaccaac04e4f9e03ee24dea8b9e8d8" SRC_URI = "git://git.merproject.org/mer-core/libconnman-qt.git;protocol=https \ file://0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch \ " -- cgit v1.2.3 From 428be3cc164e9b5ce2188b4815567c768f6ea79a Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Sat, 24 Jun 2017 11:06:35 +0200 Subject: qtwebengine: add PACKAGECONFIG for webrtc Signed-off-by: Daniel Mack Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebengine_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index deb336f8..ca5d2636 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -38,6 +38,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" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -- cgit v1.2.3 From 05455e605ba75ad12fc6a29630e53ccfa74609e4 Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Wed, 12 Jul 2017 12:58:38 +0800 Subject: qt5: add qt5-ptest.inc Add qt5-ptest.inc file for qt ptest related tasks 1) Rewrite do_compile_ptest task for qt 2) Add new do_compile_ptest_base and task do_install_ptest 3) Write do_populate_sysroot_append to resolve do_compile_ptest_base problem in yocto2.3 The compile error log is shown as follow: cd auto/ && ( test -e Makefile || /yocto/work001/fnst/huangqy/work_qt/build/tmp/work/i586-p oky-linux/qtxmlpatterns/5.8.0+gitAUTOINC+9f7e01b582-r0/recipe-sysroot-native/usr/bin/qt5/qmake -o M akefile /yocto/work001/fnst/huangqy/work_qt/build/tmp/work/i586-poky-linux/qtxmlpatterns/5.8.0+gitA UTOINC+9f7e01b582-r0/git/tests/auto/auto.pro ) && make -f Makefile Project ERROR: Could not find feature xml-schema. Makefile:42: recipe for target 'sub-auto-make_first' failed Signed-off-by: Huang Qiyu Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-ptest.inc | 62 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 recipes-qt/qt5/qt5-ptest.inc diff --git a/recipes-qt/qt5/qt5-ptest.inc b/recipes-qt/qt5/qt5-ptest.inc new file mode 100644 index 00000000..49d44acb --- /dev/null +++ b/recipes-qt/qt5/qt5-ptest.inc @@ -0,0 +1,62 @@ +SRC_URI += "file://run-ptest" + +inherit ptest + +addtask do_populate_sysroot after do_install before do_compile_ptest_base +deltask do_compile_ptest_base +addtask do_compile_ptest_base after do_populate_sysroot before do_install_ptest +addtask do_install_ptest after do_compile_ptest_base before do_package + +do_compile_ptest() { + cd ${S}/tests + qmake -o Makefile tests.pro + oe_runmake +} + +do_populate_sysroot_append() { + workdir = d.getVar('WORKDIR') + srcdir = workdir + '/sysroot-destdir/usr/' + destdir = workdir + '/recipe-sysroot/usr/' + + def copyFiles(sourceDir, targetDir, filelist): + for file in os.listdir(sourceDir): + sourceFile = os.path.join(sourceDir, file) + targetFile = os.path.join(targetDir, file) + filelist.append(targetFile) #record the file list + if os.path.isfile(sourceFile): + if not os.path.exists(targetDir): + os.makedirs(targetDir) + if not os.path.exists(targetFile) or(os.path.exists(targetFile) and (os.path.getsize(targetFile) != os.path.getsize(sourceFile))): + open(targetFile, "wb").write(open(sourceFile, "rb").read()) + if os.path.isdir(sourceFile): + First_Directory = False + copyFiles(sourceFile, targetFile, filelist) + + if os.path.exists(destdir): + Tmpfilelist = [] + copyFiles(srcdir, destdir, Tmpfilelist) + + fp=open(workdir + '/filelist', 'w') + for i in Tmpfilelist: + fp.write(i) + fp.write("\n") + fp.close() +} + +fakeroot do_install_ptest() { + mkdir -p ${D}${PTEST_PATH} + t=${D}${PTEST_PATH} + for var in ` find ${S}/tests/auto/ -name tst_*`; do + if [ -z ` echo ${var##*/} | grep '\.'` ]; then + echo ${var##*/} >> ${t}/tst_list + install -m 0644 ${var} ${t} + fi + done + for file in `cat ${WORKDIR}/filelist`; do + if [ -f $file ]; then + rm -f $file + fi + done + rm -f ${WORKDIR}/filelist +} + -- cgit v1.2.3 From ec8c62e06c9b07323f2a3379bd0e405f06956ced Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Wed, 12 Jul 2017 12:58:39 +0800 Subject: qtxmlpatterns: add ptest Add ptest for qttools by using provided testsuite in qtxmlpatterns. Signed-off-by: Huang Qiyu Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtxmlpatterns/run-ptest | 6 ++++++ recipes-qt/qt5/qtxmlpatterns_git.bb | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 recipes-qt/qt5/qtxmlpatterns/run-ptest diff --git a/recipes-qt/qt5/qtxmlpatterns/run-ptest b/recipes-qt/qt5/qtxmlpatterns/run-ptest new file mode 100644 index 00000000..044f834d --- /dev/null +++ b/recipes-qt/qt5/qtxmlpatterns/run-ptest @@ -0,0 +1,6 @@ +#!/bin/sh + +for x in ` awk '{print $1}' tst_list `;do + ./${x}; +done + diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index c7efaf3f..9333be0b 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -1,5 +1,6 @@ require qt5.inc require qt5-git.inc +require qt5-ptest.inc LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ @@ -19,3 +20,4 @@ DEPENDS += "qtbase" SRCREV = "9f7e01b582b1bd83cc6b8a854c510871335e2e74" BBCLASSEXTEND =+ "native nativesdk" + -- cgit v1.2.3 From 1eac990617e80cdcc1aa0f5faed59b0e7112488c Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Wed, 12 Jul 2017 12:58:40 +0800 Subject: qtdeclarative: add ptest Add ptest for qttools by using provided testsuite in qtdeclarative. Signed-off-by: Huang Qiyu Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtdeclarative/run-ptest | 5 +++++ recipes-qt/qt5/qtdeclarative_git.bb | 1 + 2 files changed, 6 insertions(+) create mode 100644 recipes-qt/qt5/qtdeclarative/run-ptest diff --git a/recipes-qt/qt5/qtdeclarative/run-ptest b/recipes-qt/qt5/qtdeclarative/run-ptest new file mode 100644 index 00000000..6c3f522b --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/run-ptest @@ -0,0 +1,5 @@ +#!/bin/sh + +for x in ` awk '{print $1}' tst_list `;do + ./${x}; +done diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index c19bbd56..34a8897d 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -1,5 +1,6 @@ require qt5.inc require qt5-git.inc +require qt5-ptest.inc LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ -- cgit v1.2.3 From 2c1d6b1e9377d10d1c66ae2a4f9b15b3781e96d8 Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Wed, 12 Jul 2017 12:58:41 +0800 Subject: qtquick1: add ptest Add ptest for qttools by using provided testsuite in qtquick1. Signed-off-by: Huang Qiyu Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtquick1/run-ptest | 6 ++++++ recipes-qt/qt5/qtquick1_git.bb | 1 + 2 files changed, 7 insertions(+) create mode 100644 recipes-qt/qt5/qtquick1/run-ptest diff --git a/recipes-qt/qt5/qtquick1/run-ptest b/recipes-qt/qt5/qtquick1/run-ptest new file mode 100644 index 00000000..044f834d --- /dev/null +++ b/recipes-qt/qt5/qtquick1/run-ptest @@ -0,0 +1,6 @@ +#!/bin/sh + +for x in ` awk '{print $1}' tst_list `;do + ./${x}; +done + diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index e9b6185e..d41b8382 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb @@ -1,5 +1,6 @@ require qt5.inc require qt5-git.inc +require qt5-ptest.inc LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ -- cgit v1.2.3 From aa0605d3c7364f226d655376ee89166dbcbe4cea Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Thu, 6 Jul 2017 13:44:43 +0200 Subject: qtquickcontrols2: fix compilation of examples/texteditor git/examples/quickcontrols2/texteditor/documenthandler.cpp:284:18: error: invalid use of incomplete type 'class QDebug' qWarning() << "load() called before DocumentHandler has QQmlEngine"; Signed-off-by: Steffen Sledz Acked-by: Otavio Salvador Signed-off-by: Martin Jansa --- ...rols2-fix-compilation-of-examples-textedi.patch | 28 ++++++++++++++++++++++ recipes-qt/qt5/qtquickcontrols2_git.bb | 4 ++++ 2 files changed, 32 insertions(+) create mode 100644 recipes-qt/qt5/qtquickcontrols2/0001-qtquickcontrols2-fix-compilation-of-examples-textedi.patch diff --git a/recipes-qt/qt5/qtquickcontrols2/0001-qtquickcontrols2-fix-compilation-of-examples-textedi.patch b/recipes-qt/qt5/qtquickcontrols2/0001-qtquickcontrols2-fix-compilation-of-examples-textedi.patch new file mode 100644 index 00000000..d08c57e9 --- /dev/null +++ b/recipes-qt/qt5/qtquickcontrols2/0001-qtquickcontrols2-fix-compilation-of-examples-textedi.patch @@ -0,0 +1,28 @@ +From 3696a416bd594d3f280c281cb2a66bc837829238 Mon Sep 17 00:00:00 2001 +From: Steffen Sledz +Date: Thu, 6 Jul 2017 13:28:07 +0200 +Subject: [PATCH] qtquickcontrols2: fix compilation of examples/texteditor + +git/examples/quickcontrols2/texteditor/documenthandler.cpp:284:18: error: invalid use of incomplete type 'class QDebug' + qWarning() << "load() called before DocumentHandler has QQmlEngine"; + +Signed-off-by: Steffen Sledz +--- + examples/quickcontrols2/texteditor/documenthandler.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/examples/quickcontrols2/texteditor/documenthandler.cpp b/examples/quickcontrols2/texteditor/documenthandler.cpp +index e57946fd..94ca82ad 100644 +--- a/examples/quickcontrols2/texteditor/documenthandler.cpp ++++ b/examples/quickcontrols2/texteditor/documenthandler.cpp +@@ -59,6 +59,7 @@ + #include + #include + #include ++#include + + DocumentHandler::DocumentHandler(QObject *parent) + : QObject(parent) +-- +2.13.2 + diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 42acb8ad..371f4aef 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,8 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative" +SRC_URI += " \ + file://0001-qtquickcontrols2-fix-compilation-of-examples-textedi.patch \ +" + SRCREV = "6f7852a307c7ebbdb3b6efa00cbf7626b072bbc1" -- cgit v1.2.3 From 00d72cd892b2c7edb3c0c158f0f2f5f5ecd41887 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 10 Jul 2017 23:31:02 -0700 Subject: qwt-qt5: Fix rpath issues It errors out usr/plugins/designer/libqwt_designer_plugin.so [rpaths] QA Issue: qwt-qt5-plugins: found library in wrong location: /usr/plugins/designer/libqwt_designer_plugin.so Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- recipes-qt/qwt/qwt-qt5.inc | 5 +++-- recipes-qt/qwt/qwt-qt5/remove_rpath.patch | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 recipes-qt/qwt/qwt-qt5/remove_rpath.patch diff --git a/recipes-qt/qwt/qwt-qt5.inc b/recipes-qt/qwt/qwt-qt5.inc index ee4fbd77..90bd9f72 100644 --- a/recipes-qt/qwt/qwt-qt5.inc +++ b/recipes-qt/qwt/qwt-qt5.inc @@ -8,9 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88" DEPENDS = "qtbase qtsvg qttools" SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt \ + file://remove_rpath.patch \ " -# file://qwt6.patch -# file://qwt6-fix-linking-with-ld-gold.patch" S = "${WORKDIR}/qwt-${PV}" @@ -45,3 +44,5 @@ FILES_${PN}-plugins = "${prefix}/plugins/designer/*.so" FILES_${PN}-dbg += "${prefix}/plugins/designer/.debug" FILES_${PN}-doc += "${prefix}/doc" +INSANE_SKIP_${PN}-plugins += "libdir" + diff --git a/recipes-qt/qwt/qwt-qt5/remove_rpath.patch b/recipes-qt/qwt/qwt-qt5/remove_rpath.patch new file mode 100644 index 00000000..14b65d6a --- /dev/null +++ b/recipes-qt/qwt/qwt-qt5/remove_rpath.patch @@ -0,0 +1,17 @@ +Remove rpath from library, it points to build area which is not +ok + +Signed-off-by: Khem Raj + +Index: qwt-6.1.3/designer/designer.pro +=================================================================== +--- qwt-6.1.3.orig/designer/designer.pro ++++ qwt-6.1.3/designer/designer.pro +@@ -83,7 +83,6 @@ contains(QWT_CONFIG, QwtDesigner) { + # compile the path for finding the Qwt library + # into the plugin. Not supported on Windows ! + +- QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS} + qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt) + + contains(QWT_CONFIG, QwtDll) { -- cgit v1.2.3 From c2768bd4e5dffb22126c0bd1f40638c9a74295fd Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 11 Jul 2017 10:20:35 +0200 Subject: qtwebengine: fix build with gcc7 Signed-off-by: Martin Jansa --- ...se.gypi-include-atomicops_internals_x86_g.patch | 21 ++-- ...ange-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch | 25 ++-- .../0003-chromium-v8-fix-build-with-gcc7.patch | 134 +++++++++++++++++++++ .../0004-chromium-WebKit-fix-build-with-gcc7.patch | 44 +++++++ recipes-qt/qt5/qtwebengine_git.bb | 6 +- 5 files changed, 208 insertions(+), 22 deletions(-) create mode 100644 recipes-qt/qt5/qtwebengine/0003-chromium-v8-fix-build-with-gcc7.patch create mode 100644 recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch index ccd43e21..44901165 100644 --- a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch +++ b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch @@ -1,19 +1,19 @@ -From db56cd0fd185a9f3858f5aa6e95b24e63dee119f Mon Sep 17 00:00:00 2001 +From 83eee1ff5f9259595b8630e464fa869c6fde8f3c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 3 Oct 2014 03:52:11 +0200 -Subject: [PATCH] base.gypi: include atomicops_internals_x86_gcc.cc - when building for x64 arch +Subject: [PATCH 1/4] base.gypi: include + atomicops_internals_x86_gcc.cc when building for x64 arch Signed-off-by: Martin Jansa --- - src/3rdparty/chromium/base/base.gypi | 2 +- + chromium/base/base.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi -index 63c3f76..331c975 100644 ---- a/src/3rdparty/chromium/base/base.gypi -+++ b/src/3rdparty/chromium/base/base.gypi -@@ -801,7 +801,7 @@ +diff --git a/chromium/base/base.gypi b/chromium/base/base.gypi +index a4da596070..13173d621e 100644 +--- a/chromium/base/base.gypi ++++ b/chromium/base/base.gypi +@@ -845,7 +845,7 @@ ['include', '^nix/'], ], }], @@ -22,3 +22,6 @@ index 63c3f76..331c975 100644 'sources/': [ ['include', 'atomicops_internals_x86_gcc.cc'], ], +-- +2.13.2 + diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch index 34f58ded..eae27879 100644 --- a/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch +++ b/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch @@ -1,7 +1,7 @@ -From de6311b4d556abbe131462a3cd962ae87da59522 Mon Sep 17 00:00:00 2001 +From 4aa614106c03793709e5dbd69f45df8a5e5c9fe4 Mon Sep 17 00:00:00 2001 From: Cleiton Bueno Date: Thu, 24 Dec 2015 12:46:58 -0200 -Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX +Subject: [PATCH 2/4] chromium: Change false to FALSE and 1 to TRUE, FIX qtwebengine compile Signed-off-by: Cleiton Bueno @@ -10,11 +10,11 @@ Signed-off-by: Martin Jansa chromium/ui/gfx/codec/jpeg_codec.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -diff --git a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc -index 8a08fe0..32b2a05 100644 ---- a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc -+++ b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc -@@ -120,7 +120,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) { +diff --git a/chromium/ui/gfx/codec/jpeg_codec.cc b/chromium/ui/gfx/codec/jpeg_codec.cc +index 6d926378be..738d3fdedf 100644 +--- a/chromium/ui/gfx/codec/jpeg_codec.cc ++++ b/chromium/ui/gfx/codec/jpeg_codec.cc +@@ -121,7 +121,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) { // tell libjpeg where to write the next data cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used]; cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used; @@ -23,7 +23,7 @@ index 8a08fe0..32b2a05 100644 } // Cleans up the JpegEncoderState to prepare for returning in the final form. -@@ -261,7 +261,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format, +@@ -262,7 +262,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format, cinfo.data_precision = 8; jpeg_set_defaults(&cinfo); @@ -32,7 +32,7 @@ index 8a08fe0..32b2a05 100644 // set up the destination manager jpeg_destination_mgr destmgr; -@@ -273,7 +273,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format, +@@ -274,7 +274,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format, JpegEncoderState state(output); cinfo.client_data = &state; @@ -41,7 +41,7 @@ index 8a08fe0..32b2a05 100644 // feed it the rows, doing necessary conversions for the color format #ifdef JCS_EXTENSIONS -@@ -359,7 +359,7 @@ void InitSource(j_decompress_ptr cinfo) { +@@ -360,7 +360,7 @@ void InitSource(j_decompress_ptr cinfo) { // set to a positive value if TRUE is returned. A FALSE return should only // be used when I/O suspension is desired." boolean FillInputBuffer(j_decompress_ptr cinfo) { @@ -50,7 +50,7 @@ index 8a08fe0..32b2a05 100644 } // Skip data in the buffer. Since we have all the data at once, this operation -@@ -487,8 +487,8 @@ bool JPEGCodec::Decode(const unsigned char* input, size_t input_size, +@@ -488,8 +488,8 @@ bool JPEGCodec::Decode(const unsigned char* input, size_t input_size, cinfo.client_data = &state; // fill the file metadata into our buffer @@ -61,3 +61,6 @@ index 8a08fe0..32b2a05 100644 // we want to always get RGB data out switch (cinfo.jpeg_color_space) { +-- +2.13.2 + diff --git a/recipes-qt/qt5/qtwebengine/0003-chromium-v8-fix-build-with-gcc7.patch b/recipes-qt/qt5/qtwebengine/0003-chromium-v8-fix-build-with-gcc7.patch new file mode 100644 index 00000000..2acce2c5 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0003-chromium-v8-fix-build-with-gcc7.patch @@ -0,0 +1,134 @@ +From 1a163c0cab05761f269fcb5adad5d40d71200d52 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Tue, 11 Jul 2017 10:15:41 +0200 +Subject: [PATCH 3/4] chromium: v8 fix build with gcc7 + +Use the fix from nodejs: +https://github.com/nodejs/node/commit/2a2a5565c298639b823250b571101f51210c50e8 + +* fixes: +| ../../git/src/v8/src/objects-body-descriptors.h: In static member function 'static void v8::internal::FixedBodyDescriptor::IterateBody(v8::internal::HeapObject*, int)': +| ../../git/src/v8/src/objects-body-descriptors.h:102:20: error: no matching function for call to 'v8::internal::FixedBodyDescriptor::IterateBody(v8::internal::HeapObject*&)' +| IterateBody(obj); +| ^ + +and + +| ../../v8/src/objects.h: In member function 'uint32_t v8::internal::HashTable::Hash(Key)': +| ../../v8/src/objects.h:3205:46: error: invalid use of incomplete type 'class v8::internal::Heap' [-Werror] +| return Shape::SeededHash(key, GetHeap()->HashSeed()); +| ^~ + +and + +../../v8/src/heap/mark-compact.cc:3660:43: error: 'v8::internal::PointerUpdateJobTraits::UpdateTypedPointers(v8::internal::Heap*, v8::internal::MemoryChunk*):: [with v8::internal::PointerDirection direction = (v8::internal::PointerDirection)1; v8::internal::Address = unsigned char*; v8::internal::byte = unsigned char]::' declared with greater visibility than the type of its field 'v8::internal::PointerUpdateJobTraits::UpdateTypedPointers(v8::internal::Heap*, v8::internal::MemoryChunk*):: [with v8::internal::PointerDirection direction = (v8::internal::PointerDirection)1; v8::internal::Address = unsigned char*; v8::internal::byte = unsigned char]::::' [-Werror=attributes] + +Signed-off-by: Martin Jansa +--- + chromium/v8/src/heap/mark-compact.cc | 5 +++++ + chromium/v8/src/objects-body-descriptors.h | 2 +- + chromium/v8/src/objects-inl.h | 20 ++++++++++++++++++++ + chromium/v8/src/objects.h | 20 ++++---------------- + 4 files changed, 30 insertions(+), 17 deletions(-) + +diff --git a/chromium/v8/src/heap/mark-compact.cc b/chromium/v8/src/heap/mark-compact.cc +index f9a55dfc61..da46270aec 100644 +--- a/chromium/v8/src/heap/mark-compact.cc ++++ b/chromium/v8/src/heap/mark-compact.cc +@@ -3614,6 +3614,9 @@ void MarkCompactCollector::EvacuateNewSpaceAndCandidates() { + #endif + } + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic warning "-Wattributes" ++ + template + class PointerUpdateJobTraits { + public: +@@ -3701,6 +3704,8 @@ class PointerUpdateJobTraits { + } + }; + ++#pragma GCC diagnostic pop ++ + int NumberOfPointerUpdateTasks(int pages) { + if (!FLAG_parallel_pointer_update) return 1; + const int kMaxTasks = 4; +diff --git a/chromium/v8/src/objects-body-descriptors.h b/chromium/v8/src/objects-body-descriptors.h +index 91cb8883be..a1c3634bd7 100644 +--- a/chromium/v8/src/objects-body-descriptors.h ++++ b/chromium/v8/src/objects-body-descriptors.h +@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public BodyDescriptorBase { + + template + static inline void IterateBody(HeapObject* obj, int object_size) { +- IterateBody(obj); ++ IterateBody(obj); + } + }; + +diff --git a/chromium/v8/src/objects-inl.h b/chromium/v8/src/objects-inl.h +index 58441d3853..e850fd787f 100644 +--- a/chromium/v8/src/objects-inl.h ++++ b/chromium/v8/src/objects-inl.h +@@ -38,6 +38,26 @@ + namespace v8 { + namespace internal { + ++template ++uint32_t HashTable::Hash(Key key) { ++ if (Shape::UsesSeed) { ++ return Shape::SeededHash(key, GetHeap()->HashSeed()); ++ } else { ++ return Shape::Hash(key); ++ } ++} ++ ++ ++template ++uint32_t HashTable::HashForObject(Key key, ++ Object* object) { ++ if (Shape::UsesSeed) { ++ return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); ++ } else { ++ return Shape::HashForObject(key, object); ++ } ++} ++ + PropertyDetails::PropertyDetails(Smi* smi) { + value_ = smi->value(); + } +diff --git a/chromium/v8/src/objects.h b/chromium/v8/src/objects.h +index 7d774beb5b..eda1478766 100644 +--- a/chromium/v8/src/objects.h ++++ b/chromium/v8/src/objects.h +@@ -3193,22 +3193,10 @@ class HashTable : public HashTableBase { + public: + typedef Shape ShapeT; + +- // Wrapper methods +- inline uint32_t Hash(Key key) { +- if (Shape::UsesSeed) { +- return Shape::SeededHash(key, GetHeap()->HashSeed()); +- } else { +- return Shape::Hash(key); +- } +- } +- +- inline uint32_t HashForObject(Key key, Object* object) { +- if (Shape::UsesSeed) { +- return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); +- } else { +- return Shape::HashForObject(key, object); +- } +- } ++ // Wrapper methods. Defined in src/objects-inl.h ++ // to break a cycle with src/heap/heap.h. ++ inline uint32_t Hash(Key key); ++ inline uint32_t HashForObject(Key key, Object* object); + + // Returns a new HashTable object. + MUST_USE_RESULT static Handle New( +-- +2.13.2 + diff --git a/recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch b/recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch new file mode 100644 index 00000000..46e87611 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch @@ -0,0 +1,44 @@ +From 2be0856e09f47e7f2c35e77d4e000d769c6beaf9 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Tue, 11 Jul 2017 10:18:13 +0200 +Subject: [PATCH 4/4] chromium: WebKit fix build with gcc7 + +Based on qtwebengine-opensource-src-5.8.0-wtf-gcc7.patch from +http://git.net/ml/scm-fedora-commits/2017-03/msg15697.html + +* Fixes: +In file included from ../../git/src/third_party/WebKit/Source/platform/heap/ThreadingTraits.h:14:0, + from ../../git/src/third_party/WebKit/Source/platform/heap/ThreadState.h:37, + from ../../git/src/third_party/WebKit/Source/platform/heap/GarbageCollected.h:8, + from ../../git/src/third_party/WebKit/Source/platform/heap/Visitor.h:35, + from ../../git/src/third_party/WebKit/Source/platform/heap/GCInfo.h:8, + from ../../git/src/third_party/WebKit/Source/platform/heap/Heap.h:35, + from ../../git/src/third_party/WebKit/Source/platform/heap/Handle.h:34, + from ../../git/src/third_party/WebKit/public/platform/WebPrivatePtr.h:38, + from ../../git/src/third_party/WebKit/public/platform/WebString.h:35, + from ../../git/src/third_party/WebKit/Source/platform/exported/FilePathConversion.cpp:8: +../../git/src/third_party/WebKit/Source/wtf/LinkedHashSet.h: In member function 'void WTF::LinkedHashSet::swap(WTF::LinkedHashSet&)': +../../git/src/third_party/WebKit/Source/wtf/LinkedHashSet.h:549:5: error: there are no arguments to 'swapAnchor' that depend on a template parameter, so a declaration of 'swapAnchor' must be available [-fpermissive] + swapAnchor(m_anchor, other.m_anchor); + ^~~~~~~~~~ +../../git/src/third_party/WebKit/Source/wtf/LinkedHashSet.h:549:5: note: (if you use '-fpermissive', G++ will accept your code, but allowing the use of an undeclared name is deprecated) +--- + chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h b/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h +index e85c72fd65..6f94cd6734 100644 +--- a/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h ++++ b/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h +@@ -542,6 +542,8 @@ inline LinkedHashSet& LinkedHashSet::operator=(LinkedHas + return *this; + } + ++inline void swapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b); ++ + template + inline void LinkedHashSet::swap(LinkedHashSet& other) + { +-- +2.13.2 + diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index ca5d2636..e319a01f 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -114,8 +114,10 @@ SRC_URI += " \ file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ file://0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ file://0005-Include-dependency-to-QCoreApplication-translate.patch \ - file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \ - file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ + file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch;patchdir=src/3rdparty \ + file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \ + file://0003-chromium-v8-fix-build-with-gcc7.patch;patchdir=src/3rdparty \ + file://0004-chromium-WebKit-fix-build-with-gcc7.patch;patchdir=src/3rdparty \ " SRCREV_qtwebengine = "d740d6a7dbfec387752c7bc8a8b06db0e757c9dc" -- cgit v1.2.3 From 932515ad3517e4d5ab926e12a7ad73dd4b70e275 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 11 Jul 2017 11:05:52 +0200 Subject: qt5-ptest.inc: append do_populate_sysroot only for target * otherwise it breaks e.g. qtxmlpatterns-native build as shown in: http://errors.yoctoproject.org/Errors/Details/147039/ ERROR: Error executing a python function in exec_python_func() autogenerated: The stack trace of python calls that resulted in this exception/failure was: File: 'exec_python_func() autogenerated', lineno: 2, function: 0001: *** 0002:do_populate_sysroot(d) 0003: File: 'TOPDIR/openembedded-core/meta/classes/staging.bbclass', lineno: 128, function: do_populate_sysroot 0124: 0125:python do_populate_sysroot_setscene () { 0126: sstate_setscene(d) 0127:} *** 0128:addtask do_populate_sysroot_setscene 0129: 0130:def staging_copyfile(c, target, dest, postinsts, seendirs): 0131: import errno 0132: File: 'TOPDIR/openembedded-core/meta/classes/staging.bbclass', lineno: 114, function: copyFiles 0110: 0111:do_populate_sysroot[vardeps] += "${SYSROOT_PREPROCESS_FUNCS}" 0112:do_populate_sysroot[vardepsexclude] += "MULTI_PROVIDER_WHITELIST" 0113: *** 0114:POPULATESYSROOTDEPS = "" 0115:POPULATESYSROOTDEPS_class-target = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot" 0116:POPULATESYSROOTDEPS_class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot" 0117:do_populate_sysroot[depends] += "${POPULATESYSROOTDEPS}" 0118: Exception: FileNotFoundError: [Errno 2] No such file or directory: 'TOPDIR/tmp-glibc/work/x86_64-linux/qtxmlpatterns-native/5.8.0+gitAUTOINC+9f7e01b582-r0/sysroot-destdir/usr/' Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-ptest.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qt5-ptest.inc b/recipes-qt/qt5/qt5-ptest.inc index 49d44acb..d39f65aa 100644 --- a/recipes-qt/qt5/qt5-ptest.inc +++ b/recipes-qt/qt5/qt5-ptest.inc @@ -13,7 +13,7 @@ do_compile_ptest() { oe_runmake } -do_populate_sysroot_append() { +do_populate_sysroot_append_class-target() { workdir = d.getVar('WORKDIR') srcdir = workdir + '/sysroot-destdir/usr/' destdir = workdir + '/recipe-sysroot/usr/' -- cgit v1.2.3 From bf7cdd963008f2d61bc4c324fff2bfafe511fb5f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 11 Jul 2017 11:13:53 -0700 Subject: qtbase-native: Fix qdbuscpp2xml segfault MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch alone was causing qdbuscpp2xml to simply segfault on simple invocation Signed-off-by: Khem Raj Cc: Andreas Müller Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase-native_git.bb | 1 - ...l.pro-do-not-build-with-bootstrapped-depe.patch | 79 ---------------------- 2 files changed, 80 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index da698129..98cbeccf 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -33,7 +33,6 @@ SRC_URI += "\ # common for qtbase-native and nativesdk-qtbase SRC_URI += " \ file://0011-Always-build-uic.patch \ - file://0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch \ " CLEANBROKEN = "1" diff --git a/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch b/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch deleted file mode 100644 index e72601ca..00000000 --- a/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 86ae0ce931edbe0ac30cfe5f94f681f1d055fdb0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 6 Mar 2017 11:50:38 +0100 -Subject: [PATCH] qdbuscpp2xml.pro: do not build with bootstrapped - dependenciies -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - src/src.pro | 9 ++------- - src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 3 +-- - src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 5 +---- - 3 files changed, 4 insertions(+), 13 deletions(-) - -diff --git a/src/src.pro b/src/src.pro -index 90d7e2b..0aaf604 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -4,9 +4,6 @@ QT_FOR_CONFIG += gui-private - include($$OUT_PWD/corelib/qtcore-config.pri) - include($$OUT_PWD/gui/qtgui-config.pri) - --force_bootstrap|!qtConfig(commandlineparser): \ -- CONFIG += force_dbus_bootstrap -- - src_qtzlib.file = $$PWD/corelib/qtzlib.pro - src_qtzlib.target = sub-zlib - -@@ -37,13 +34,11 @@ src_tools_bootstrap_dbus.depends = src_tools_bootstrap - - src_tools_qdbusxml2cpp.subdir = tools/qdbusxml2cpp - src_tools_qdbusxml2cpp.target = sub-qdbusxml2cpp --force_dbus_bootstrap: src_tools_qdbusxml2cpp.depends = src_tools_bootstrap_dbus --else: src_tools_qdbusxml2cpp.depends = src_dbus -+src_tools_qdbusxml2cpp.depends = src_dbus - - src_tools_qdbuscpp2xml.subdir = tools/qdbuscpp2xml - src_tools_qdbuscpp2xml.target = sub-qdbuscpp2xml --force_bootstrap: src_tools_qdbuscpp2xml.depends = src_tools_bootstrap_dbus --else: src_tools_qdbuscpp2xml.depends = src_dbus -+src_tools_qdbuscpp2xml.depends = src_dbus - - src_winmain.subdir = $$PWD/winmain - src_winmain.target = sub-winmain -diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro -index 5ac3159..74c507c 100644 ---- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro -+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro -@@ -1,7 +1,6 @@ - option(host_build) - QT = core-private --force_bootstrap: QT += bootstrap_dbus-private --else: QT += dbus-private -+QT += dbus-private - DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH - QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS - -diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro -index d9ee5de..e891103 100644 ---- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro -+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro -@@ -1,9 +1,6 @@ - option(host_build) --!force_bootstrap:!qtConfig(commandlineparser): \ -- CONFIG += force_bootstrap - QT = core-private --force_bootstrap: QT += bootstrap_dbus-private --else: QT += dbus-private -+QT += dbus-private - DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH - QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS - --- -2.9.3 - -- cgit v1.2.3 From 2afd1b77be9c9c4abe4b7c82c54acde061818605 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 12 Jul 2017 14:15:00 -0700 Subject: maliit-framework-qt5: Always have optimize flags When building with hardening flags we need some optlevel > 0 enabled, otherwise FORTIFY_SOURCE wont work Fixes maliit-framework-qt5/0.99.0+git999-r0/recipe-sysroot/usr/include/features.h:376:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp ] | # warning _FORTIFY_SOURCE requires compiling with optimization (-O) | ^~~~~~~ Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- ...ig.pri-Use-O1-optimization-in-DEBUG-flags.patch | 34 ++++++++++++++++++++++ recipes-qt/maliit/maliit-framework-qt5_git.bb | 8 ++--- 2 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 recipes-qt/maliit/maliit-framework-qt5/0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch diff --git a/recipes-qt/maliit/maliit-framework-qt5/0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch b/recipes-qt/maliit/maliit-framework-qt5/0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch new file mode 100644 index 00000000..73560340 --- /dev/null +++ b/recipes-qt/maliit/maliit-framework-qt5/0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch @@ -0,0 +1,34 @@ +From cb38c078fa34a3d0cff6bc195edd9f507477d2e1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Jul 2017 11:45:06 -0700 +Subject: [PATCH] config.pri: Use -O1 optimization in DEBUG flags + +when building wit FORTIFY_SOURCES we need some level of +optimization turned on for the compile to succeed + +O1 is a good compromise between debug quality and +optimization level. + +Signed-off-by: Khem Raj +--- + config.pri | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/config.pri b/config.pri +index 1505f9d..7cc196a 100644 +--- a/config.pri ++++ b/config.pri +@@ -13,8 +13,8 @@ include(defines.pri) + # Linker optimization for release build + QMAKE_LFLAGS_RELEASE+=-Wl,--as-needed + # Compiler warnings are error if the build type is debug +-QMAKE_CXXFLAGS_DEBUG+=-Werror -O0 +-QMAKE_CFLAGS_DEBUG+=-Werror -O0 ++QMAKE_CXXFLAGS_DEBUG+=-Werror -O1 ++QMAKE_CFLAGS_DEBUG+=-Werror -O1 + + OBJECTS_DIR = .obj + MOC_DIR = .moc +-- +2.13.2 + diff --git a/recipes-qt/maliit/maliit-framework-qt5_git.bb b/recipes-qt/maliit/maliit-framework-qt5_git.bb index 62a7209b..e0a0e0e1 100644 --- a/recipes-qt/maliit/maliit-framework-qt5_git.bb +++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb @@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=5c917f6ce94ceb8d8d5e16e2fca5b9ad" inherit qmake5 qmake5_paths SRC_URI = "git://github.com/maliit/framework.git;branch=master \ - file://0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch \ - file://maliit-server.desktop \ -" + file://0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch \ + file://maliit-server.desktop \ + file://0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch \ + " SRCREV = "60b1b10de14f932420313c547ab801daf522d539" PV = "0.99.0+git${SRCPV}" @@ -57,7 +58,6 @@ EXTRA_QMAKEVARS_PRE = "\ CONFIG+=enable-dbus-activation \ CONFIG+=qt5-inputcontext \ " - EXTRA_OEMAKE += "INSTALL_ROOT=${D}" do_install_append() { -- cgit v1.2.3 From 92c634e9d584ebbf508b5ca4fea6d61d38373513 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 12 Jul 2017 14:15:01 -0700 Subject: qt5-creator: Fix build with NO_ACCESSIBILITY Also add missing headers in sources Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- ...-Fix-compilation-with-QT_NO_ACCESSIBILITY.patch | 38 ++++++++++++++++++++ .../0001-Qmlpuppet-add-missing-includes.patch | 41 ++++++++++++++++++++++ recipes-qt/qt5/qt5-creator_3.5.1.bb | 2 ++ 3 files changed, 81 insertions(+) create mode 100644 recipes-qt/qt5/qt5-creator/0001-Fix-compilation-with-QT_NO_ACCESSIBILITY.patch create mode 100644 recipes-qt/qt5/qt5-creator/0001-Qmlpuppet-add-missing-includes.patch diff --git a/recipes-qt/qt5/qt5-creator/0001-Fix-compilation-with-QT_NO_ACCESSIBILITY.patch b/recipes-qt/qt5/qt5-creator/0001-Fix-compilation-with-QT_NO_ACCESSIBILITY.patch new file mode 100644 index 00000000..9e90bab7 --- /dev/null +++ b/recipes-qt/qt5/qt5-creator/0001-Fix-compilation-with-QT_NO_ACCESSIBILITY.patch @@ -0,0 +1,38 @@ +From 429347dda56a4d45dc03fee2362eb02294161bfd Mon Sep 17 00:00:00 2001 +From: Eike Ziller +Date: Fri, 24 Jun 2016 10:23:24 +0200 +Subject: [PATCH] Fix compilation with QT_NO_ACCESSIBILITY + +Task-number: QTCREATORBUG-16446 +Change-Id: If75122c23a697f26ccf56391fe2e8d316aad6367 +Reviewed-by: hjk +--- + src/libs/utils/fancymainwindow.cpp | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp +index 9477f17..1ee425f 100644 +--- a/src/libs/utils/fancymainwindow.cpp ++++ b/src/libs/utils/fancymainwindow.cpp +@@ -159,13 +159,16 @@ public: + + m_floatButton = new DockWidgetTitleButton(this); + m_floatButton->setIcon(q->style()->standardIcon(QStyle::SP_TitleBarNormalButton, &opt, q)); +- m_floatButton->setAccessibleName(QDockWidget::tr("Float")); +- m_floatButton->setAccessibleDescription(QDockWidget::tr("Undocks and re-attaches the dock widget")); + + m_closeButton = new DockWidgetTitleButton(this); + m_closeButton->setIcon(q->style()->standardIcon(QStyle::SP_TitleBarCloseButton, &opt, q)); ++ ++#ifndef QT_NO_ACCESSIBILITY ++ m_floatButton->setAccessibleName(QDockWidget::tr("Float")); ++ m_floatButton->setAccessibleDescription(QDockWidget::tr("Undocks and re-attaches the dock widget")); + m_closeButton->setAccessibleName(QDockWidget::tr("Close")); + m_closeButton->setAccessibleDescription(QDockWidget::tr("Closes the dock widget")); ++#endif + + setActive(false); + +-- +2.13.2 + diff --git a/recipes-qt/qt5/qt5-creator/0001-Qmlpuppet-add-missing-includes.patch b/recipes-qt/qt5/qt5-creator/0001-Qmlpuppet-add-missing-includes.patch new file mode 100644 index 00000000..8c1311e4 --- /dev/null +++ b/recipes-qt/qt5/qt5-creator/0001-Qmlpuppet-add-missing-includes.patch @@ -0,0 +1,41 @@ +From 51088a424416a8ca5cdf5161b792ac5e8a01f749 Mon Sep 17 00:00:00 2001 +From: Marco Benelli +Date: Thu, 6 Jul 2017 09:31:41 +0200 +Subject: [PATCH] Qmlpuppet: add missing includes + +Task-number: QTCREATORBUG-18498 +Change-Id: Ie40a066508bb52f53b8ad528f9d4cf6969fc0632 +Reviewed-by: Thomas Hartmann +--- + .../qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp | 2 ++ + .../qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp +index 3f9f148..160e5c4 100644 +--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp ++++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp +@@ -29,6 +29,8 @@ + ****************************************************************************/ + #include "layoutnodeinstance.h" + ++#include ++ + namespace QmlDesigner { + namespace Internal { + +diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp +index 5a9342f..bacbc12 100644 +--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp ++++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp +@@ -33,6 +33,7 @@ + #include + #include + ++#include + #include + #include + #include +-- +2.13.2 + diff --git a/recipes-qt/qt5/qt5-creator_3.5.1.bb b/recipes-qt/qt5/qt5-creator_3.5.1.bb index f4ba8580..c85f38ce 100644 --- a/recipes-qt/qt5/qt5-creator_3.5.1.bb +++ b/recipes-qt/qt5/qt5-creator_3.5.1.bb @@ -21,6 +21,8 @@ DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qtto SRC_URI = " \ http://download.qt.io/official_releases/qtcreator/3.5/${PV}/qt-creator-opensource-src-${PV}.tar.gz \ file://0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch \ + file://0001-Fix-compilation-with-QT_NO_ACCESSIBILITY.patch \ + file://0001-Qmlpuppet-add-missing-includes.patch \ file://qtcreator.desktop.in \ " SRC_URI[md5sum] = "77aef7df837eba07c7ce6037ee504c05" -- cgit v1.2.3 From d69be5de8c15bfe015c8a6ffb15eee3afb43b841 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 13 Jul 2017 00:41:52 -0700 Subject: qtwebengine: Fix build on musl import needed chromium patches from meta-browser Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- ...-Define-TEMP_FAILURE_RETRY-if-not-defined.patch | 35 ++++++++++ ...03-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | 48 +++++++++++++ .../0004-include-fcntl.h-for-loff_t.patch | 25 +++++++ ...off64_t-instead-of-the-internal-__off64_t.patch | 65 +++++++++++++++++ .../0006-linux-glibc-make-the-distinction.patch | 26 +++++++ ...o-not-include-glibc_weak_symbols-for-musl.patch | 26 +++++++ ...-member-name-__si_fields-from-LinuxSigInf.patch | 26 +++++++ .../0009-Match-syscalls-to-match-musl.patch | 47 +++++++++++++ ...ninit-and-res_nclose-for-non-glibc-platfo.patch | 81 ++++++++++++++++++++++ .../0011-Do-not-define-__sbrk-on-musl.patch | 29 ++++++++ .../0012-Adjust-default-pthread-stack-size.patch | 51 ++++++++++++++ ...3-include-asm-generic-ioctl.h-for-TCGETS2.patch | 25 +++++++ .../0014-link-with-libexecinfo-on-musl.patch | 25 +++++++ ...tcmalloc-Use-off64_t-insread-of-__off64_t.patch | 26 +++++++ recipes-qt/qt5/qtwebengine_git.bb | 31 ++++++++- 15 files changed, 565 insertions(+), 1 deletion(-) create mode 100644 recipes-qt/qt5/qtwebengine/0001-sandbox-Define-TEMP_FAILURE_RETRY-if-not-defined.patch create mode 100644 recipes-qt/qt5/qtwebengine/0003-Avoid-mallinfo-APIs-on-non-glibc-linux.patch create mode 100644 recipes-qt/qt5/qtwebengine/0004-include-fcntl.h-for-loff_t.patch create mode 100644 recipes-qt/qt5/qtwebengine/0005-use-off64_t-instead-of-the-internal-__off64_t.patch create mode 100644 recipes-qt/qt5/qtwebengine/0006-linux-glibc-make-the-distinction.patch create mode 100644 recipes-qt/qt5/qtwebengine/0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch create mode 100644 recipes-qt/qt5/qtwebengine/0008-Use-correct-member-name-__si_fields-from-LinuxSigInf.patch create mode 100644 recipes-qt/qt5/qtwebengine/0009-Match-syscalls-to-match-musl.patch create mode 100644 recipes-qt/qt5/qtwebengine/0010-Define-res_ninit-and-res_nclose-for-non-glibc-platfo.patch create mode 100644 recipes-qt/qt5/qtwebengine/0011-Do-not-define-__sbrk-on-musl.patch create mode 100644 recipes-qt/qt5/qtwebengine/0012-Adjust-default-pthread-stack-size.patch create mode 100644 recipes-qt/qt5/qtwebengine/0013-include-asm-generic-ioctl.h-for-TCGETS2.patch create mode 100644 recipes-qt/qt5/qtwebengine/0014-link-with-libexecinfo-on-musl.patch create mode 100644 recipes-qt/qt5/qtwebengine/0018-tcmalloc-Use-off64_t-insread-of-__off64_t.patch diff --git a/recipes-qt/qt5/qtwebengine/0001-sandbox-Define-TEMP_FAILURE_RETRY-if-not-defined.patch b/recipes-qt/qt5/qtwebengine/0001-sandbox-Define-TEMP_FAILURE_RETRY-if-not-defined.patch new file mode 100644 index 00000000..c56cfc7b --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0001-sandbox-Define-TEMP_FAILURE_RETRY-if-not-defined.patch @@ -0,0 +1,35 @@ +From 89d6283c91f2229cc51f473eed344de97d09e946 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 14:01:12 -0700 +Subject: [PATCH 01/12] sandbox: Define TEMP_FAILURE_RETRY if not defined + +Musl does not define this Macro + +Signed-off-by: Khem Raj +--- + sandbox/linux/suid/sandbox.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/sandbox/linux/suid/sandbox.c b/sandbox/linux/suid/sandbox.c +index b655d1c79..3de34e36f 100644 +--- a/sandbox/linux/suid/sandbox.c ++++ b/sandbox/linux/suid/sandbox.c +@@ -44,6 +44,15 @@ static bool DropRoot(); + + #define HANDLE_EINTR(x) TEMP_FAILURE_RETRY(x) + ++#ifndef TEMP_FAILURE_RETRY ++# define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif ++ + static void FatalError(const char* msg, ...) + __attribute__((noreturn, format(printf, 1, 2))); + +-- +2.13.2 + diff --git a/recipes-qt/qt5/qtwebengine/0003-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/0003-Avoid-mallinfo-APIs-on-non-glibc-linux.patch new file mode 100644 index 00000000..2e0b1f00 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0003-Avoid-mallinfo-APIs-on-non-glibc-linux.patch @@ -0,0 +1,48 @@ +From 8defe37306b0d1548592afc12baa45f4aec5375c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 14:09:06 -0700 +Subject: [PATCH 03/12] Avoid mallinfo() APIs on non-glibc/linux + +Signed-off-by: Khem Raj +--- + base/trace_event/malloc_dump_provider.cc | 3 ++- + content/child/content_child_helpers.cc | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/base/trace_event/malloc_dump_provider.cc b/base/trace_event/malloc_dump_provider.cc +index 3b1a933bc..a554d0373 100644 +--- a/base/trace_event/malloc_dump_provider.cc ++++ b/base/trace_event/malloc_dump_provider.cc +@@ -103,6 +103,7 @@ MallocDumpProvider::~MallocDumpProvider() {} + // the current process. + bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, + ProcessMemoryDump* pmd) { ++#if defined(__GLIBC__) + size_t total_virtual_size = 0; + size_t resident_size = 0; + size_t allocated_objects_size = 0; +@@ -195,7 +196,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, + pmd->DumpHeapUsage(metrics_by_context, overhead, "malloc"); + } + tid_dumping_heap_ = kInvalidThreadId; +- ++#endif // __GLIBC__ + return true; + } + +diff --git a/content/child/content_child_helpers.cc b/content/child/content_child_helpers.cc +index 7ddeb4d16..b8c73b09c 100644 +--- a/content/child/content_child_helpers.cc ++++ b/content/child/content_child_helpers.cc +@@ -25,7 +25,7 @@ namespace content { + // though, this provides only a partial and misleading value. + // Unfortunately some telemetry benchmark rely on it and these need to + // be refactored before getting rid of this. See crbug.com/581365 . +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(__GLIBC__) || defined(OS_ANDROID) + size_t GetMemoryUsageKB() { + struct mallinfo minfo = mallinfo(); + uint64_t mem_usage = +-- +2.13.2 + diff --git a/recipes-qt/qt5/qtwebengine/0004-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/0004-include-fcntl.h-for-loff_t.patch new file mode 100644 index 00000000..da8503bf --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0004-include-fcntl.h-for-loff_t.patch @@ -0,0 +1,25 @@ +From a0b40dcdfb3331d2b8351bdfb27f1ba3e8a2c33c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 14:37:49 -0700 +Subject: [PATCH 04/12] include fcntl.h for loff_t + +Signed-off-by: Khem Raj +--- + third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +index bdbc4b7e3..b53dd46c5 100644 +--- a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h ++++ b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +@@ -151,6 +151,7 @@ extern "C" { + #include + #include + #include ++#include + #include + #include + #include +-- +2.13.2 + diff --git a/recipes-qt/qt5/qtwebengine/0005-use-off64_t-instead-of-the-internal-__off64_t.patch b/recipes-qt/qt5/qtwebengine/0005-use-off64_t-instead-of-the-internal-__off64_t.patch new file mode 100644 index 00000000..d552a34e --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0005-use-off64_t-instead-of-the-internal-__off64_t.patch @@ -0,0 +1,65 @@ +From badea43b85346525b7c43c38c32d150b7eb85b13 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 14:38:37 -0700 +Subject: [PATCH 05/12] use off64_t instead of the internal __off64_t + +- only do the glibc 32-bit ABI check for mmap/mmap64 on gnu libc. musl + does not support the 32-bit ABI. + +Signed-off-by: Khem Raj +--- + third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h +index 715c045f6..edc8cf2db 100644 +--- a/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h ++++ b/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h +@@ -77,7 +77,7 @@ typedef off64_t __off64_t; + + static inline void* do_mmap64(void *start, size_t length, + int prot, int flags, +- int fd, __off64_t offset) __THROW { ++ int fd, off64_t offset) __THROW { + // The original gperftools uses sys_mmap() here. But, it is not allowed by + // Chromium's sandbox. + return (void *)syscall(SYS_mmap, start, length, prot, flags, fd, offset); +@@ -90,7 +90,7 @@ static inline void* do_mmap64(void *start, size_t length, + + static inline void* do_mmap64(void *start, size_t length, + int prot, int flags, +- int fd, __off64_t offset) __THROW { ++ int fd, off64_t offset) __THROW { + void *result; + + // Try mmap2() unless it's not supported +@@ -161,7 +161,7 @@ static inline void* do_mmap64(void *start, size_t length, + + extern "C" { + void* mmap64(void *start, size_t length, int prot, int flags, +- int fd, __off64_t offset ) __THROW ++ int fd, off64_t offset ) __THROW + ATTRIBUTE_SECTION(malloc_hook); + void* mmap(void *start, size_t length,int prot, int flags, + int fd, off_t offset) __THROW +@@ -178,7 +178,7 @@ extern "C" { + } + + extern "C" void* mmap64(void *start, size_t length, int prot, int flags, +- int fd, __off64_t offset) __THROW { ++ int fd, off64_t offset) __THROW { + MallocHook::InvokePreMmapHook(start, length, prot, flags, fd, offset); + void *result; + if (!MallocHook::InvokeMmapReplacement( +@@ -189,7 +189,7 @@ extern "C" void* mmap64(void *start, size_t length, int prot, int flags, + return result; + } + +-# if !defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH) ++# if defined(__GLIBC__) && (!defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH)) + + extern "C" void* mmap(void *start, size_t length, int prot, int flags, + int fd, off_t offset) __THROW { +-- +2.13.2 + diff --git a/recipes-qt/qt5/qtwebengine/0006-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/0006-linux-glibc-make-the-distinction.patch new file mode 100644 index 00000000..257d873e --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0006-linux-glibc-make-the-distinction.patch @@ -0,0 +1,26 @@ +From 4913850cd644e1fd44ecade5e9faa460de35a7d6 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 14:54:38 -0700 +Subject: [PATCH 06/12] linux != glibc, make the distinction + +Signed-off-by: Khem Raj +--- + base/allocator/allocator_check.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/base/allocator/allocator_check.cc b/base/allocator/allocator_check.cc +index 5a0564d2f..8c2dc6491 100644 +--- a/base/allocator/allocator_check.cc ++++ b/base/allocator/allocator_check.cc +@@ -21,7 +21,7 @@ bool IsAllocatorInitialized() { + #if defined(OS_WIN) && defined(ALLOCATOR_SHIM) + // Set by allocator_shim_win.cc when the shimmed _set_new_mode() is called. + return g_is_win_shim_layer_initialized; +-#elif defined(OS_LINUX) && defined(USE_TCMALLOC) && \ ++#elif defined(__GLIBC__) && defined(USE_TCMALLOC) && \ + !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) + // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h. + // TODO(primiano): replace with an include once base can depend on allocator. +-- +2.13.2 + diff --git a/recipes-qt/qt5/qtwebengine/0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch b/recipes-qt/qt5/qtwebengine/0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch new file mode 100644 index 00000000..b999c599 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch @@ -0,0 +1,26 @@ +From 482e77e9562b8a158b5b212e9f1c83c697fed2e2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 15:09:02 -0700 +Subject: [PATCH 07/12] allocator: Do not include glibc_weak_symbols for musl + +Signed-off-by: Khem Raj +--- + base/allocator/allocator_shim.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/base/allocator/allocator_shim.cc b/base/allocator/allocator_shim.cc +index 57a398aaa..54c79063a 100644 +--- a/base/allocator/allocator_shim.cc ++++ b/base/allocator/allocator_shim.cc +@@ -263,7 +263,7 @@ void ShimFree(void* address) { + // In the case of tcmalloc we also want to plumb into the glibc hooks + // to avoid that allocations made in glibc itself (e.g., strdup()) get + // accidentally performed on the glibc heap instead of the tcmalloc one. +-#if defined(USE_TCMALLOC) ++#if defined(USE_TCMALLOC) && defined(__GLIBC__) + #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h" + #endif + +-- +2.13.2 + diff --git a/recipes-qt/qt5/qtwebengine/0008-Use-correct-member-name-__si_fields-from-LinuxSigInf.patch b/recipes-qt/qt5/qtwebengine/0008-Use-correct-member-name-__si_fields-from-LinuxSigInf.patch new file mode 100644 index 00000000..3bd0a9d4 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0008-Use-correct-member-name-__si_fields-from-LinuxSigInf.patch @@ -0,0 +1,26 @@ +From 3d12eb821e105111cbd88f5598746bd77c3a9ef0 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 15:12:39 -0700 +Subject: [PATCH 08/12] Use correct member name __si_fields from LinuxSigInfo + +Signed-off-by: Khem Raj +--- + sandbox/linux/seccomp-bpf/trap.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sandbox/linux/seccomp-bpf/trap.cc b/sandbox/linux/seccomp-bpf/trap.cc +index 003708d2c..0fef3148f 100644 +--- a/sandbox/linux/seccomp-bpf/trap.cc ++++ b/sandbox/linux/seccomp-bpf/trap.cc +@@ -168,7 +168,7 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) { + // most versions of glibc don't include this information in siginfo_t. So, + // we need to explicitly copy it into a arch_sigsys structure. + struct arch_sigsys sigsys; +- memcpy(&sigsys, &info->_sifields, sizeof(sigsys)); ++ memcpy(&sigsys, &info->__si_fields, sizeof(sigsys)); + + #if defined(__mips__) + // When indirect syscall (syscall(__NR_foo, ...)) is made on Mips, the +-- +2.13.2 + diff --git a/recipes-qt/qt5/qtwebengine/0009-Match-syscalls-to-match-musl.patch b/recipes-qt/qt5/qtwebengine/0009-Match-syscalls-to-match-musl.patch new file mode 100644 index 00000000..bfb6ebb6 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0009-Match-syscalls-to-match-musl.patch @@ -0,0 +1,47 @@ +From 5843df01580b0fb956ee4b7e1a60c0130c8c90f9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 15:24:49 -0700 +Subject: [PATCH 09/12] Match syscalls to match musl + +Signed-off-by: Khem Raj +--- + third_party/lss/linux_syscall_support.h | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/third_party/lss/linux_syscall_support.h b/third_party/lss/linux_syscall_support.h +index 9dbd2391b..a715de177 100644 +--- a/third_party/lss/linux_syscall_support.h ++++ b/third_party/lss/linux_syscall_support.h +@@ -793,6 +793,14 @@ struct kernel_statfs { + #endif + + ++#undef stat64 ++#undef fstat64 ++ ++#ifndef __NR_fstatat ++#define __NR_fstatat __NR_fstatat64 ++#endif ++ ++ + #if defined(__x86_64__) + #ifndef ARCH_SET_GS + #define ARCH_SET_GS 0x1001 +@@ -1210,6 +1218,14 @@ struct kernel_statfs { + #ifndef __NR_fallocate + #define __NR_fallocate 285 + #endif ++ ++#ifndef __NR_pread ++#define __NR_pread __NR_pread64 ++#endif ++#ifndef __NR_pwrite ++#define __NR_pwrite __NR_pwrite64 ++#endif ++ + /* End of x86-64 definitions */ + #elif defined(__mips__) + #if _MIPS_SIM == _MIPS_SIM_ABI32 +-- +2.13.2 + diff --git a/recipes-qt/qt5/qtwebengine/0010-Define-res_ninit-and-res_nclose-for-non-glibc-platfo.patch b/recipes-qt/qt5/qtwebengine/0010-Define-res_ninit-and-res_nclose-for-non-glibc-platfo.patch new file mode 100644 index 00000000..1825ed7b --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0010-Define-res_ninit-and-res_nclose-for-non-glibc-platfo.patch @@ -0,0 +1,81 @@ +From df3fd62f7f0c51c11e7f715c2523418c31eb6b0f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 15:27:50 -0700 +Subject: [PATCH 10/12] Define res_ninit and res_nclose for non-glibc platforms + +Signed-off-by: Khem Raj +--- + net/dns/dns_config_service_posix.cc | 4 ++++ + net/dns/dns_reloader.cc | 4 ++++ + net/dns/resolv_compat.h | 29 +++++++++++++++++++++++++++++ + 3 files changed, 37 insertions(+) + create mode 100644 net/dns/resolv_compat.h + +diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc +index ba8a36913..e9b40d07f 100644 +--- a/net/dns/dns_config_service_posix.cc ++++ b/net/dns/dns_config_service_posix.cc +@@ -25,6 +25,10 @@ + #include "net/dns/notify_watcher_mac.h" + #include "net/dns/serial_worker.h" + ++#if defined(OS_LINUX) && !defined(__GLIBC__) ++#include "net/dns/resolv_compat.h" ++#endif ++ + #if defined(OS_MACOSX) && !defined(OS_IOS) + #include "net/dns/dns_config_watcher_mac.h" + #endif +diff --git a/net/dns/dns_reloader.cc b/net/dns/dns_reloader.cc +index 74534e6b1..2780a776e 100644 +--- a/net/dns/dns_reloader.cc ++++ b/net/dns/dns_reloader.cc +@@ -9,6 +9,10 @@ + + #include + ++#if defined(OS_LINUX) && !defined(__GLIBC__) ++#include "net/dns/resolv_compat.h" ++#endif ++ + #include "base/lazy_instance.h" + #include "base/logging.h" + #include "base/macros.h" +diff --git a/net/dns/resolv_compat.h b/net/dns/resolv_compat.h +new file mode 100644 +index 000000000..4f0e852a1 +--- /dev/null ++++ b/net/dns/resolv_compat.h +@@ -0,0 +1,29 @@ ++#if !defined(__GLIBC__) ++/*************************************************************************** ++ * resolv_compat.h ++ * ++ * Mimick GLIBC's res_ninit() and res_nclose() for musl libc ++ * Note: res_init() is actually deprecated according to ++ * http://docs.oracle.com/cd/E36784_01/html/E36875/res-nclose-3resolv.html ++ **************************************************************************/ ++#include ++ ++static inline int res_ninit(res_state statp) ++{ ++ int rc = res_init(); ++ if (statp != &_res) { ++ memcpy(statp, &_res, sizeof(*statp)); ++ } ++ return rc; ++} ++ ++static inline int res_nclose(res_state statp) ++{ ++ if (!statp) ++ return -1; ++ if (statp != &_res) { ++ memset(statp, 0, sizeof(*statp)); ++ } ++ return 0; ++} ++#endif +-- +2.13.2 + diff --git a/recipes-qt/qt5/qtwebengine/0011-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/0011-Do-not-define-__sbrk-on-musl.patch new file mode 100644 index 00000000..a2c2b901 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0011-Do-not-define-__sbrk-on-musl.patch @@ -0,0 +1,29 @@ +From 8a6553232988a5bfc8f0c48d4214a3982025fb2c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 15:39:57 -0700 +Subject: [PATCH 11/12] Do not define __sbrk on musl + +musl libc does not have sbrk. on musl libc will only work when called with 0 as +argument, so we just let it out for now + +Signed-off-by: Khem Raj +--- + third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h +index edc8cf2db..a868b50d3 100644 +--- a/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h ++++ b/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h +@@ -233,7 +233,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size, + } + + // Don't hook sbrk() in Android, since it doesn't expose __sbrk. +-#if !defined(__ANDROID__) ++#if !defined(__ANDROID__) && defined(__GLIBC__) + // libc's version: + extern "C" void* __sbrk(ptrdiff_t increment); + +-- +2.13.2 + diff --git a/recipes-qt/qt5/qtwebengine/0012-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/0012-Adjust-default-pthread-stack-size.patch new file mode 100644 index 00000000..de2ec97d --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0012-Adjust-default-pthread-stack-size.patch @@ -0,0 +1,51 @@ +From 65d516f64c1cca91868cb26aeb93802382704fd5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 16:41:23 -0700 +Subject: [PATCH 1/2] Adjust default pthread stack size + +Signed-off-by: Khem Raj +--- + base/threading/platform_thread_linux.cc | 3 ++- + chrome/browser/chrome_browser_main_posix.cc | 9 +++++++++ + third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp | 4 ++-- + 3 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/base/threading/platform_thread_linux.cc b/base/threading/platform_thread_linux.cc +index 95ed32418..666e85ba3 100644 +--- a/base/threading/platform_thread_linux.cc ++++ b/base/threading/platform_thread_linux.cc +@@ -96,7 +96,8 @@ void TerminateOnThread() {} + + size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { + #if !defined(THREAD_SANITIZER) +- return 0; ++ // use 8mb like glibc to avoid running out of space ++ return (1 << 23); + #else + // ThreadSanitizer bloats the stack heavily. Evidence has been that the + // default stack size isn't enough for some browser tests. +diff --git a/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp b/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp +index 3c0a0395b..2af6073e2 100644 +--- a/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp ++++ b/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp +@@ -73,7 +73,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() + // FIXME: On Mac OSX and Linux, this method cannot estimate stack size + // correctly for the main thread. + +-#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + // pthread_getattr_np() can fail if the thread is not invoked by + // pthread_create() (e.g., the main thread of webkit_unit_tests). + // If so, a conservative size estimate is returned. +@@ -135,7 +135,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() + + void* StackFrameDepth::getStackStart() + { +-#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + pthread_attr_t attr; + int error; + #if OS(FREEBSD) +-- +2.13.2 + diff --git a/recipes-qt/qt5/qtwebengine/0013-include-asm-generic-ioctl.h-for-TCGETS2.patch b/recipes-qt/qt5/qtwebengine/0013-include-asm-generic-ioctl.h-for-TCGETS2.patch new file mode 100644 index 00000000..abe2eaf8 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0013-include-asm-generic-ioctl.h-for-TCGETS2.patch @@ -0,0 +1,25 @@ +From d5014cf9a97cf97a6e9bb7f751c7cee3c24e17fd Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 17:15:34 -0700 +Subject: [PATCH 1/2] include asm-generic/ioctl.h for TCGETS2 + +Signed-off-by: Khem Raj +--- + device/serial/serial_io_handler_posix.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/device/serial/serial_io_handler_posix.cc b/device/serial/serial_io_handler_posix.cc +index 158c374a0..c08fb4a8e 100644 +--- a/device/serial/serial_io_handler_posix.cc ++++ b/device/serial/serial_io_handler_posix.cc +@@ -6,6 +6,7 @@ + + #include + #include ++#include + + #include "base/posix/eintr_wrapper.h" + #include "build/build_config.h" +-- +2.13.2 + diff --git a/recipes-qt/qt5/qtwebengine/0014-link-with-libexecinfo-on-musl.patch b/recipes-qt/qt5/qtwebengine/0014-link-with-libexecinfo-on-musl.patch new file mode 100644 index 00000000..1b65420b --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0014-link-with-libexecinfo-on-musl.patch @@ -0,0 +1,25 @@ +From 4b5aab95e34e1cbebc7566c1267cddc2560601c8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 17:41:43 -0700 +Subject: [PATCH 2/2] link with libexecinfo on musl + +Signed-off-by: Khem Raj +--- + base/base.gyp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/base/base.gyp b/base/base.gyp +index 67e051ae4..7f5dfe214 100644 +--- a/base/base.gyp ++++ b/base/base.gyp +@@ -126,6 +126,7 @@ + '-lrt', + # For 'native_library_linux.cc' + '-ldl', ++ '-lexecinfo', + ], + }, + 'conditions': [ +-- +2.13.2 + diff --git a/recipes-qt/qt5/qtwebengine/0018-tcmalloc-Use-off64_t-insread-of-__off64_t.patch b/recipes-qt/qt5/qtwebengine/0018-tcmalloc-Use-off64_t-insread-of-__off64_t.patch new file mode 100644 index 00000000..2ef54339 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0018-tcmalloc-Use-off64_t-insread-of-__off64_t.patch @@ -0,0 +1,26 @@ +From 1a468dd5239ebdf013d9ffb3a2d181d0434b4c6c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 8 Jul 2017 09:08:23 -0700 +Subject: [PATCH 2/2] tcmalloc: Use off64_t insread of __off64_t + +Signed-off-by: Khem Raj +--- + third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +index b53dd46c5..58da4d19d 100644 +--- a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h ++++ b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +@@ -1930,7 +1930,7 @@ typedef unsigned long int ulong; + #if defined(__x86_64__) + /* Need to make sure __off64_t isn't truncated to 32-bits under x32. */ + LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d, +- __off64_t o) { ++ off64_t o) { + LSS_BODY(6, void*, mmap, LSS_SYSCALL_ARG(s), LSS_SYSCALL_ARG(l), + LSS_SYSCALL_ARG(p), LSS_SYSCALL_ARG(f), + LSS_SYSCALL_ARG(d), (uint64_t)(o)); +-- +2.13.2 + diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index e319a01f..033bdaae 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -24,7 +24,13 @@ DEPENDS += " \ " DEPENDS += "yasm-native" -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 \ +" # To use system ffmpeg you need to enable also libwebp, opus, vpx # Only depenedencies available in oe-core are enabled by default @@ -88,6 +94,13 @@ do_configure() { -after ${EXTRA_QMAKEVARS_POST} } +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() { @@ -119,6 +132,22 @@ SRC_URI += " \ file://0003-chromium-v8-fix-build-with-gcc7.patch;patchdir=src/3rdparty \ file://0004-chromium-WebKit-fix-build-with-gcc7.patch;patchdir=src/3rdparty \ " +SRC_URI_append_libc-musl = "\ + file://0001-sandbox-Define-TEMP_FAILURE_RETRY-if-not-defined.patch;patchdir=src/3rdparty/chromium \ + file://0003-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty/chromium \ + file://0004-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty/chromium \ + file://0005-use-off64_t-instead-of-the-internal-__off64_t.patch;patchdir=src/3rdparty/chromium \ + file://0006-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty/chromium \ + file://0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch;patchdir=src/3rdparty/chromium \ + file://0008-Use-correct-member-name-__si_fields-from-LinuxSigInf.patch;patchdir=src/3rdparty/chromium \ + file://0009-Match-syscalls-to-match-musl.patch;patchdir=src/3rdparty/chromium \ + file://0010-Define-res_ninit-and-res_nclose-for-non-glibc-platfo.patch;patchdir=src/3rdparty/chromium \ + file://0011-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty/chromium \ + file://0012-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty/chromium \ + file://0013-include-asm-generic-ioctl.h-for-TCGETS2.patch;patchdir=src/3rdparty/chromium \ + file://0014-link-with-libexecinfo-on-musl.patch;patchdir=src/3rdparty/chromium \ + file://0018-tcmalloc-Use-off64_t-insread-of-__off64_t.patch;patchdir=src/3rdparty/chromium \ +" SRCREV_qtwebengine = "d740d6a7dbfec387752c7bc8a8b06db0e757c9dc" SRCREV_chromium = "15d257fd921f37b32ef643225f21df0ea24c8302" -- cgit v1.2.3 From e1027a5e6044069c8d33caa7e42eb45107e8f753 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 13 Jul 2017 00:41:53 -0700 Subject: qtvirtualkeyboard: Include sys/time.h Fixes build on musl Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- .../0001-include-sys-time.h-for-timeval.patch | 28 ++++++++++++++++++++++ recipes-qt/qt5/qtvirtualkeyboard_git.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch diff --git a/recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch b/recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch new file mode 100644 index 00000000..8518ae96 --- /dev/null +++ b/recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch @@ -0,0 +1,28 @@ +From 78106c5b939cc7d84710fe4c8e2a356ac1f110ef Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Jul 2017 23:59:52 -0700 +Subject: [PATCH] include sys/time.h for timeval + +Musl exposes this issue since its not indirectly +including sys/time.h like glibc + +Signed-off-by: Khem Raj +--- + src/virtualkeyboard/3rdparty/pinyin/include/userdict.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/virtualkeyboard/3rdparty/pinyin/include/userdict.h b/src/virtualkeyboard/3rdparty/pinyin/include/userdict.h +index 1b9673f..924be7b 100644 +--- a/src/virtualkeyboard/3rdparty/pinyin/include/userdict.h ++++ b/src/virtualkeyboard/3rdparty/pinyin/include/userdict.h +@@ -24,6 +24,7 @@ + // Debug performance for operations + // #define ___DEBUG_PERF___ + ++#include + #ifdef _WIN32 + #include // timeval + #else +-- +2.13.2 + diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 08914b19..244e529d 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -5,6 +5,7 @@ LICENSE = "GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ " +SRC_URI += "file://0001-include-sys-time.h-for-timeval.patch" # To enabled Nuance T9 Write support, you need to provide the licensed components # and enable "t9write" in PACKAGECONFIG. This can be done in a separate .bbappend file. -- cgit v1.2.3 From 045e39b7d487733b03dc54590702e4c9373ed0f1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 13 Jul 2017 00:41:54 -0700 Subject: qt5-creator: Link with libexecinfo on musl Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-creator/musl-backtrace.patch | 18 ++++++++++++++++++ recipes-qt/qt5/qt5-creator_3.5.1.bb | 6 ++++++ 2 files changed, 24 insertions(+) create mode 100644 recipes-qt/qt5/qt5-creator/musl-backtrace.patch diff --git a/recipes-qt/qt5/qt5-creator/musl-backtrace.patch b/recipes-qt/qt5/qt5-creator/musl-backtrace.patch new file mode 100644 index 00000000..fc7f86c2 --- /dev/null +++ b/recipes-qt/qt5/qt5-creator/musl-backtrace.patch @@ -0,0 +1,18 @@ +Index: qt-creator-opensource-src-3.5.1/src/plugins/debugger/debugger.pro +=================================================================== +--- qt-creator-opensource-src-3.5.1.orig/src/plugins/debugger/debugger.pro ++++ qt-creator-opensource-src-3.5.1/src/plugins/debugger/debugger.pro +@@ -148,3 +148,4 @@ include(qml/qml.pri) + include(namedemangler/namedemangler.pri) + + include(shared/shared.pri) ++LIBS *= -lexecinfo +Index: qt-creator-opensource-src-3.5.1/src/plugins/qmldesigner/config.pri +=================================================================== +--- qt-creator-opensource-src-3.5.1.orig/src/plugins/qmldesigner/config.pri ++++ qt-creator-opensource-src-3.5.1/src/plugins/qmldesigner/config.pri +@@ -9,3 +9,4 @@ equals(TMP_BAUHAUS_NO_OUTPUT, true):DEFI + DEFINES += ENABLE_TEXT_VIEW + + isEmpty($$(BAUHAUS_OUTPUT_IN_TEST)):DEFINES += QDEBUG_IN_TESTS WARNINGS_IN_TESTS ++LIBS *= -lexecinfo diff --git a/recipes-qt/qt5/qt5-creator_3.5.1.bb b/recipes-qt/qt5/qt5-creator_3.5.1.bb index c85f38ce..786b2024 100644 --- a/recipes-qt/qt5/qt5-creator_3.5.1.bb +++ b/recipes-qt/qt5/qt5-creator_3.5.1.bb @@ -17,6 +17,7 @@ LIC_FILES_CHKSUM = " \ inherit qmake5 DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg qtquick1" +DEPENDS_append_libc-musl = " libexecinfo" SRC_URI = " \ http://download.qt.io/official_releases/qtcreator/3.5/${PV}/qt-creator-opensource-src-${PV}.tar.gz \ @@ -25,6 +26,10 @@ SRC_URI = " \ file://0001-Qmlpuppet-add-missing-includes.patch \ file://qtcreator.desktop.in \ " + +SRC_URI_append_libc-musl = " file://musl-backtrace.patch " + + SRC_URI[md5sum] = "77aef7df837eba07c7ce6037ee504c05" SRC_URI[sha256sum] = "5925ac818a08be919094e0f28fb4c5d8896765e0975d54d353e4c50f13d63e65" @@ -32,6 +37,7 @@ S = "${WORKDIR}/qt-creator-opensource-src-${PV}" EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}${QT_DIR_NAME}" +LDFLAGS_append_libc-musl = " -lexecinfo " do_configure_append() { # Find native tools sed -i 's:${STAGING_BINDIR}.*/lrelease:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease:g' ${B}/share/qtcreator/translations/Makefile -- cgit v1.2.3 From 3c4f2cba1ff6925da20bcf4469526aceee80ad90 Mon Sep 17 00:00:00 2001 From: Diego Rondini Date: Thu, 20 Jul 2017 14:07:01 +0200 Subject: python-pyqt5: include QtWidgets module Signed-off-by: Diego Rondini Signed-off-by: Martin Jansa --- ...sip-fix-build-with-accessibility-disabled.patch | 35 ++++++++++++++++++++++ recipes-python/pyqt5/python-pyqt5_5.8.2.bb | 5 ++-- 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 recipes-python/pyqt5/files/0001-qtabbar.sip-fix-build-with-accessibility-disabled.patch diff --git a/recipes-python/pyqt5/files/0001-qtabbar.sip-fix-build-with-accessibility-disabled.patch b/recipes-python/pyqt5/files/0001-qtabbar.sip-fix-build-with-accessibility-disabled.patch new file mode 100644 index 00000000..7e1c7bf4 --- /dev/null +++ b/recipes-python/pyqt5/files/0001-qtabbar.sip-fix-build-with-accessibility-disabled.patch @@ -0,0 +1,35 @@ +From 8a2f852417414e19d060da66cd7c5cba76e43c7d Mon Sep 17 00:00:00 2001 +From: Diego Rondini +Date: Wed, 19 Jul 2017 14:17:51 +0200 +Subject: [PATCH] qtabbar.sip: fix build with accessibility disabled + +Upstream-Status: Submitted + +Signed-off-by: Diego Rondini +--- + sip/QtWidgets/qtabbar.sip | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/sip/QtWidgets/qtabbar.sip b/sip/QtWidgets/qtabbar.sip +index ffe2d3b..80ad816 100644 +--- a/sip/QtWidgets/qtabbar.sip ++++ b/sip/QtWidgets/qtabbar.sip +@@ -166,11 +166,15 @@ protected: + + public: + %If (Qt_5_8_0 -) ++%If (PyQt_Accessibility) + QString accessibleTabName(int index) const; + %End ++%End + %If (Qt_5_8_0 -) ++%If (PyQt_Accessibility) + void setAccessibleTabName(int index, const QString &name); + %End ++%End + + private: + QTabBar(const QTabBar &); +-- +2.7.4 + diff --git a/recipes-python/pyqt5/python-pyqt5_5.8.2.bb b/recipes-python/pyqt5/python-pyqt5_5.8.2.bb index 3fa3d644..fdfa1205 100644 --- a/recipes-python/pyqt5/python-pyqt5_5.8.2.bb +++ b/recipes-python/pyqt5/python-pyqt5_5.8.2.bb @@ -11,6 +11,7 @@ DEPENDS = "sip sip-native qtbase python" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/pyqt/PyQt5_gpl-${PV}.tar.gz \ file://fix-sm.patch \ + file://0001-qtabbar.sip-fix-build-with-accessibility-disabled.patch \ " SRC_URI[md5sum] = "c3048e9d242f3e72fd393630da1d971a" SRC_URI[sha256sum] = "ebd70515b30bbd6098fee29e6271a6696b1183c5530ee30e6ba9aaab195536e8" @@ -31,8 +32,8 @@ DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager" DISABLED_FEATURES_append_arm = " PyQt_qreal_double" -PYQT_MODULES = "QtCore QtGui QtNetwork" -PYQT_MODULES_aarch64 = "QtCore QtGui QtNetwork" +PYQT_MODULES = "QtCore QtGui QtNetwork QtWidgets" +PYQT_MODULES_aarch64 = "QtCore QtGui QtNetwork QtWidgets" do_configure_prepend() { cd ${S} -- cgit v1.2.3 From c2907d265b15a07ffe0a4a0a1fb245eaa9d79a0e Mon Sep 17 00:00:00 2001 From: Mikko Rapeli Date: Fri, 21 Jul 2017 11:20:32 +0300 Subject: qt5-git.inc: set CVE_PRODUCT to qt It is used in NVD for CVE's like: https://nvd.nist.gov/vuln/detail/CVE-2015-1860 Signed-off-by: Mikko Rapeli Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-git.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index f8649533..1cb115f3 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -10,6 +10,8 @@ SRC_URI = " \ ${QT_GIT}/${QT_MODULE}.git;name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL} \ " +CVE_PRODUCT = "qt" + S = "${WORKDIR}/git" PV = "5.8.0+git${SRCPV}" -- cgit v1.2.3 From 8960831c154848e42bc433871a7424d7d39ddbdc Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 21 Jul 2017 14:41:31 +0200 Subject: qwt-qt5.inc: fix QA warning * it was partially fixed in previous change, but there was still: qwt-qt5-6.1.3: qwt-qt5-dbg: found library in wrong location: /usr/plugins/designer/.debug/libqwt_designer_plugin.so [libdir] Signed-off-by: Martin Jansa --- recipes-qt/qwt/qwt-qt5.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qwt/qwt-qt5.inc b/recipes-qt/qwt/qwt-qt5.inc index 90bd9f72..f3ece399 100644 --- a/recipes-qt/qwt/qwt-qt5.inc +++ b/recipes-qt/qwt/qwt-qt5.inc @@ -45,4 +45,4 @@ FILES_${PN}-dbg += "${prefix}/plugins/designer/.debug" FILES_${PN}-doc += "${prefix}/doc" INSANE_SKIP_${PN}-plugins += "libdir" - +INSANE_SKIP_${PN}-dbg += "libdir" -- cgit v1.2.3 From 6e9892aa3c675c74e32f3039ab5d210634ab878d Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Tue, 25 Jul 2017 09:30:23 +0800 Subject: qtbase: add ptest Add ptest for qtbase by using provided testsuite. Signed-off-by: Huang Qiyu Signed-off-by: Martin Jansa --- .../0001-Delete-qlonglong-and-qulonglong.patch | 28 ++++++++++++++++++++++ recipes-qt/qt5/qtbase/run-ptest | 6 +++++ recipes-qt/qt5/qtbase_git.bb | 17 ++++++++++++- 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 recipes-qt/qt5/qtbase/0001-Delete-qlonglong-and-qulonglong.patch create mode 100644 recipes-qt/qt5/qtbase/run-ptest diff --git a/recipes-qt/qt5/qtbase/0001-Delete-qlonglong-and-qulonglong.patch b/recipes-qt/qt5/qtbase/0001-Delete-qlonglong-and-qulonglong.patch new file mode 100644 index 00000000..975cd28d --- /dev/null +++ b/recipes-qt/qt5/qtbase/0001-Delete-qlonglong-and-qulonglong.patch @@ -0,0 +1,28 @@ +From c67a4af2e5db4c1e2213961e6392b59affd1959f Mon Sep 17 00:00:00 2001 +From: Huang Qiyu +Date: Wed, 7 Jun 2017 21:00:49 +0900 +Subject: [PATCH] Delete qlonglong and qulonglong + +Signed-off-by: Huang Qiyu +--- + tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro +index 09458bd..59a120e 100644 +--- a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro ++++ b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro +@@ -5,10 +5,8 @@ SUBDIRS=\ + char32_t \ + int \ + long \ +- qlonglong \ + qptrdiff \ + quintptr \ +- qulonglong \ + schar \ + short \ + uchar \ +-- +2.7.4 + diff --git a/recipes-qt/qt5/qtbase/run-ptest b/recipes-qt/qt5/qtbase/run-ptest new file mode 100644 index 00000000..044f834d --- /dev/null +++ b/recipes-qt/qt5/qtbase/run-ptest @@ -0,0 +1,6 @@ +#!/bin/sh + +for x in ` awk '{print $1}' tst_list `;do + ./${x}; +done + diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 5cfbcfa9..8464873b 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -23,8 +23,12 @@ SRC_URI += "\ file://0005-configure-bump-path-length-from-256-to-512-character.patch \ file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ + file://0001-Delete-qlonglong-and-qulonglong.patch \ + file://run-ptest \ " +inherit ptest + # only for target qtbase SRC_URI += "\ file://0008-configure-paths-for-target-qmake-properly.patch \ @@ -48,7 +52,7 @@ PACKAGECONFIG_DISTRO ?= "" PACKAGECONFIG_RELEASE ?= "release" # This is in qt5.inc, because qtwebkit-examples are using it to enable ca-certificates dependency # PACKAGECONFIG_OPENSSL ?= "openssl" -PACKAGECONFIG_DEFAULT ?= "dbus udev evdev widgets tools libs freetype" +PACKAGECONFIG_DEFAULT ?= "dbus udev evdev widgets tools libs freetype tests" PACKAGECONFIG ?= " \ ${PACKAGECONFIG_RELEASE} \ @@ -171,6 +175,17 @@ do_configure() { ${QT_CONFIG_FLAGS} } +fakeroot do_install_ptest() { + mkdir -p ${D}${PTEST_PATH} + t=${D}${PTEST_PATH} + for var in ` find ${B}/tests/auto/ -name tst_*`; do + if [ not ` echo ${var##*/} | grep '\.'` ]; then + echo ${var##*/} >> ${t}/tst_list + install -m 0644 ${var} ${t} + fi + done +} + do_install_append() { # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" touch ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/oe-device-extra.pri -- cgit v1.2.3 From d53382fcb332846194080d8772d6069770ffae69 Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Wed, 26 Jul 2017 11:49:46 +0200 Subject: qt5-ptest: fix build with yocto < 2.3 (pyro) The expand parameter to DataSmart.getVar() defaults to True since yocto 2.3 (pyro) [0]. Stable Yocto releases 2.2 (morty) and 2.1 (krogoth) had no default value. Older, now unsupported releases defaulted to False [1] [2]. Not passing the expand parameter here means all recipes including qt5-ptest.inc won't build with yocto 2.2 and 2.1 with this error message: $ bitbake qtxmlpatterns -vfc populate_sysroot [...] ERROR: Error executing a python function in exec_python_func() autogenerated: The stack trace of python calls that resulted in this exception/failure was: File: 'exec_python_func() autogenerated', lineno: 2, function: 0001: *** 0002:do_populate_sysroot(d) 0003: File: '[...]/poky/meta/classes/staging.bbclass', lineno: 227, function: do_populate_sysroot 0223: p = p.replace("/", "_") 0224: with open(provdir + p, "w") as f: 0225: f.write(pn) 0226:} *** 0227: 0228:do_populate_sysroot[vardeps] += "${SYSROOT_PREPROCESS_FUNCS}" 0229:do_populate_sysroot[vardepsexclude] += "MULTI_PROVIDER_WHITELIST" 0230: 0231:SSTATETASKS += "do_populate_sysroot" Exception: TypeError: getVar() missing 1 required positional argument: 'expand' DEBUG: Python function do_populate_sysroot finished ERROR: Function failed: do_populate_sysroot Fixing this in a user layer requires duplicating the entire do_populate_sysroot_append() in the .bbappend of all packages including qt5-ptest.inc, i.e. currently qtdeclarative, qtquick1 and qtxmlpatterns. Avoid the hassle for those users by explicitly passing expand=True. [0] http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=2631c375b8a025ee2e4329f6d93900bb7b5dadf7 [1] http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=c7610aa353e31977c099ce574acb188a3f4219e0 [2] http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=4e5e501155a21fe64a470c626b3afe6d9748308e Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-ptest.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qt5-ptest.inc b/recipes-qt/qt5/qt5-ptest.inc index d39f65aa..4844878a 100644 --- a/recipes-qt/qt5/qt5-ptest.inc +++ b/recipes-qt/qt5/qt5-ptest.inc @@ -14,7 +14,7 @@ do_compile_ptest() { } do_populate_sysroot_append_class-target() { - workdir = d.getVar('WORKDIR') + workdir = d.getVar('WORKDIR', True) srcdir = workdir + '/sysroot-destdir/usr/' destdir = workdir + '/recipe-sysroot/usr/' -- cgit v1.2.3 From 904296915495f7f606f5a07cb444d76903093ca0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 26 Jul 2017 11:55:40 -0700 Subject: qtbase: Fix ptests with clang Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- ...-Disable-Wformat-security-with-clang-as-w.patch | 32 ++++++++++++++++++++++ recipes-qt/qt5/qtbase_git.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 recipes-qt/qt5/qtbase/0010-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch diff --git a/recipes-qt/qt5/qtbase/0010-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch b/recipes-qt/qt5/qtbase/0010-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch new file mode 100644 index 00000000..77b357cb --- /dev/null +++ b/recipes-qt/qt5/qtbase/0010-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch @@ -0,0 +1,32 @@ +From 8284ebfe59c0011db71df7fb143b8e6a99f6952e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 25 Jul 2017 19:40:52 -0700 +Subject: [PATCH 10/10] tst_qstring: Disable Wformat-security with clang as + well + +Currently, its only disabled for gcc, but we need to disable +it with clang as well in order to compile it successfully with +clang + +Signed-off-by: Khem Raj +--- + tests/auto/corelib/tools/qstring/tst_qstring.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/tests/auto/corelib/tools/qstring/tst_qstring.cpp b/tests/auto/corelib/tools/qstring/tst_qstring.cpp +index a0a872710c..20a9a9f9db 100644 +--- a/tests/auto/corelib/tools/qstring/tst_qstring.cpp ++++ b/tests/auto/corelib/tools/qstring/tst_qstring.cpp +@@ -1066,6 +1066,9 @@ void tst_QString::acc_01() + + QT_WARNING_PUSH + QT_WARNING_DISABLE_GCC("-Wformat-security") ++#ifdef __clang__ ++QT_WARNING_DISABLE_CLANG("-Wformat-security") ++#endif + + void tst_QString::isNull() + { +-- +2.13.3 + diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 8464873b..7b82c00f 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -24,6 +24,7 @@ SRC_URI += "\ file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ file://0001-Delete-qlonglong-and-qulonglong.patch \ + file://0010-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch \ file://run-ptest \ " -- cgit v1.2.3 From 0b41b62ca5b69112c1afd4736a96b41fc4c4bea9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 1 Aug 2017 19:55:22 -0700 Subject: qtbase: Use sched_yield instead of pthread_yield Makes it portable across glibc and musl Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- ...11-Replace-pthread_yield-with-sched_yield.patch | 63 ++++++++++++++++++++++ recipes-qt/qt5/qtbase_git.bb | 1 + 2 files changed, 64 insertions(+) create mode 100644 recipes-qt/qt5/qtbase/0011-Replace-pthread_yield-with-sched_yield.patch diff --git a/recipes-qt/qt5/qtbase/0011-Replace-pthread_yield-with-sched_yield.patch b/recipes-qt/qt5/qtbase/0011-Replace-pthread_yield-with-sched_yield.patch new file mode 100644 index 00000000..ed0d4bc9 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0011-Replace-pthread_yield-with-sched_yield.patch @@ -0,0 +1,63 @@ +From d1d4b520e29b58e427fc7bd336d34b82d0d2b1f3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 27 Jul 2017 08:02:51 -0700 +Subject: [PATCH] Replace pthread_yield with sched_yield + +On Linux pthead_yield is same as sched_yield implementation wise +and sched_yield is available on all libc +implementations on Linux + +Signed-off-by: Khem Raj +--- + tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 4 ++-- + tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 5 +++-- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +index 7d9f56ef38..bc115ef61d 100644 +--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp ++++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +@@ -34,7 +34,7 @@ + #include "tst_qvariant_common.h" + + #ifdef Q_OS_LINUX +-# include ++# include + #endif + + #include +@@ -197,7 +197,7 @@ protected: + const char *nm = name.constData(); + int tp = qRegisterMetaType(nm); + #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) +- pthread_yield(); ++ sched_yield(); + #endif + QMetaType info(tp); + if (!info.isValid()) { +diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +index fe1057bdde..e23e97b259 100644 +--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp ++++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +@@ -75,6 +75,7 @@ + #include + #include + #include ++#include + #endif + + #include "private/qhostinfo_p.h" +@@ -2129,8 +2130,8 @@ public slots: + + #if defined(Q_OS_MAC) + pthread_yield_np(); +-#elif defined Q_OS_LINUX && !defined Q_OS_ANDROID +- pthread_yield(); ++#elif defined Q_OS_LINUX ++ sched_yield(); + #endif + if (!sock->waitForConnected()) { + networkTimeout = true; +-- +2.13.3 + diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 7b82c00f..3523dc1c 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -25,6 +25,7 @@ SRC_URI += "\ file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ file://0001-Delete-qlonglong-and-qulonglong.patch \ file://0010-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch \ + file://0011-Replace-pthread_yield-with-sched_yield.patch \ file://run-ptest \ " -- cgit v1.2.3 From 17d94b798abd0216e2d2fd5f1408523eabee6893 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Sun, 6 Aug 2017 17:17:04 +1000 Subject: quazip: update to 0.7.3 and add missing metadata The license checksum has changed as a static linking exception has been added on top of the LGPL 2.1 license. Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa --- recipes-qt/quazip/quazip_0.7.2.bb | 13 ------------- recipes-qt/quazip/quazip_0.7.3.bb | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 13 deletions(-) delete mode 100644 recipes-qt/quazip/quazip_0.7.2.bb create mode 100644 recipes-qt/quazip/quazip_0.7.3.bb diff --git a/recipes-qt/quazip/quazip_0.7.2.bb b/recipes-qt/quazip/quazip_0.7.2.bb deleted file mode 100644 index 6b09cf9c..00000000 --- a/recipes-qt/quazip/quazip_0.7.2.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Qt/C++ wrapper for ZIP/UNZIP package" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4" -DEPENDS = "qtbase" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz" -SRC_URI[md5sum] = "84163487a4c3470781c93e5f56c4ca43" -SRC_URI[sha256sum] = "91d827fbcafd099ae814cc18a8dd3bb709da6b8a27c918ee1c6c03b3f29440f4" - -inherit qmake5 - -EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}" -EXTRA_QMAKEVARS_POST += "SUBDIRS=${BPN}" diff --git a/recipes-qt/quazip/quazip_0.7.3.bb b/recipes-qt/quazip/quazip_0.7.3.bb new file mode 100644 index 00000000..970204e5 --- /dev/null +++ b/recipes-qt/quazip/quazip_0.7.3.bb @@ -0,0 +1,15 @@ +SUMMARY = "Qt/C++ wrapper for ZIP/UNZIP package" +HOMEPAGE = "http://quazip.sourceforge.net/" +BUGTRACKER = "https://sourceforge.net/p/quazip/bugs/" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=910d778aab53617cbaf13c4e1810e289" +DEPENDS = "qtbase" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz" +SRC_URI[md5sum] = "2ba7dd8b1d6dd588374c9fab5c46e76e" +SRC_URI[sha256sum] = "2ad4f354746e8260d46036cde1496c223ec79765041ea28eb920ced015e269b5" + +inherit qmake5 + +EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}" +EXTRA_QMAKEVARS_POST += "SUBDIRS=${BPN}" -- cgit v1.2.3 From 3963daa20d00a98ee7a4966d52561632256e083c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 8 Aug 2017 23:32:58 -0700 Subject: qtwebkit: Backport a patch to fix build with icu-59 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Khem Raj Tested-by: Andreas Müller Signed-off-by: Martin Jansa --- .../0004-Fix-compilation-with-ICU-59.patch | 92 ++++++++++++++++++++++ recipes-qt/qt5/qtwebkit_git.bb | 1 + 2 files changed, 93 insertions(+) create mode 100644 recipes-qt/qt5/qtwebkit/0004-Fix-compilation-with-ICU-59.patch diff --git a/recipes-qt/qt5/qtwebkit/0004-Fix-compilation-with-ICU-59.patch b/recipes-qt/qt5/qtwebkit/0004-Fix-compilation-with-ICU-59.patch new file mode 100644 index 00000000..e4a108e8 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0004-Fix-compilation-with-ICU-59.patch @@ -0,0 +1,92 @@ +From d8d9b1eb468f5e5d5d9f0b196fc0acb641998c8b Mon Sep 17 00:00:00 2001 +From: Konstantin Tokarev +Date: Thu, 4 May 2017 15:12:37 +0300 +Subject: [PATCH] Fix compilation with ICU 59 + +Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612 + +Task-number: QTBUG-60532 +Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843 +Reviewed-by: Allan Sandfeld Jensen +--- + Source/JavaScriptCore/API/JSStringRef.cpp | 6 +++--- + Source/JavaScriptCore/runtime/DateConversion.cpp | 3 ++- + Source/WTF/wtf/TypeTraits.h | 3 +++ + Source/WebKit2/Shared/API/c/WKString.cpp | 2 +- + 4 files changed, 9 insertions(+), 5 deletions(-) + +diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp +index 812f3d413..77a3fd0f4 100644 +--- a/Source/JavaScriptCore/API/JSStringRef.cpp ++++ b/Source/JavaScriptCore/API/JSStringRef.cpp +@@ -37,7 +37,7 @@ using namespace WTF::Unicode; + JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars) + { + initializeThreading(); +- return OpaqueJSString::create(chars, numChars).leakRef(); ++ return OpaqueJSString::create(reinterpret_cast(chars), numChars).leakRef(); + } + + JSStringRef JSStringCreateWithUTF8CString(const char* string) +@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string) + JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars) + { + initializeThreading(); +- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); ++ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); + } + + JSStringRef JSStringRetain(JSStringRef string) +@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string) + + const JSChar* JSStringGetCharactersPtr(JSStringRef string) + { +- return string->characters(); ++ return reinterpret_cast(string->characters()); + } + + size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string) +diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp +index 0b57f012d..05e27338b 100644 +--- a/Source/JavaScriptCore/runtime/DateConversion.cpp ++++ b/Source/JavaScriptCore/runtime/DateConversion.cpp +@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as + #if OS(WINDOWS) + TIME_ZONE_INFORMATION timeZoneInformation; + GetTimeZoneInformation(&timeZoneInformation); +- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++ String timeZoneName(reinterpret_cast(winTimeZoneName)); + #else + struct tm gtm = t; + char timeZoneName[70]; +diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h +index 9df2c95cf..f5d6121fd 100644 +--- a/Source/WTF/wtf/TypeTraits.h ++++ b/Source/WTF/wtf/TypeTraits.h +@@ -72,6 +72,9 @@ namespace WTF { + template<> struct IsInteger { static const bool value = true; }; + template<> struct IsInteger { static const bool value = true; }; + template<> struct IsInteger { static const bool value = true; }; ++#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_SUPPORT) ++ template<> struct IsInteger { static const bool value = true; }; ++#endif + #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) + template<> struct IsInteger { static const bool value = true; }; + #endif +diff --git a/Source/WebKit2/Shared/API/c/WKString.cpp b/Source/WebKit2/Shared/API/c/WKString.cpp +index cbac67dd8..23400a64e 100644 +--- a/Source/WebKit2/Shared/API/c/WKString.cpp ++++ b/Source/WebKit2/Shared/API/c/WKString.cpp +@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef) + size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength) + { + COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar); +- return (toImpl(stringRef)->getCharacters(static_cast(buffer), bufferLength)); ++ return (toImpl(stringRef)->getCharacters(reinterpret_cast(buffer), bufferLength)); + } + + size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef) +-- +2.13.3 + diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 4845d0fd..3c52ef3c 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -22,6 +22,7 @@ SRC_URI += "\ file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \ file://0002-Remove-TEXTREL-tag-in-x86.patch \ file://0003-Exclude-backtrace-API-for-non-glibc-libraries.patch \ + file://0004-Fix-compilation-with-ICU-59.patch \ " PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel \ -- cgit v1.2.3 From 7efcea9ab79888af4dcfc8266d75a17ef42e02c4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 8 Aug 2017 23:32:59 -0700 Subject: qt3d: Fix build with clang Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- ...2-Fix-BlenderDNA-for-clang-cross-compiler.patch | 46 ++++++++++++++++++++++ recipes-qt/qt5/qt3d_git.bb | 1 + 2 files changed, 47 insertions(+) create mode 100644 recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch diff --git a/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch b/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch new file mode 100644 index 00000000..8b36a0a6 --- /dev/null +++ b/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch @@ -0,0 +1,46 @@ +From b28ad8e101d4e2ffae00e43d53b22ace35f8c308 Mon Sep 17 00:00:00 2001 +From: Kim Kulling +Date: Mon, 7 Nov 2016 17:19:49 +0100 +Subject: [PATCH] Fix BlenderDNA for clang cross compiler. + +--- + src/3rdparty/assimp/code/BlenderDNA.cpp | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/3rdparty/assimp/code/BlenderDNA.cpp b/src/3rdparty/assimp/code/BlenderDNA.cpp +index b380fbe8d..437e44349 100644 +--- a/src/3rdparty/assimp/code/BlenderDNA.cpp ++++ b/src/3rdparty/assimp/code/BlenderDNA.cpp +@@ -56,10 +56,10 @@ using namespace Assimp::Formatter; + #define for_each BOOST_FOREACH + bool match4(StreamReaderAny& stream, const char* string) { + char tmp[] = { +- (stream).GetI1(), +- (stream).GetI1(), +- (stream).GetI1(), +- (stream).GetI1() ++ (const char)(stream).GetI1(), ++ (const char)(stream).GetI1(), ++ (const char)(stream).GetI1(), ++ (const char)(stream).GetI1() + }; + return (tmp[0]==string[0] && tmp[1]==string[1] && tmp[2]==string[2] && tmp[3]==string[3]); + } +@@ -344,10 +344,10 @@ void SectionParser :: Next() + stream.SetCurrentPos(current.start + current.size); + + const char tmp[] = { +- stream.GetI1(), +- stream.GetI1(), +- stream.GetI1(), +- stream.GetI1() ++ (const char)stream.GetI1(), ++ (const char)stream.GetI1(), ++ (const char)stream.GetI1(), ++ (const char)stream.GetI1() + }; + current.id = std::string(tmp,tmp[3]?4:tmp[2]?3:tmp[1]?2:1); + +-- +2.13.3 + diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index f39208a8..2891470d 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -13,6 +13,7 @@ DEPENDS_class-target += "qtdeclarative qt3d-native" SRC_URI += " \ file://0001-Allow-a-tools-only-build.patch \ + file://0002-Fix-BlenderDNA-for-clang-cross-compiler.patch \ " PACKAGECONFIG ??= "" -- cgit v1.2.3 From c74e5b8a816e145381e0a214df0f86400bbb9c7d Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Fri, 11 Aug 2017 03:30:05 +0200 Subject: qtbase: remove qtbase-native from DEPENDS qtbase-native has been included by QT5TOOLSDEPENDS, so this line is redundant and leading multiple qtbase-native existing in DEPENDS. Signed-off-by: Ming Liu Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase_git.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 3523dc1c..368d07fc 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -36,8 +36,6 @@ SRC_URI += "\ file://0008-configure-paths-for-target-qmake-properly.patch \ " -DEPENDS += "qtbase-native" - # LGPL-3.0 is used only in src/plugins/platforms/android/extract.cpp # for syncqt -- cgit v1.2.3 From 1619723dfc0cdc831b71bf7ab09c4227ea544255 Mon Sep 17 00:00:00 2001 From: Carlos Rafael Giani Date: Fri, 11 Aug 2017 23:42:19 +0200 Subject: gstreamer1.0-plugins-bad: add qt5 packageconfig This adds a new command line switch to the configure script to make sure the right paths to moc, uic, rcc are used. It also makes sure OpenGL is enabled if the qt5 packageconfig is in use. Note that the moc/uic/rcc path configure switches were introduced in GStreamer 1.12.2, so this version is a requirement. Signed-off-by: Carlos Rafael Giani Signed-off-by: Martin Jansa --- .../gstreamer/gstreamer1.0-plugins-bad_%.bbappend | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend new file mode 100644 index 00000000..b1866778 --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend @@ -0,0 +1,15 @@ +inherit qmake5_paths + +PACKAGECONFIG[qt5] = '--enable-qt \ + --with-moc="${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc" \ + --with-uic="${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic" \ + --with-rcc="${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/rcc" \ + ,--disable-qt,qtbase qtdeclarative qtbase-native' + +# The GStreamer Qt5 plugin needs desktop OpenGL or OpenGL ES to work, so make sure it is enabled +python() { + cur_packageconfig = d.getVar('PACKAGECONFIG').split() + if 'qt5' in cur_packageconfig and not (('opengl' in cur_packageconfig) or ('gles2' in cur_packageconfig)): + gl_packageconfig = d.getVar('PACKAGECONFIG_GL') + d.appendVar('PACKAGECONFIG', ' ' + gl_packageconfig) +} -- cgit v1.2.3 From d82317c23d6473a4e53d7a5ff11ecf6b9c8769e8 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 16 Aug 2017 22:57:15 +0200 Subject: qtbase: refresh the patches * upload the patches to b5.8* branches on: https://github.com/meta-qt5/qtbase * refresh the patches * notice that some patches were in section which is meant to be common for target, native and nativesdk qtbase but were added only in target recipe, I've updated them to be included in all 3, hopefully they can be used in all 3 (I don't use nativesdk at all) Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 7 +- recipes-qt/qt5/qtbase-native_git.bb | 7 +- .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 16 ++--- .../0001-Delete-qlonglong-and-qulonglong.patch | 28 -------- ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 6 +- .../0003-Add-external-hostbindir-option.patch | 8 +-- ...le-Fix-pkgconfig-and-libtool-replacements.patch | 8 +-- ...ump-path-length-from-256-to-512-character.patch | 6 +- ...-unknown-features-instead-of-erroring-out.patch | 25 ++++++++ ...-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch | 63 ++++++++++++++++++ .../0008-Delete-qlonglong-and-qulonglong.patch | 25 ++++++++ ...configure-paths-for-target-qmake-properly.patch | 75 ---------------------- ...-unknown-features-instead-of-erroring-out.patch | 28 -------- ...-Disable-Wformat-security-with-clang-as-w.patch | 28 ++++++++ ...-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch | 63 ------------------ ...10-Replace-pthread_yield-with-sched_yield.patch | 60 +++++++++++++++++ ...-Disable-Wformat-security-with-clang-as-w.patch | 32 --------- recipes-qt/qt5/qtbase/0011-Always-build-uic.patch | 6 +- ...11-Replace-pthread_yield-with-sched_yield.patch | 63 ------------------ ...configure-paths-for-target-qmake-properly.patch | 75 ++++++++++++++++++++++ recipes-qt/qt5/qtbase_git.bb | 12 ++-- 21 files changed, 316 insertions(+), 325 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0001-Delete-qlonglong-and-qulonglong.patch create mode 100644 recipes-qt/qt5/qtbase/0006-Disable-all-unknown-features-instead-of-erroring-out.patch create mode 100644 recipes-qt/qt5/qtbase/0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch create mode 100644 recipes-qt/qt5/qtbase/0008-Delete-qlonglong-and-qulonglong.patch delete mode 100644 recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch delete mode 100644 recipes-qt/qt5/qtbase/0009-Disable-all-unknown-features-instead-of-erroring-out.patch create mode 100644 recipes-qt/qt5/qtbase/0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch delete mode 100644 recipes-qt/qt5/qtbase/0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch create mode 100644 recipes-qt/qt5/qtbase/0010-Replace-pthread_yield-with-sched_yield.patch delete mode 100644 recipes-qt/qt5/qtbase/0010-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch delete mode 100644 recipes-qt/qt5/qtbase/0011-Replace-pthread_yield-with-sched_yield.patch create mode 100644 recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index f2ff5f7e..0f1c6d6c 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -31,8 +31,11 @@ SRC_URI += "\ file://0003-Add-external-hostbindir-option.patch \ file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ file://0005-configure-bump-path-length-from-256-to-512-character.patch \ - file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ - file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ + file://0006-Disable-all-unknown-features-instead-of-erroring-out.patch \ + file://0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ + file://0008-Delete-qlonglong-and-qulonglong.patch \ + file://0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch \ + file://0010-Replace-pthread_yield-with-sched_yield.patch \ " # common for qtbase-native and nativesdk-qtbase diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 98cbeccf..2420580b 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -26,8 +26,11 @@ SRC_URI += "\ file://0003-Add-external-hostbindir-option.patch \ file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ file://0005-configure-bump-path-length-from-256-to-512-character.patch \ - file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ - file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ + file://0006-Disable-all-unknown-features-instead-of-erroring-out.patch \ + file://0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ + file://0008-Delete-qlonglong-and-qulonglong.patch \ + file://0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch \ + file://0010-Replace-pthread_yield-with-sched_yield.patch \ " # common for qtbase-native and nativesdk-qtbase diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index df2016e1..3f373c76 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From 2784921c40d0b523c75e613e48b7fd1e90ba3ef1 Mon Sep 17 00:00:00 2001 +From 805b338154ed0262a7b8bf5c582ff5b193a55492 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH] Add linux-oe-g++ platform @@ -30,10 +30,10 @@ Signed-off-by: Martin Jansa create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index 789ba4c..59cce01 100755 +index bc18e614d2..579a96d787 100755 --- a/configure +++ b/configure -@@ -1624,7 +1624,7 @@ fi +@@ -1614,7 +1614,7 @@ fi # is where the resulting variable is written to setBootstrapVariable() { @@ -43,10 +43,10 @@ index 789ba4c..59cce01 100755 # build qmake diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index f275e3a..5aa15f5 100644 +index 4ca7c6ba07..5b5ac13f1d 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf -@@ -37,14 +37,14 @@ defineTest(qtCompileTest) { +@@ -44,14 +44,14 @@ defineTest(qtCompileTest) { } # Clean up after previous run @@ -64,7 +64,7 @@ index f275e3a..5aa15f5 100644 msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 708815d..097ac49 100644 +index 999cd18154..2ac91ba519 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -67,7 +67,7 @@ defineTest(qtHaveModule) { @@ -78,7 +78,7 @@ index 708815d..097ac49 100644 cmd = perl -w $$system_path($${cmd}.pl) diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 -index 0000000..c1837e6 +index 0000000000..c1837e6d55 --- /dev/null +++ b/mkspecs/linux-oe-g++/qmake.conf @@ -0,0 +1,43 @@ @@ -127,7 +127,7 @@ index 0000000..c1837e6 +load(qt_config) diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h new file mode 100644 -index 0000000..5d22fb4 +index 0000000000..5d22fb4101 --- /dev/null +++ b/mkspecs/linux-oe-g++/qplatformdefs.h @@ -0,0 +1 @@ diff --git a/recipes-qt/qt5/qtbase/0001-Delete-qlonglong-and-qulonglong.patch b/recipes-qt/qt5/qtbase/0001-Delete-qlonglong-and-qulonglong.patch deleted file mode 100644 index 975cd28d..00000000 --- a/recipes-qt/qt5/qtbase/0001-Delete-qlonglong-and-qulonglong.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c67a4af2e5db4c1e2213961e6392b59affd1959f Mon Sep 17 00:00:00 2001 -From: Huang Qiyu -Date: Wed, 7 Jun 2017 21:00:49 +0900 -Subject: [PATCH] Delete qlonglong and qulonglong - -Signed-off-by: Huang Qiyu ---- - tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro -index 09458bd..59a120e 100644 ---- a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro -+++ b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro -@@ -5,10 +5,8 @@ SUBDIRS=\ - char32_t \ - int \ - long \ -- qlonglong \ - qptrdiff \ - quintptr \ -- qulonglong \ - schar \ - short \ - uchar \ --- -2.7.4 - diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 4b72ebf1..f9859620 100644 --- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,4 +1,4 @@ -From e5f8607cfa1d2bcc798686cdf7c87ea0c6577d30 Mon Sep 17 00:00:00 2001 +From 18e2f4368f22bf5ac8b2a36c30a7ad39ed97bf49 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the @@ -19,7 +19,7 @@ Signed-off-by: Martin Jansa 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 27fe10a..29ffcda 100644 +index 27fe10a79e..29ffcda203 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -164,7 +164,10 @@ void QLibrarySettings::load() @@ -34,5 +34,3 @@ index 27fe10a..29ffcda 100644 if (QFile::exists(qtconfig)) return new QSettings(qtconfig, QSettings::IniFormat); #else --- -2.9.3 diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch index 8224171a..9f1a2b2c 100644 --- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch @@ -1,4 +1,4 @@ -From 502b95b840a5f79e5a68e9bd5b10dbdc92485f1f Mon Sep 17 00:00:00 2001 +From 67977e16e5d0aecd931d8e4355c12cc907df592f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 Subject: [PATCH] Add -external-hostbindir option @@ -19,7 +19,7 @@ Change-Id: Iacaa1c5531cd6dcc094891610c351673db55d7b2 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index a5ed8b2..0e11a1e 100644 +index 545b9a3d1e..c991a9ba41 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) @@ -50,7 +50,7 @@ index a5ed8b2..0e11a1e 100644 _qt5_Core_check_file_exists(${imported_location}) diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in -index 1d94715..301af8f 100644 +index 1d947159e2..301af8f1b2 100644 --- a/src/dbus/Qt5DBusConfigExtras.cmake.in +++ b/src/dbus/Qt5DBusConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) @@ -72,7 +72,7 @@ index 1d94715..301af8f 100644 _qt5_DBus_check_file_exists(${imported_location}) diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -index 99d87e2..5621dc0 100644 +index 99d87e2e46..5621dc0fae 100644 --- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in +++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic) diff --git a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch index c105488e..aa97b56f 100644 --- a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +++ b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch @@ -1,4 +1,4 @@ -From bf1498618415e7b1e57b54881b1e56d74f2cdf6b Mon Sep 17 00:00:00 2001 +From fe9cfbde28c651d00b8f5fda7dc85a97af0c50a1 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 23:15:37 +0200 Subject: [PATCH] qt_module: Fix pkgconfig and libtool replacements @@ -68,10 +68,10 @@ Signed-off-by: Jonathan Liu 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index 0c5f080..a6e4f09 100644 +index 98f794c485..bd8b7b52e4 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf -@@ -317,6 +317,19 @@ contains(TEMPLATE, .*app) { +@@ -315,6 +315,19 @@ contains(TEMPLATE, .*app) { QTPLUGIN = $$manualplugs $$autoplugs } @@ -92,7 +92,7 @@ index 0c5f080..a6e4f09 100644 qtConfig(static) { QT_PLUGIN_VERIFY += QTPLUGIN diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index e754a17..4c1530e 100644 +index d30983f62b..6da07e032c 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -37,7 +37,7 @@ contains(TEMPLATE, .*lib) { diff --git a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch index d455d2cd..0c0d2c73 100644 --- a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch @@ -1,4 +1,4 @@ -From 60f490b57faf979a912074506a75c74767a27d3b Mon Sep 17 00:00:00 2001 +From be9179d2cbb9009794940092d30dac7800708964 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 25 Aug 2015 10:05:15 -0400 Subject: [PATCH] configure: bump path length from 256 to 512 characters @@ -14,10 +14,10 @@ Signed-off-by: Denys Dmytriyenko 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure -index 1fcbb3a..f49a674 100755 +index 579a96d787..5af98cd77e 100755 --- a/configure +++ b/configure -@@ -3847,10 +3847,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ +@@ -1551,10 +1551,10 @@ cat > "$outpath/src/corelib/global/qconfig.cpp.new" < +Date: Mon, 24 Oct 2016 09:45:18 +0300 +Subject: [PATCH] Disable all unknown features instead of erroring out + +Task-number: QTBUG-56656 +Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447 +--- + mkspecs/features/qt_configure.prf | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf +index eaaa161270..fa3addae11 100644 +--- a/mkspecs/features/qt_configure.prf ++++ b/mkspecs/features/qt_configure.prf +@@ -1035,7 +1035,8 @@ defineReplace(qtConfEvaluateSingleExpression) { + error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.") + return($$result) + } +- error("Unknown feature object $${feature} in expression '$${1}'.") ++ warning("Unknown feature object $${feature} in expression '$${1}'.") ++ result = false + } + !qtConfCheckFeature($$feature): \ + error("Expression '$$1' is accessing non-emitted feature $${feature}.") diff --git a/recipes-qt/qt5/qtbase/0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch b/recipes-qt/qt5/qtbase/0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch new file mode 100644 index 00000000..b70b0d35 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch @@ -0,0 +1,63 @@ +From 5316b420dc408d3a47daa3ba854a7883c911f6b9 Mon Sep 17 00:00:00 2001 +From: Pascal Bach +Date: Wed, 11 May 2016 15:20:41 +0200 +Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS + isn't set + +This prevents errors like: + +| The imported target "Qt5::Core" references the file +| +| "/qmake" +| +| but this file does not exist. Possible reasons include: + +Which happen if CMake is used without setting OE_QMAKE_PATH_EXTERNAL_HOST_BINS. +To achieve this a check for OE_QMAKE_PATH_EXTERNAL_HOST_BINS is added to each Qt5*Config.cmake +file. And in the case where the variable is not set we just return which is basically +equal to telling CMake that Qt5 wasn't found. + +Upstream-Status: Pending + The patch only makes sense in connection with other patches included here. + Specifically this are: + - 0003-Add-external-hostbindir-option.patch + - 0010-Add-external-hostbindir-option-for-native-sdk.patch + +Signed-off-by: Pascal Bach +--- + mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 5 +++++ + src/corelib/Qt5Config.cmake.in | 5 +++++ + 2 files changed, 10 insertions(+) + +diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +index d2358cae4b..feb73c02a5 100644 +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -9,6 +9,11 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) + endif() + !!ENDIF + ++if(NOT DEFINED OE_QMAKE_PATH_EXTERNAL_HOST_BINS) ++ message(WARNING "Skipping because OE_QMAKE_PATH_EXTERNAL_HOST_BINS is not defined") ++ return() ++endif() ++ + !!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) + !!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) + set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +diff --git a/src/corelib/Qt5Config.cmake.in b/src/corelib/Qt5Config.cmake.in +index 75b53485b7..ed31888c93 100644 +--- a/src/corelib/Qt5Config.cmake.in ++++ b/src/corelib/Qt5Config.cmake.in +@@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 2.8.9) + message(FATAL_ERROR \"Qt5 requires at least CMake version 2.8.9\") + endif() + ++if(NOT DEFINED OE_QMAKE_PATH_EXTERNAL_HOST_BINS) ++ message(WARNING "Skipping because OE_QMAKE_PATH_EXTERNAL_HOST_BINS is not defined") ++ return() ++endif() ++ + if (NOT Qt5_FIND_COMPONENTS) + set(Qt5_NOT_FOUND_MESSAGE \"The Qt5 package requires at least one component\") + set(Qt5_FOUND False) diff --git a/recipes-qt/qt5/qtbase/0008-Delete-qlonglong-and-qulonglong.patch b/recipes-qt/qt5/qtbase/0008-Delete-qlonglong-and-qulonglong.patch new file mode 100644 index 00000000..c992586a --- /dev/null +++ b/recipes-qt/qt5/qtbase/0008-Delete-qlonglong-and-qulonglong.patch @@ -0,0 +1,25 @@ +From 2755a80114433e75f08fbb0df0fee9f7526172aa Mon Sep 17 00:00:00 2001 +From: Huang Qiyu +Date: Wed, 7 Jun 2017 21:00:49 +0900 +Subject: [PATCH] Delete qlonglong and qulonglong + +Signed-off-by: Huang Qiyu +--- + tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro +index 09458bd9c3..59a120eb26 100644 +--- a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro ++++ b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro +@@ -5,10 +5,8 @@ SUBDIRS=\ + char32_t \ + int \ + long \ +- qlonglong \ + qptrdiff \ + quintptr \ +- qulonglong \ + schar \ + short \ + uchar \ diff --git a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch deleted file mode 100644 index 6d64e6b5..00000000 --- a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch +++ /dev/null @@ -1,75 +0,0 @@ -From cc926956758bf8170c4e49c66e1066524b43f65f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 13 Nov 2015 12:36:11 +0100 -Subject: [PATCH] configure paths for target qmake properly -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -to use this patch in all qtbase/qtbase-native(sdk) changes ore made -conditionally based on QT_CROSS_COMPILE - -Upstream-Status: Inappropriate [OE specific] - -Change-Id: I2b2f00c496216e98fbe14801f9e840ef5333c4b6 -Signed-off-by: Andreas Müller -Signed-off-by: Martin Jansa ---- - configure | 23 +++++++++++++++++++---- - 1 file changed, 19 insertions(+), 4 deletions(-) - -diff --git a/configure b/configure -index 8b33c5b..1df248f 100755 ---- a/configure -+++ b/configure -@@ -1545,8 +1545,13 @@ if [ -z "$QT_REL_HOST_DATA" ]; then - fi - fi - --shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` --shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` -+if [ "$QT_CROSS_COMPILE" = "yes" ] ; then -+ shortxspec=linux-g++ -+ shortspec=linux-g++ -+else -+ shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` -+ shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` -+fi - - QT_CONFIGURE_STR_OFF=0 - -@@ -1579,7 +1584,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS - - QT_CONFIGURE_STR_OFFSETS= - QT_CONFIGURE_STRS= --addConfStr "$CFG_SYSROOT" -+if [ "$QT_CROSS_COMPILE" = "yes" ] ; then -+ addConfStr "" -+else -+ addConfStr "$CFG_SYSROOT" -+fi - addConfStr "$QT_REL_HOST_BINS" - addConfStr "$QT_REL_HOST_LIBS" - addConfStr "$QT_REL_HOST_DATA" -@@ -1591,6 +1600,12 @@ addConfStr "$shortspec" - #------------------------------------------------------------------------------- - [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global" - -+if [ "$QT_CROSS_COMPILE" = "yes" ] ; then -+ QT_TARGET_PREFIX=$QT_EXT_PREFIX -+else -+ QT_TARGET_PREFIX=$QT_HOST_PREFIX -+fi -+ - cat > "$outpath/src/corelib/global/qconfig.cpp.new" < -Date: Mon, 24 Oct 2016 09:45:18 +0300 -Subject: [PATCH] Disable all unknown features instead of erroring out - -Task-number: QTBUG-56656 -Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447 ---- - mkspecs/features/qt_configure.prf | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf -index e8fa0c6..0ca5670 100644 ---- a/mkspecs/features/qt_configure.prf -+++ b/mkspecs/features/qt_configure.prf -@@ -1009,7 +1009,8 @@ defineReplace(qtConfEvaluateSingleExpression) { - error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.") - return($$result) - } -- error("Unknown feature object $${feature} in expression '$${1}'.") -+ warning("Unknown feature object $${feature} in expression '$${1}'.") -+ result = false - } - !qtConfCheckFeature($$feature): \ - error("Expression '$$1' is accessing non-emitted feature $${feature}.") --- -1.9.1 - diff --git a/recipes-qt/qt5/qtbase/0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch b/recipes-qt/qt5/qtbase/0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch new file mode 100644 index 00000000..609cd846 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch @@ -0,0 +1,28 @@ +From 7bab0171601bc769403be62d145164137f1b7b66 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 25 Jul 2017 19:40:52 -0700 +Subject: [PATCH] tst_qstring: Disable Wformat-security with clang as well + +Currently, its only disabled for gcc, but we need to disable +it with clang as well in order to compile it successfully with +clang + +Signed-off-by: Khem Raj +--- + tests/auto/corelib/tools/qstring/tst_qstring.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/tests/auto/corelib/tools/qstring/tst_qstring.cpp b/tests/auto/corelib/tools/qstring/tst_qstring.cpp +index a0a872710c..20a9a9f9db 100644 +--- a/tests/auto/corelib/tools/qstring/tst_qstring.cpp ++++ b/tests/auto/corelib/tools/qstring/tst_qstring.cpp +@@ -1066,6 +1066,9 @@ void tst_QString::acc_01() + + QT_WARNING_PUSH + QT_WARNING_DISABLE_GCC("-Wformat-security") ++#ifdef __clang__ ++QT_WARNING_DISABLE_CLANG("-Wformat-security") ++#endif + + void tst_QString::isNull() + { diff --git a/recipes-qt/qt5/qtbase/0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch b/recipes-qt/qt5/qtbase/0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch deleted file mode 100644 index 1d0ea3e8..00000000 --- a/recipes-qt/qt5/qtbase/0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch +++ /dev/null @@ -1,63 +0,0 @@ -From b397a71531e31383ee86135e21072d033480f5bc Mon Sep 17 00:00:00 2001 -From: Pascal Bach -Date: Wed, 11 May 2016 15:20:41 +0200 -Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS - isn't set - -This prevents errors like: - -| The imported target "Qt5::Core" references the file -| -| "/qmake" -| -| but this file does not exist. Possible reasons include: - -Which happen if CMake is used without setting OE_QMAKE_PATH_EXTERNAL_HOST_BINS. -To achieve this a check for OE_QMAKE_PATH_EXTERNAL_HOST_BINS is added to each Qt5*Config.cmake -file. And in the case where the variable is not set we just return which is basically -equal to telling CMake that Qt5 wasn't found. - -Upstream-Status: Pending - The patch only makes sense in connection with other patches included here. - Specifically this are: - - 0003-Add-external-hostbindir-option.patch - - 0010-Add-external-hostbindir-option-for-native-sdk.patch - -Signed-off-by: Pascal Bach ---- - mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 5 +++++ - src/corelib/Qt5Config.cmake.in | 5 +++++ - 2 files changed, 10 insertions(+) - -diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index d2358ca..feb73c0 100644 ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -9,6 +9,11 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) - endif() - !!ENDIF - -+if(NOT DEFINED OE_QMAKE_PATH_EXTERNAL_HOST_BINS) -+ message(WARNING "Skipping because OE_QMAKE_PATH_EXTERNAL_HOST_BINS is not defined") -+ return() -+endif() -+ - !!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) - !!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") -diff --git a/src/corelib/Qt5Config.cmake.in b/src/corelib/Qt5Config.cmake.in -index a872d0e..233d663 100644 ---- a/src/corelib/Qt5Config.cmake.in -+++ b/src/corelib/Qt5Config.cmake.in -@@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 2.8.9) - message(FATAL_ERROR \"Qt5 requires at least CMake version 2.8.9\") - endif() - -+if(NOT DEFINED OE_QMAKE_PATH_EXTERNAL_HOST_BINS) -+ message(WARNING "Skipping because OE_QMAKE_PATH_EXTERNAL_HOST_BINS is not defined") -+ return() -+endif() -+ - if (NOT Qt5_FIND_COMPONENTS) - set(Qt5_NOT_FOUND_MESSAGE \"The Qt5 package requires at least one component\") - set(Qt5_FOUND False) diff --git a/recipes-qt/qt5/qtbase/0010-Replace-pthread_yield-with-sched_yield.patch b/recipes-qt/qt5/qtbase/0010-Replace-pthread_yield-with-sched_yield.patch new file mode 100644 index 00000000..5c625e08 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0010-Replace-pthread_yield-with-sched_yield.patch @@ -0,0 +1,60 @@ +From bbe822066913c0908b6366009517c19e828e1458 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 27 Jul 2017 08:02:51 -0700 +Subject: [PATCH] Replace pthread_yield with sched_yield + +On Linux pthead_yield is same as sched_yield implementation wise +and sched_yield is available on all libc +implementations on Linux + +Signed-off-by: Khem Raj +--- + tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 4 ++-- + tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 5 +++-- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +index 7d9f56ef38..bc115ef61d 100644 +--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp ++++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +@@ -34,7 +34,7 @@ + #include "tst_qvariant_common.h" + + #ifdef Q_OS_LINUX +-# include ++# include + #endif + + #include +@@ -197,7 +197,7 @@ protected: + const char *nm = name.constData(); + int tp = qRegisterMetaType(nm); + #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) +- pthread_yield(); ++ sched_yield(); + #endif + QMetaType info(tp); + if (!info.isValid()) { +diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +index fe1057bdde..e23e97b259 100644 +--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp ++++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +@@ -75,6 +75,7 @@ + #include + #include + #include ++#include + #endif + + #include "private/qhostinfo_p.h" +@@ -2129,8 +2130,8 @@ public slots: + + #if defined(Q_OS_MAC) + pthread_yield_np(); +-#elif defined Q_OS_LINUX && !defined Q_OS_ANDROID +- pthread_yield(); ++#elif defined Q_OS_LINUX ++ sched_yield(); + #endif + if (!sock->waitForConnected()) { + networkTimeout = true; diff --git a/recipes-qt/qt5/qtbase/0010-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch b/recipes-qt/qt5/qtbase/0010-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch deleted file mode 100644 index 77b357cb..00000000 --- a/recipes-qt/qt5/qtbase/0010-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8284ebfe59c0011db71df7fb143b8e6a99f6952e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 25 Jul 2017 19:40:52 -0700 -Subject: [PATCH 10/10] tst_qstring: Disable Wformat-security with clang as - well - -Currently, its only disabled for gcc, but we need to disable -it with clang as well in order to compile it successfully with -clang - -Signed-off-by: Khem Raj ---- - tests/auto/corelib/tools/qstring/tst_qstring.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/tests/auto/corelib/tools/qstring/tst_qstring.cpp b/tests/auto/corelib/tools/qstring/tst_qstring.cpp -index a0a872710c..20a9a9f9db 100644 ---- a/tests/auto/corelib/tools/qstring/tst_qstring.cpp -+++ b/tests/auto/corelib/tools/qstring/tst_qstring.cpp -@@ -1066,6 +1066,9 @@ void tst_QString::acc_01() - - QT_WARNING_PUSH - QT_WARNING_DISABLE_GCC("-Wformat-security") -+#ifdef __clang__ -+QT_WARNING_DISABLE_CLANG("-Wformat-security") -+#endif - - void tst_QString::isNull() - { --- -2.13.3 - diff --git a/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch index fb3d316f..244cc0bc 100644 --- a/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch @@ -1,4 +1,4 @@ -From 1b94b0f2579edcf870bc953f820af8fb2ec4376f Mon Sep 17 00:00:00 2001 +From 7c42f9b42c34d75f6c8e21e55af9b0e58f5743cc Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 16 Nov 2013 00:32:30 +0100 Subject: [PATCH] Always build uic @@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src.pro b/src/src.pro -index 3d18540..d128b3a 100644 +index 90d7e2b76c..4ca6b0bd01 100644 --- a/src/src.pro +++ b/src/src.pro -@@ -195,7 +195,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent +@@ -188,7 +188,7 @@ qtConfig(gui) { } } } diff --git a/recipes-qt/qt5/qtbase/0011-Replace-pthread_yield-with-sched_yield.patch b/recipes-qt/qt5/qtbase/0011-Replace-pthread_yield-with-sched_yield.patch deleted file mode 100644 index ed0d4bc9..00000000 --- a/recipes-qt/qt5/qtbase/0011-Replace-pthread_yield-with-sched_yield.patch +++ /dev/null @@ -1,63 +0,0 @@ -From d1d4b520e29b58e427fc7bd336d34b82d0d2b1f3 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 27 Jul 2017 08:02:51 -0700 -Subject: [PATCH] Replace pthread_yield with sched_yield - -On Linux pthead_yield is same as sched_yield implementation wise -and sched_yield is available on all libc -implementations on Linux - -Signed-off-by: Khem Raj ---- - tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 4 ++-- - tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 5 +++-- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp -index 7d9f56ef38..bc115ef61d 100644 ---- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp -+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp -@@ -34,7 +34,7 @@ - #include "tst_qvariant_common.h" - - #ifdef Q_OS_LINUX --# include -+# include - #endif - - #include -@@ -197,7 +197,7 @@ protected: - const char *nm = name.constData(); - int tp = qRegisterMetaType(nm); - #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) -- pthread_yield(); -+ sched_yield(); - #endif - QMetaType info(tp); - if (!info.isValid()) { -diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp -index fe1057bdde..e23e97b259 100644 ---- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp -+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp -@@ -75,6 +75,7 @@ - #include - #include - #include -+#include - #endif - - #include "private/qhostinfo_p.h" -@@ -2129,8 +2130,8 @@ public slots: - - #if defined(Q_OS_MAC) - pthread_yield_np(); --#elif defined Q_OS_LINUX && !defined Q_OS_ANDROID -- pthread_yield(); -+#elif defined Q_OS_LINUX -+ sched_yield(); - #endif - if (!sock->waitForConnected()) { - networkTimeout = true; --- -2.13.3 - diff --git a/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch new file mode 100644 index 00000000..c527c131 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch @@ -0,0 +1,75 @@ +From b8e94df3d49be69659e8dfb0809c614f73c21706 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 13 Nov 2015 12:36:11 +0100 +Subject: [PATCH] configure paths for target qmake properly +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +to use this patch in all qtbase/qtbase-native(sdk) changes ore made +conditionally based on QT_CROSS_COMPILE + +Upstream-Status: Inappropriate [OE specific] + +Change-Id: I2b2f00c496216e98fbe14801f9e840ef5333c4b6 +Signed-off-by: Andreas Müller +Signed-off-by: Martin Jansa +--- + configure | 23 +++++++++++++++++++---- + 1 file changed, 19 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 5af98cd77e..34dedafe91 100755 +--- a/configure ++++ b/configure +@@ -1500,8 +1500,13 @@ if [ -z "$QT_REL_HOST_DATA" ]; then + fi + fi + +-shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` +-shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` ++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then ++ shortxspec=linux-g++ ++ shortspec=linux-g++ ++else ++ shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` ++ shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` ++fi + + QT_CONFIGURE_STR_OFF=0 + +@@ -1534,7 +1539,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS + + QT_CONFIGURE_STR_OFFSETS= + QT_CONFIGURE_STRS= +-addConfStr "$CFG_SYSROOT" ++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then ++ addConfStr "" ++else ++ addConfStr "$CFG_SYSROOT" ++fi + addConfStr "$QT_REL_HOST_BINS" + addConfStr "$QT_REL_HOST_LIBS" + addConfStr "$QT_REL_HOST_DATA" +@@ -1546,6 +1555,12 @@ addConfStr "$shortspec" + #------------------------------------------------------------------------------- + [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global" + ++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then ++ QT_TARGET_PREFIX=$QT_EXT_PREFIX ++else ++ QT_TARGET_PREFIX=$QT_HOST_PREFIX ++fi ++ + cat > "$outpath/src/corelib/global/qconfig.cpp.new" < Date: Wed, 16 Aug 2017 23:53:10 +0200 Subject: qtwebengine: refresh patches * upload the patches to b5.8 branch on: https://github.com/meta-qt5/qtwebengine and 53-based on: https://github.com/meta-qt5/qtwebengine-chromium * refresh the patches Signed-off-by: Martin Jansa --- ...se.gypi-include-atomicops_internals_x86_g.patch | 9 +-- ...rf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch | 6 +- ...-Define-TEMP_FAILURE_RETRY-if-not-defined.patch | 35 ---------- ...ange-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch | 7 +- ...rf-Make-sure-we-only-use-the-file-name-to.patch | 6 +- ...03-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | 48 ------------- .../0003-chromium-v8-fix-build-with-gcc7.patch | 7 +- ...s.prf-allow-build-for-linux-oe-g-platform.patch | 6 +- ...quickwebengineview_p_p.h-add-include-QCol.patch | 6 +- .../0004-chromium-WebKit-fix-build-with-gcc7.patch | 7 +- .../0004-include-fcntl.h-for-loff_t.patch | 25 ------- ...-dependency-to-QCoreApplication-translate.patch | 4 +- ...sl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch | 33 +++++++++ ...off64_t-instead-of-the-internal-__off64_t.patch | 65 ----------------- ...sl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | 45 ++++++++++++ .../0006-linux-glibc-make-the-distinction.patch | 26 ------- ...o-not-include-glibc_weak_symbols-for-musl.patch | 26 ------- ...-chromium-musl-include-fcntl.h-for-loff_t.patch | 22 ++++++ ...-member-name-__si_fields-from-LinuxSigInf.patch | 26 ------- ...sl-use-off64_t-instead-of-the-internal-__.patch | 62 +++++++++++++++++ .../0009-Match-syscalls-to-match-musl.patch | 47 ------------- ...ium-musl-linux-glibc-make-the-distinction.patch | 23 ++++++ ...ninit-and-res_nclose-for-non-glibc-platfo.patch | 81 ---------------------- ...sl-allocator-Do-not-include-glibc_weak_sy.patch | 24 +++++++ .../0011-Do-not-define-__sbrk-on-musl.patch | 29 -------- ...sl-Use-correct-member-name-__si_fields-fr.patch | 24 +++++++ .../0012-Adjust-default-pthread-stack-size.patch | 51 -------------- ...hromium-musl-Match-syscalls-to-match-musl.patch | 44 ++++++++++++ ...sl-Define-res_ninit-and-res_nclose-for-no.patch | 79 +++++++++++++++++++++ ...3-include-asm-generic-ioctl.h-for-TCGETS2.patch | 25 ------- ...hromium-musl-Do-not-define-__sbrk-on-musl.patch | 26 +++++++ .../0014-link-with-libexecinfo-on-musl.patch | 25 ------- ...um-musl-Adjust-default-pthread-stack-size.patch | 47 +++++++++++++ ...sl-include-asm-generic-ioctl.h-for-TCGETS.patch | 22 ++++++ ...romium-musl-link-with-libexecinfo-on-musl.patch | 22 ++++++ ...sl-tcmalloc-Use-off64_t-insread-of-__off6.patch | 23 ++++++ ...tcmalloc-Use-off64_t-insread-of-__off64_t.patch | 26 ------- recipes-qt/qt5/qtwebengine_git.bb | 28 ++++---- 38 files changed, 533 insertions(+), 584 deletions(-) delete mode 100644 recipes-qt/qt5/qtwebengine/0001-sandbox-Define-TEMP_FAILURE_RETRY-if-not-defined.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0003-Avoid-mallinfo-APIs-on-non-glibc-linux.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0004-include-fcntl.h-for-loff_t.patch create mode 100644 recipes-qt/qt5/qtwebengine/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0005-use-off64_t-instead-of-the-internal-__off64_t.patch create mode 100644 recipes-qt/qt5/qtwebengine/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0006-linux-glibc-make-the-distinction.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch create mode 100644 recipes-qt/qt5/qtwebengine/0007-chromium-musl-include-fcntl.h-for-loff_t.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0008-Use-correct-member-name-__si_fields-from-LinuxSigInf.patch create mode 100644 recipes-qt/qt5/qtwebengine/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0009-Match-syscalls-to-match-musl.patch create mode 100644 recipes-qt/qt5/qtwebengine/0009-chromium-musl-linux-glibc-make-the-distinction.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0010-Define-res_ninit-and-res_nclose-for-non-glibc-platfo.patch create mode 100644 recipes-qt/qt5/qtwebengine/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0011-Do-not-define-__sbrk-on-musl.patch create mode 100644 recipes-qt/qt5/qtwebengine/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0012-Adjust-default-pthread-stack-size.patch create mode 100644 recipes-qt/qt5/qtwebengine/0012-chromium-musl-Match-syscalls-to-match-musl.patch create mode 100644 recipes-qt/qt5/qtwebengine/0013-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0013-include-asm-generic-ioctl.h-for-TCGETS2.patch create mode 100644 recipes-qt/qt5/qtwebengine/0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0014-link-with-libexecinfo-on-musl.patch create mode 100644 recipes-qt/qt5/qtwebengine/0015-chromium-musl-Adjust-default-pthread-stack-size.patch create mode 100644 recipes-qt/qt5/qtwebengine/0016-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch create mode 100644 recipes-qt/qt5/qtwebengine/0017-chromium-musl-link-with-libexecinfo-on-musl.patch create mode 100644 recipes-qt/qt5/qtwebengine/0018-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0018-tcmalloc-Use-off64_t-insread-of-__off64_t.patch diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch index 44901165..560a0277 100644 --- a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch +++ b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch @@ -1,8 +1,8 @@ -From 83eee1ff5f9259595b8630e464fa869c6fde8f3c Mon Sep 17 00:00:00 2001 +From d70a7ccba09ba96e0068ad253b3aac7a47125f8e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 3 Oct 2014 03:52:11 +0200 -Subject: [PATCH 1/4] base.gypi: include - atomicops_internals_x86_gcc.cc when building for x64 arch +Subject: [PATCH] chromium base.gypi: include atomicops_internals_x86_gcc.cc + when building for x64 arch Signed-off-by: Martin Jansa --- @@ -22,6 +22,3 @@ index a4da596070..13173d621e 100644 'sources/': [ ['include', 'atomicops_internals_x86_gcc.cc'], ], --- -2.13.2 - diff --git a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch index b7bd5a4a..3d8b3b0f 100644 --- a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch +++ b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch @@ -1,4 +1,4 @@ -From 793db05d66b7a92ebe069dc76093487489dd8b69 Mon Sep 17 00:00:00 2001 +From 2f3a16a0efaf02521425da2db7d88710da3074b4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 30 Jun 2014 20:08:17 +0200 Subject: [PATCH] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H @@ -10,10 +10,10 @@ Signed-off-by: Martin Jansa 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index 20fb278..7aa0b4a 100644 +index 236ee8ac..0333bdd1 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf -@@ -168,9 +168,9 @@ defineReplace(mocOutput) { +@@ -319,9 +319,9 @@ defineReplace(mocOutput) { out = $$1 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one for(ext, $$list($${QMAKE_EXT_CPP})): \ diff --git a/recipes-qt/qt5/qtwebengine/0001-sandbox-Define-TEMP_FAILURE_RETRY-if-not-defined.patch b/recipes-qt/qt5/qtwebengine/0001-sandbox-Define-TEMP_FAILURE_RETRY-if-not-defined.patch deleted file mode 100644 index c56cfc7b..00000000 --- a/recipes-qt/qt5/qtwebengine/0001-sandbox-Define-TEMP_FAILURE_RETRY-if-not-defined.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 89d6283c91f2229cc51f473eed344de97d09e946 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 14:01:12 -0700 -Subject: [PATCH 01/12] sandbox: Define TEMP_FAILURE_RETRY if not defined - -Musl does not define this Macro - -Signed-off-by: Khem Raj ---- - sandbox/linux/suid/sandbox.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/sandbox/linux/suid/sandbox.c b/sandbox/linux/suid/sandbox.c -index b655d1c79..3de34e36f 100644 ---- a/sandbox/linux/suid/sandbox.c -+++ b/sandbox/linux/suid/sandbox.c -@@ -44,6 +44,15 @@ static bool DropRoot(); - - #define HANDLE_EINTR(x) TEMP_FAILURE_RETRY(x) - -+#ifndef TEMP_FAILURE_RETRY -+# define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) -+#endif -+ - static void FatalError(const char* msg, ...) - __attribute__((noreturn, format(printf, 1, 2))); - --- -2.13.2 - diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch index eae27879..587b632f 100644 --- a/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch +++ b/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch @@ -1,7 +1,7 @@ -From 4aa614106c03793709e5dbd69f45df8a5e5c9fe4 Mon Sep 17 00:00:00 2001 +From 79a62dbe498946f487edcb0228c350d9fe7e4d09 Mon Sep 17 00:00:00 2001 From: Cleiton Bueno Date: Thu, 24 Dec 2015 12:46:58 -0200 -Subject: [PATCH 2/4] chromium: Change false to FALSE and 1 to TRUE, FIX +Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX qtwebengine compile Signed-off-by: Cleiton Bueno @@ -61,6 +61,3 @@ index 6d926378be..738d3fdedf 100644 // we want to always get RGB data out switch (cinfo.jpeg_color_space) { --- -2.13.2 - diff --git a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch index e487c6a5..93e68b51 100644 --- a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch +++ b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch @@ -1,4 +1,4 @@ -From aa5bb11072bc0e441dc6533f53ed5359c5000088 Mon Sep 17 00:00:00 2001 +From bf7f70ae0bf7345c2546f4f4bc371a9e8eeb0bd3 Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Tue, 18 Nov 2014 10:38:18 +0100 Subject: [PATCH] functions.prf: Make sure we only use the file name to @@ -11,10 +11,10 @@ Signed-off-by: Martin Jansa 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index 7aa0b4a..9b3a639 100644 +index 0333bdd1..687d34f8 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf -@@ -165,7 +165,8 @@ defineReplace(findIncludedMocFiles) { +@@ -316,7 +316,8 @@ defineReplace(findIncludedMocFiles) { } defineReplace(mocOutput) { diff --git a/recipes-qt/qt5/qtwebengine/0003-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/0003-Avoid-mallinfo-APIs-on-non-glibc-linux.patch deleted file mode 100644 index 2e0b1f00..00000000 --- a/recipes-qt/qt5/qtwebengine/0003-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 8defe37306b0d1548592afc12baa45f4aec5375c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 14:09:06 -0700 -Subject: [PATCH 03/12] Avoid mallinfo() APIs on non-glibc/linux - -Signed-off-by: Khem Raj ---- - base/trace_event/malloc_dump_provider.cc | 3 ++- - content/child/content_child_helpers.cc | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/base/trace_event/malloc_dump_provider.cc b/base/trace_event/malloc_dump_provider.cc -index 3b1a933bc..a554d0373 100644 ---- a/base/trace_event/malloc_dump_provider.cc -+++ b/base/trace_event/malloc_dump_provider.cc -@@ -103,6 +103,7 @@ MallocDumpProvider::~MallocDumpProvider() {} - // the current process. - bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, - ProcessMemoryDump* pmd) { -+#if defined(__GLIBC__) - size_t total_virtual_size = 0; - size_t resident_size = 0; - size_t allocated_objects_size = 0; -@@ -195,7 +196,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, - pmd->DumpHeapUsage(metrics_by_context, overhead, "malloc"); - } - tid_dumping_heap_ = kInvalidThreadId; -- -+#endif // __GLIBC__ - return true; - } - -diff --git a/content/child/content_child_helpers.cc b/content/child/content_child_helpers.cc -index 7ddeb4d16..b8c73b09c 100644 ---- a/content/child/content_child_helpers.cc -+++ b/content/child/content_child_helpers.cc -@@ -25,7 +25,7 @@ namespace content { - // though, this provides only a partial and misleading value. - // Unfortunately some telemetry benchmark rely on it and these need to - // be refactored before getting rid of this. See crbug.com/581365 . --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(__GLIBC__) || defined(OS_ANDROID) - size_t GetMemoryUsageKB() { - struct mallinfo minfo = mallinfo(); - uint64_t mem_usage = --- -2.13.2 - diff --git a/recipes-qt/qt5/qtwebengine/0003-chromium-v8-fix-build-with-gcc7.patch b/recipes-qt/qt5/qtwebengine/0003-chromium-v8-fix-build-with-gcc7.patch index 2acce2c5..f2456dd6 100644 --- a/recipes-qt/qt5/qtwebengine/0003-chromium-v8-fix-build-with-gcc7.patch +++ b/recipes-qt/qt5/qtwebengine/0003-chromium-v8-fix-build-with-gcc7.patch @@ -1,7 +1,7 @@ -From 1a163c0cab05761f269fcb5adad5d40d71200d52 Mon Sep 17 00:00:00 2001 +From 944746d5d04ea8eaf268a97440c98136beae1e47 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 11 Jul 2017 10:15:41 +0200 -Subject: [PATCH 3/4] chromium: v8 fix build with gcc7 +Subject: [PATCH] chromium: v8 fix build with gcc7 Use the fix from nodejs: https://github.com/nodejs/node/commit/2a2a5565c298639b823250b571101f51210c50e8 @@ -129,6 +129,3 @@ index 7d774beb5b..eda1478766 100644 // Returns a new HashTable object. MUST_USE_RESULT static Handle New( --- -2.13.2 - diff --git a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch index 786a383d..a4601780 100644 --- a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From 6918d25c54ec4bc17a9b612c0d24b0f01be3aca1 Mon Sep 17 00:00:00 2001 +From 5ff09196304a38304893e0703a8a7d2df2ec889a Mon Sep 17 00:00:00 2001 From: Frieder Schrempf Date: Mon, 1 Dec 2014 14:34:40 +0000 Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform @@ -12,10 +12,10 @@ Signed-off-by: Martin Jansa 1 file changed, 6 insertions(+) diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index 9b3a639..dc5ed1c 100644 +index 687d34f8..5c0c40fd 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf -@@ -5,6 +5,12 @@ defineTest(isPlatformSupported) { +@@ -21,6 +21,12 @@ defineTest(isPlatformSupported) { return(false) } gcc:!clang:!isGCCVersionSupported(): return(false) diff --git a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch index d10ddf7f..40015637 100644 --- a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch +++ b/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch @@ -1,4 +1,4 @@ -From 6ed60f35761ab268004727be544e9ccf70594211 Mon Sep 17 00:00:00 2001 +From 0e1143af443c80cd49663b55128ab4dd8e570ee1 Mon Sep 17 00:00:00 2001 From: Cleiton Bueno Date: Fri, 25 Dec 2015 18:16:05 -0200 Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor @@ -9,10 +9,10 @@ Signed-off-by: Cleiton Bueno 1 file changed, 2 insertions(+) diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h -index f13bfd0..0e12244 100644 +index d692140e..58528114 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h -@@ -60,6 +60,8 @@ +@@ -59,6 +59,8 @@ #include #include #include diff --git a/recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch b/recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch index 46e87611..041d29b2 100644 --- a/recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch +++ b/recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch @@ -1,7 +1,7 @@ -From 2be0856e09f47e7f2c35e77d4e000d769c6beaf9 Mon Sep 17 00:00:00 2001 +From f62b851edbcc3ac3da448d7570908ad78ebe77dc Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 11 Jul 2017 10:18:13 +0200 -Subject: [PATCH 4/4] chromium: WebKit fix build with gcc7 +Subject: [PATCH] chromium: WebKit fix build with gcc7 Based on qtwebengine-opensource-src-5.8.0-wtf-gcc7.patch from http://git.net/ml/scm-fedora-commits/2017-03/msg15697.html @@ -39,6 +39,3 @@ index e85c72fd65..6f94cd6734 100644 template inline void LinkedHashSet::swap(LinkedHashSet& other) { --- -2.13.2 - diff --git a/recipes-qt/qt5/qtwebengine/0004-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/0004-include-fcntl.h-for-loff_t.patch deleted file mode 100644 index da8503bf..00000000 --- a/recipes-qt/qt5/qtwebengine/0004-include-fcntl.h-for-loff_t.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a0b40dcdfb3331d2b8351bdfb27f1ba3e8a2c33c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 14:37:49 -0700 -Subject: [PATCH 04/12] include fcntl.h for loff_t - -Signed-off-by: Khem Raj ---- - third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -index bdbc4b7e3..b53dd46c5 100644 ---- a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -+++ b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -@@ -151,6 +151,7 @@ extern "C" { - #include - #include - #include -+#include - #include - #include - #include --- -2.13.2 - diff --git a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch index 27bd141d..196ef4c2 100644 --- a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch +++ b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch @@ -1,4 +1,4 @@ -From 4105c12d6f91171934f60b4dbb74b1ca7a9a3eb2 Mon Sep 17 00:00:00 2001 +From d8fd8c8388c54a0322e60e8be49236df3862ec56 Mon Sep 17 00:00:00 2001 From: Cleiton Bueno Date: Thu, 24 Dec 2015 15:59:51 -0200 Subject: [PATCH] Include dependency to QCoreApplication::translate() @@ -9,7 +9,7 @@ Signed-off-by: Cleiton Bueno 1 file changed, 2 insertions(+) diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h -index b13a9da..8a54cce 100644 +index b21d40b8..758d5335 100644 --- a/src/core/media_capture_devices_dispatcher.h +++ b/src/core/media_capture_devices_dispatcher.h @@ -46,6 +46,8 @@ diff --git a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch new file mode 100644 index 00000000..b1a08571 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch @@ -0,0 +1,33 @@ +From fac50c58630264d67e447c2dcdcf54b4f806d35e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 14:01:12 -0700 +Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not + defined + +Musl does not define this Macro + +Signed-off-by: Khem Raj +--- + chromium/sandbox/linux/suid/sandbox.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/chromium/sandbox/linux/suid/sandbox.c b/chromium/sandbox/linux/suid/sandbox.c +index b655d1c79c..3de34e36f2 100644 +--- a/chromium/sandbox/linux/suid/sandbox.c ++++ b/chromium/sandbox/linux/suid/sandbox.c +@@ -44,6 +44,15 @@ static bool DropRoot(); + + #define HANDLE_EINTR(x) TEMP_FAILURE_RETRY(x) + ++#ifndef TEMP_FAILURE_RETRY ++# define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif ++ + static void FatalError(const char* msg, ...) + __attribute__((noreturn, format(printf, 1, 2))); + diff --git a/recipes-qt/qt5/qtwebengine/0005-use-off64_t-instead-of-the-internal-__off64_t.patch b/recipes-qt/qt5/qtwebengine/0005-use-off64_t-instead-of-the-internal-__off64_t.patch deleted file mode 100644 index d552a34e..00000000 --- a/recipes-qt/qt5/qtwebengine/0005-use-off64_t-instead-of-the-internal-__off64_t.patch +++ /dev/null @@ -1,65 +0,0 @@ -From badea43b85346525b7c43c38c32d150b7eb85b13 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 14:38:37 -0700 -Subject: [PATCH 05/12] use off64_t instead of the internal __off64_t - -- only do the glibc 32-bit ABI check for mmap/mmap64 on gnu libc. musl - does not support the 32-bit ABI. - -Signed-off-by: Khem Raj ---- - third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h -index 715c045f6..edc8cf2db 100644 ---- a/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h -+++ b/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h -@@ -77,7 +77,7 @@ typedef off64_t __off64_t; - - static inline void* do_mmap64(void *start, size_t length, - int prot, int flags, -- int fd, __off64_t offset) __THROW { -+ int fd, off64_t offset) __THROW { - // The original gperftools uses sys_mmap() here. But, it is not allowed by - // Chromium's sandbox. - return (void *)syscall(SYS_mmap, start, length, prot, flags, fd, offset); -@@ -90,7 +90,7 @@ static inline void* do_mmap64(void *start, size_t length, - - static inline void* do_mmap64(void *start, size_t length, - int prot, int flags, -- int fd, __off64_t offset) __THROW { -+ int fd, off64_t offset) __THROW { - void *result; - - // Try mmap2() unless it's not supported -@@ -161,7 +161,7 @@ static inline void* do_mmap64(void *start, size_t length, - - extern "C" { - void* mmap64(void *start, size_t length, int prot, int flags, -- int fd, __off64_t offset ) __THROW -+ int fd, off64_t offset ) __THROW - ATTRIBUTE_SECTION(malloc_hook); - void* mmap(void *start, size_t length,int prot, int flags, - int fd, off_t offset) __THROW -@@ -178,7 +178,7 @@ extern "C" { - } - - extern "C" void* mmap64(void *start, size_t length, int prot, int flags, -- int fd, __off64_t offset) __THROW { -+ int fd, off64_t offset) __THROW { - MallocHook::InvokePreMmapHook(start, length, prot, flags, fd, offset); - void *result; - if (!MallocHook::InvokeMmapReplacement( -@@ -189,7 +189,7 @@ extern "C" void* mmap64(void *start, size_t length, int prot, int flags, - return result; - } - --# if !defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH) -+# if defined(__GLIBC__) && (!defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH)) - - extern "C" void* mmap(void *start, size_t length, int prot, int flags, - int fd, off_t offset) __THROW { --- -2.13.2 - diff --git a/recipes-qt/qt5/qtwebengine/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch new file mode 100644 index 00000000..43982daa --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch @@ -0,0 +1,45 @@ +From e7e4def6d1422b84a9d6a6f7b285515d96210e87 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 14:09:06 -0700 +Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux + +Signed-off-by: Khem Raj +--- + chromium/base/trace_event/malloc_dump_provider.cc | 3 ++- + chromium/content/child/content_child_helpers.cc | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc +index 3b1a933bce..a554d03739 100644 +--- a/chromium/base/trace_event/malloc_dump_provider.cc ++++ b/chromium/base/trace_event/malloc_dump_provider.cc +@@ -103,6 +103,7 @@ MallocDumpProvider::~MallocDumpProvider() {} + // the current process. + bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, + ProcessMemoryDump* pmd) { ++#if defined(__GLIBC__) + size_t total_virtual_size = 0; + size_t resident_size = 0; + size_t allocated_objects_size = 0; +@@ -195,7 +196,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, + pmd->DumpHeapUsage(metrics_by_context, overhead, "malloc"); + } + tid_dumping_heap_ = kInvalidThreadId; +- ++#endif // __GLIBC__ + return true; + } + +diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc +index 7ddeb4d16a..b8c73b09c5 100644 +--- a/chromium/content/child/content_child_helpers.cc ++++ b/chromium/content/child/content_child_helpers.cc +@@ -25,7 +25,7 @@ namespace content { + // though, this provides only a partial and misleading value. + // Unfortunately some telemetry benchmark rely on it and these need to + // be refactored before getting rid of this. See crbug.com/581365 . +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(__GLIBC__) || defined(OS_ANDROID) + size_t GetMemoryUsageKB() { + struct mallinfo minfo = mallinfo(); + uint64_t mem_usage = diff --git a/recipes-qt/qt5/qtwebengine/0006-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/0006-linux-glibc-make-the-distinction.patch deleted file mode 100644 index 257d873e..00000000 --- a/recipes-qt/qt5/qtwebengine/0006-linux-glibc-make-the-distinction.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4913850cd644e1fd44ecade5e9faa460de35a7d6 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 14:54:38 -0700 -Subject: [PATCH 06/12] linux != glibc, make the distinction - -Signed-off-by: Khem Raj ---- - base/allocator/allocator_check.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/base/allocator/allocator_check.cc b/base/allocator/allocator_check.cc -index 5a0564d2f..8c2dc6491 100644 ---- a/base/allocator/allocator_check.cc -+++ b/base/allocator/allocator_check.cc -@@ -21,7 +21,7 @@ bool IsAllocatorInitialized() { - #if defined(OS_WIN) && defined(ALLOCATOR_SHIM) - // Set by allocator_shim_win.cc when the shimmed _set_new_mode() is called. - return g_is_win_shim_layer_initialized; --#elif defined(OS_LINUX) && defined(USE_TCMALLOC) && \ -+#elif defined(__GLIBC__) && defined(USE_TCMALLOC) && \ - !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) - // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h. - // TODO(primiano): replace with an include once base can depend on allocator. --- -2.13.2 - diff --git a/recipes-qt/qt5/qtwebengine/0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch b/recipes-qt/qt5/qtwebengine/0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch deleted file mode 100644 index b999c599..00000000 --- a/recipes-qt/qt5/qtwebengine/0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 482e77e9562b8a158b5b212e9f1c83c697fed2e2 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 15:09:02 -0700 -Subject: [PATCH 07/12] allocator: Do not include glibc_weak_symbols for musl - -Signed-off-by: Khem Raj ---- - base/allocator/allocator_shim.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/base/allocator/allocator_shim.cc b/base/allocator/allocator_shim.cc -index 57a398aaa..54c79063a 100644 ---- a/base/allocator/allocator_shim.cc -+++ b/base/allocator/allocator_shim.cc -@@ -263,7 +263,7 @@ void ShimFree(void* address) { - // In the case of tcmalloc we also want to plumb into the glibc hooks - // to avoid that allocations made in glibc itself (e.g., strdup()) get - // accidentally performed on the glibc heap instead of the tcmalloc one. --#if defined(USE_TCMALLOC) -+#if defined(USE_TCMALLOC) && defined(__GLIBC__) - #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h" - #endif - --- -2.13.2 - diff --git a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/0007-chromium-musl-include-fcntl.h-for-loff_t.patch new file mode 100644 index 00000000..95a12b01 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0007-chromium-musl-include-fcntl.h-for-loff_t.patch @@ -0,0 +1,22 @@ +From eac1905c90085d3b9de3764078022643dd1b5ce9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 14:37:49 -0700 +Subject: [PATCH] chromium: musl: include fcntl.h for loff_t + +Signed-off-by: Khem Raj +--- + chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +index bdbc4b7e3b..b53dd46c57 100644 +--- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h ++++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +@@ -151,6 +151,7 @@ extern "C" { + #include + #include + #include ++#include + #include + #include + #include diff --git a/recipes-qt/qt5/qtwebengine/0008-Use-correct-member-name-__si_fields-from-LinuxSigInf.patch b/recipes-qt/qt5/qtwebengine/0008-Use-correct-member-name-__si_fields-from-LinuxSigInf.patch deleted file mode 100644 index 3bd0a9d4..00000000 --- a/recipes-qt/qt5/qtwebengine/0008-Use-correct-member-name-__si_fields-from-LinuxSigInf.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3d12eb821e105111cbd88f5598746bd77c3a9ef0 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 15:12:39 -0700 -Subject: [PATCH 08/12] Use correct member name __si_fields from LinuxSigInfo - -Signed-off-by: Khem Raj ---- - sandbox/linux/seccomp-bpf/trap.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sandbox/linux/seccomp-bpf/trap.cc b/sandbox/linux/seccomp-bpf/trap.cc -index 003708d2c..0fef3148f 100644 ---- a/sandbox/linux/seccomp-bpf/trap.cc -+++ b/sandbox/linux/seccomp-bpf/trap.cc -@@ -168,7 +168,7 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) { - // most versions of glibc don't include this information in siginfo_t. So, - // we need to explicitly copy it into a arch_sigsys structure. - struct arch_sigsys sigsys; -- memcpy(&sigsys, &info->_sifields, sizeof(sigsys)); -+ memcpy(&sigsys, &info->__si_fields, sizeof(sigsys)); - - #if defined(__mips__) - // When indirect syscall (syscall(__NR_foo, ...)) is made on Mips, the --- -2.13.2 - diff --git a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch new file mode 100644 index 00000000..d15a63fd --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch @@ -0,0 +1,62 @@ +From 1690ac56cc013c3a18aa3c83e0efae47cc9da4f0 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 14:38:37 -0700 +Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t + +- only do the glibc 32-bit ABI check for mmap/mmap64 on gnu libc. musl + does not support the 32-bit ABI. + +Signed-off-by: Khem Raj +--- + .../third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h +index 715c045f66..edc8cf2db7 100644 +--- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h ++++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h +@@ -77,7 +77,7 @@ typedef off64_t __off64_t; + + static inline void* do_mmap64(void *start, size_t length, + int prot, int flags, +- int fd, __off64_t offset) __THROW { ++ int fd, off64_t offset) __THROW { + // The original gperftools uses sys_mmap() here. But, it is not allowed by + // Chromium's sandbox. + return (void *)syscall(SYS_mmap, start, length, prot, flags, fd, offset); +@@ -90,7 +90,7 @@ static inline void* do_mmap64(void *start, size_t length, + + static inline void* do_mmap64(void *start, size_t length, + int prot, int flags, +- int fd, __off64_t offset) __THROW { ++ int fd, off64_t offset) __THROW { + void *result; + + // Try mmap2() unless it's not supported +@@ -161,7 +161,7 @@ static inline void* do_mmap64(void *start, size_t length, + + extern "C" { + void* mmap64(void *start, size_t length, int prot, int flags, +- int fd, __off64_t offset ) __THROW ++ int fd, off64_t offset ) __THROW + ATTRIBUTE_SECTION(malloc_hook); + void* mmap(void *start, size_t length,int prot, int flags, + int fd, off_t offset) __THROW +@@ -178,7 +178,7 @@ extern "C" { + } + + extern "C" void* mmap64(void *start, size_t length, int prot, int flags, +- int fd, __off64_t offset) __THROW { ++ int fd, off64_t offset) __THROW { + MallocHook::InvokePreMmapHook(start, length, prot, flags, fd, offset); + void *result; + if (!MallocHook::InvokeMmapReplacement( +@@ -189,7 +189,7 @@ extern "C" void* mmap64(void *start, size_t length, int prot, int flags, + return result; + } + +-# if !defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH) ++# if defined(__GLIBC__) && (!defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH)) + + extern "C" void* mmap(void *start, size_t length, int prot, int flags, + int fd, off_t offset) __THROW { diff --git a/recipes-qt/qt5/qtwebengine/0009-Match-syscalls-to-match-musl.patch b/recipes-qt/qt5/qtwebengine/0009-Match-syscalls-to-match-musl.patch deleted file mode 100644 index bfb6ebb6..00000000 --- a/recipes-qt/qt5/qtwebengine/0009-Match-syscalls-to-match-musl.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 5843df01580b0fb956ee4b7e1a60c0130c8c90f9 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 15:24:49 -0700 -Subject: [PATCH 09/12] Match syscalls to match musl - -Signed-off-by: Khem Raj ---- - third_party/lss/linux_syscall_support.h | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/third_party/lss/linux_syscall_support.h b/third_party/lss/linux_syscall_support.h -index 9dbd2391b..a715de177 100644 ---- a/third_party/lss/linux_syscall_support.h -+++ b/third_party/lss/linux_syscall_support.h -@@ -793,6 +793,14 @@ struct kernel_statfs { - #endif - - -+#undef stat64 -+#undef fstat64 -+ -+#ifndef __NR_fstatat -+#define __NR_fstatat __NR_fstatat64 -+#endif -+ -+ - #if defined(__x86_64__) - #ifndef ARCH_SET_GS - #define ARCH_SET_GS 0x1001 -@@ -1210,6 +1218,14 @@ struct kernel_statfs { - #ifndef __NR_fallocate - #define __NR_fallocate 285 - #endif -+ -+#ifndef __NR_pread -+#define __NR_pread __NR_pread64 -+#endif -+#ifndef __NR_pwrite -+#define __NR_pwrite __NR_pwrite64 -+#endif -+ - /* End of x86-64 definitions */ - #elif defined(__mips__) - #if _MIPS_SIM == _MIPS_SIM_ABI32 --- -2.13.2 - diff --git a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/0009-chromium-musl-linux-glibc-make-the-distinction.patch new file mode 100644 index 00000000..434d62cd --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0009-chromium-musl-linux-glibc-make-the-distinction.patch @@ -0,0 +1,23 @@ +From 71072da07e963ae1b05f9d956ef715de8d249c5d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 14:54:38 -0700 +Subject: [PATCH] chromium: musl: linux != glibc, make the distinction + +Signed-off-by: Khem Raj +--- + chromium/base/allocator/allocator_check.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc +index 5a0564d2f3..8c2dc6491d 100644 +--- a/chromium/base/allocator/allocator_check.cc ++++ b/chromium/base/allocator/allocator_check.cc +@@ -21,7 +21,7 @@ bool IsAllocatorInitialized() { + #if defined(OS_WIN) && defined(ALLOCATOR_SHIM) + // Set by allocator_shim_win.cc when the shimmed _set_new_mode() is called. + return g_is_win_shim_layer_initialized; +-#elif defined(OS_LINUX) && defined(USE_TCMALLOC) && \ ++#elif defined(__GLIBC__) && defined(USE_TCMALLOC) && \ + !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) + // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h. + // TODO(primiano): replace with an include once base can depend on allocator. diff --git a/recipes-qt/qt5/qtwebengine/0010-Define-res_ninit-and-res_nclose-for-non-glibc-platfo.patch b/recipes-qt/qt5/qtwebengine/0010-Define-res_ninit-and-res_nclose-for-non-glibc-platfo.patch deleted file mode 100644 index 1825ed7b..00000000 --- a/recipes-qt/qt5/qtwebengine/0010-Define-res_ninit-and-res_nclose-for-non-glibc-platfo.patch +++ /dev/null @@ -1,81 +0,0 @@ -From df3fd62f7f0c51c11e7f715c2523418c31eb6b0f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 15:27:50 -0700 -Subject: [PATCH 10/12] Define res_ninit and res_nclose for non-glibc platforms - -Signed-off-by: Khem Raj ---- - net/dns/dns_config_service_posix.cc | 4 ++++ - net/dns/dns_reloader.cc | 4 ++++ - net/dns/resolv_compat.h | 29 +++++++++++++++++++++++++++++ - 3 files changed, 37 insertions(+) - create mode 100644 net/dns/resolv_compat.h - -diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc -index ba8a36913..e9b40d07f 100644 ---- a/net/dns/dns_config_service_posix.cc -+++ b/net/dns/dns_config_service_posix.cc -@@ -25,6 +25,10 @@ - #include "net/dns/notify_watcher_mac.h" - #include "net/dns/serial_worker.h" - -+#if defined(OS_LINUX) && !defined(__GLIBC__) -+#include "net/dns/resolv_compat.h" -+#endif -+ - #if defined(OS_MACOSX) && !defined(OS_IOS) - #include "net/dns/dns_config_watcher_mac.h" - #endif -diff --git a/net/dns/dns_reloader.cc b/net/dns/dns_reloader.cc -index 74534e6b1..2780a776e 100644 ---- a/net/dns/dns_reloader.cc -+++ b/net/dns/dns_reloader.cc -@@ -9,6 +9,10 @@ - - #include - -+#if defined(OS_LINUX) && !defined(__GLIBC__) -+#include "net/dns/resolv_compat.h" -+#endif -+ - #include "base/lazy_instance.h" - #include "base/logging.h" - #include "base/macros.h" -diff --git a/net/dns/resolv_compat.h b/net/dns/resolv_compat.h -new file mode 100644 -index 000000000..4f0e852a1 ---- /dev/null -+++ b/net/dns/resolv_compat.h -@@ -0,0 +1,29 @@ -+#if !defined(__GLIBC__) -+/*************************************************************************** -+ * resolv_compat.h -+ * -+ * Mimick GLIBC's res_ninit() and res_nclose() for musl libc -+ * Note: res_init() is actually deprecated according to -+ * http://docs.oracle.com/cd/E36784_01/html/E36875/res-nclose-3resolv.html -+ **************************************************************************/ -+#include -+ -+static inline int res_ninit(res_state statp) -+{ -+ int rc = res_init(); -+ if (statp != &_res) { -+ memcpy(statp, &_res, sizeof(*statp)); -+ } -+ return rc; -+} -+ -+static inline int res_nclose(res_state statp) -+{ -+ if (!statp) -+ return -1; -+ if (statp != &_res) { -+ memset(statp, 0, sizeof(*statp)); -+ } -+ return 0; -+} -+#endif --- -2.13.2 - diff --git a/recipes-qt/qt5/qtwebengine/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch new file mode 100644 index 00000000..4393103c --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch @@ -0,0 +1,24 @@ +From 43384ce7ab1d3b14820cb9bc0698130be9291a8e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 15:09:02 -0700 +Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols + for musl + +Signed-off-by: Khem Raj +--- + chromium/base/allocator/allocator_shim.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc +index af08ec039f..15070b9a13 100644 +--- a/chromium/base/allocator/allocator_shim.cc ++++ b/chromium/base/allocator/allocator_shim.cc +@@ -244,7 +244,7 @@ void ShimFree(void* address) { + // In the case of tcmalloc we also want to plumb into the glibc hooks + // to avoid that allocations made in glibc itself (e.g., strdup()) get + // accidentally performed on the glibc heap instead of the tcmalloc one. +-#if defined(USE_TCMALLOC) ++#if defined(USE_TCMALLOC) && defined(__GLIBC__) + #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h" + #endif + diff --git a/recipes-qt/qt5/qtwebengine/0011-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/0011-Do-not-define-__sbrk-on-musl.patch deleted file mode 100644 index a2c2b901..00000000 --- a/recipes-qt/qt5/qtwebengine/0011-Do-not-define-__sbrk-on-musl.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8a6553232988a5bfc8f0c48d4214a3982025fb2c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 15:39:57 -0700 -Subject: [PATCH 11/12] Do not define __sbrk on musl - -musl libc does not have sbrk. on musl libc will only work when called with 0 as -argument, so we just let it out for now - -Signed-off-by: Khem Raj ---- - third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h -index edc8cf2db..a868b50d3 100644 ---- a/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h -+++ b/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h -@@ -233,7 +233,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size, - } - - // Don't hook sbrk() in Android, since it doesn't expose __sbrk. --#if !defined(__ANDROID__) -+#if !defined(__ANDROID__) && defined(__GLIBC__) - // libc's version: - extern "C" void* __sbrk(ptrdiff_t increment); - --- -2.13.2 - diff --git a/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch new file mode 100644 index 00000000..04e0012a --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch @@ -0,0 +1,24 @@ +From 701bb2640d5e5b03e8e019600a076c93508e1541 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 15:12:39 -0700 +Subject: [PATCH] chromium: musl: Use correct member name __si_fields from + LinuxSigInfo + +Signed-off-by: Khem Raj +--- + chromium/sandbox/linux/seccomp-bpf/trap.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc +index 003708d2c8..0fef3148f9 100644 +--- a/chromium/sandbox/linux/seccomp-bpf/trap.cc ++++ b/chromium/sandbox/linux/seccomp-bpf/trap.cc +@@ -168,7 +168,7 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) { + // most versions of glibc don't include this information in siginfo_t. So, + // we need to explicitly copy it into a arch_sigsys structure. + struct arch_sigsys sigsys; +- memcpy(&sigsys, &info->_sifields, sizeof(sigsys)); ++ memcpy(&sigsys, &info->__si_fields, sizeof(sigsys)); + + #if defined(__mips__) + // When indirect syscall (syscall(__NR_foo, ...)) is made on Mips, the diff --git a/recipes-qt/qt5/qtwebengine/0012-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/0012-Adjust-default-pthread-stack-size.patch deleted file mode 100644 index de2ec97d..00000000 --- a/recipes-qt/qt5/qtwebengine/0012-Adjust-default-pthread-stack-size.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 65d516f64c1cca91868cb26aeb93802382704fd5 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 16:41:23 -0700 -Subject: [PATCH 1/2] Adjust default pthread stack size - -Signed-off-by: Khem Raj ---- - base/threading/platform_thread_linux.cc | 3 ++- - chrome/browser/chrome_browser_main_posix.cc | 9 +++++++++ - third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp | 4 ++-- - 3 files changed, 13 insertions(+), 3 deletions(-) - -diff --git a/base/threading/platform_thread_linux.cc b/base/threading/platform_thread_linux.cc -index 95ed32418..666e85ba3 100644 ---- a/base/threading/platform_thread_linux.cc -+++ b/base/threading/platform_thread_linux.cc -@@ -96,7 +96,8 @@ void TerminateOnThread() {} - - size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { - #if !defined(THREAD_SANITIZER) -- return 0; -+ // use 8mb like glibc to avoid running out of space -+ return (1 << 23); - #else - // ThreadSanitizer bloats the stack heavily. Evidence has been that the - // default stack size isn't enough for some browser tests. -diff --git a/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp b/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp -index 3c0a0395b..2af6073e2 100644 ---- a/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp -+++ b/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp -@@ -73,7 +73,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() - // FIXME: On Mac OSX and Linux, this method cannot estimate stack size - // correctly for the main thread. - --#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) -+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) - // pthread_getattr_np() can fail if the thread is not invoked by - // pthread_create() (e.g., the main thread of webkit_unit_tests). - // If so, a conservative size estimate is returned. -@@ -135,7 +135,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() - - void* StackFrameDepth::getStackStart() - { --#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) -+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) - pthread_attr_t attr; - int error; - #if OS(FREEBSD) --- -2.13.2 - diff --git a/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Match-syscalls-to-match-musl.patch b/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Match-syscalls-to-match-musl.patch new file mode 100644 index 00000000..b5a0f849 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Match-syscalls-to-match-musl.patch @@ -0,0 +1,44 @@ +From ad184ecc5e5e67d1f3862e9ed3f767dff9bbc414 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 15:24:49 -0700 +Subject: [PATCH] chromium: musl: Match syscalls to match musl + +Signed-off-by: Khem Raj +--- + chromium/third_party/lss/linux_syscall_support.h | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h +index 8a42c1c868..8e878c70f2 100644 +--- a/chromium/third_party/lss/linux_syscall_support.h ++++ b/chromium/third_party/lss/linux_syscall_support.h +@@ -717,6 +717,14 @@ struct kernel_statfs { + #endif + + ++#undef stat64 ++#undef fstat64 ++ ++#ifndef __NR_fstatat ++#define __NR_fstatat __NR_fstatat64 ++#endif ++ ++ + #if defined(__x86_64__) + #ifndef ARCH_SET_GS + #define ARCH_SET_GS 0x1001 +@@ -1134,6 +1142,14 @@ struct kernel_statfs { + #ifndef __NR_fallocate + #define __NR_fallocate 285 + #endif ++ ++#ifndef __NR_pread ++#define __NR_pread __NR_pread64 ++#endif ++#ifndef __NR_pwrite ++#define __NR_pwrite __NR_pwrite64 ++#endif ++ + /* End of x86-64 definitions */ + #elif defined(__mips__) + #if _MIPS_SIM == _MIPS_SIM_ABI32 diff --git a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch new file mode 100644 index 00000000..68b8f45d --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch @@ -0,0 +1,79 @@ +From c892406f07b4e214397c55de62eccac3d558b134 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 15:27:50 -0700 +Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc + platforms + +Signed-off-by: Khem Raj +--- + chromium/net/dns/dns_config_service_posix.cc | 4 ++++ + chromium/net/dns/dns_reloader.cc | 4 ++++ + chromium/net/dns/resolv_compat.h | 29 ++++++++++++++++++++++++++++ + 3 files changed, 37 insertions(+) + create mode 100644 chromium/net/dns/resolv_compat.h + +diff --git a/chromium/net/dns/dns_config_service_posix.cc b/chromium/net/dns/dns_config_service_posix.cc +index ba8a369133..e9b40d07fc 100644 +--- a/chromium/net/dns/dns_config_service_posix.cc ++++ b/chromium/net/dns/dns_config_service_posix.cc +@@ -25,6 +25,10 @@ + #include "net/dns/notify_watcher_mac.h" + #include "net/dns/serial_worker.h" + ++#if defined(OS_LINUX) && !defined(__GLIBC__) ++#include "net/dns/resolv_compat.h" ++#endif ++ + #if defined(OS_MACOSX) && !defined(OS_IOS) + #include "net/dns/dns_config_watcher_mac.h" + #endif +diff --git a/chromium/net/dns/dns_reloader.cc b/chromium/net/dns/dns_reloader.cc +index 74534e6b1b..2780a776e4 100644 +--- a/chromium/net/dns/dns_reloader.cc ++++ b/chromium/net/dns/dns_reloader.cc +@@ -9,6 +9,10 @@ + + #include + ++#if defined(OS_LINUX) && !defined(__GLIBC__) ++#include "net/dns/resolv_compat.h" ++#endif ++ + #include "base/lazy_instance.h" + #include "base/logging.h" + #include "base/macros.h" +diff --git a/chromium/net/dns/resolv_compat.h b/chromium/net/dns/resolv_compat.h +new file mode 100644 +index 0000000000..4f0e852a19 +--- /dev/null ++++ b/chromium/net/dns/resolv_compat.h +@@ -0,0 +1,29 @@ ++#if !defined(__GLIBC__) ++/*************************************************************************** ++ * resolv_compat.h ++ * ++ * Mimick GLIBC's res_ninit() and res_nclose() for musl libc ++ * Note: res_init() is actually deprecated according to ++ * http://docs.oracle.com/cd/E36784_01/html/E36875/res-nclose-3resolv.html ++ **************************************************************************/ ++#include ++ ++static inline int res_ninit(res_state statp) ++{ ++ int rc = res_init(); ++ if (statp != &_res) { ++ memcpy(statp, &_res, sizeof(*statp)); ++ } ++ return rc; ++} ++ ++static inline int res_nclose(res_state statp) ++{ ++ if (!statp) ++ return -1; ++ if (statp != &_res) { ++ memset(statp, 0, sizeof(*statp)); ++ } ++ return 0; ++} ++#endif diff --git a/recipes-qt/qt5/qtwebengine/0013-include-asm-generic-ioctl.h-for-TCGETS2.patch b/recipes-qt/qt5/qtwebengine/0013-include-asm-generic-ioctl.h-for-TCGETS2.patch deleted file mode 100644 index abe2eaf8..00000000 --- a/recipes-qt/qt5/qtwebengine/0013-include-asm-generic-ioctl.h-for-TCGETS2.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d5014cf9a97cf97a6e9bb7f751c7cee3c24e17fd Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 17:15:34 -0700 -Subject: [PATCH 1/2] include asm-generic/ioctl.h for TCGETS2 - -Signed-off-by: Khem Raj ---- - device/serial/serial_io_handler_posix.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/device/serial/serial_io_handler_posix.cc b/device/serial/serial_io_handler_posix.cc -index 158c374a0..c08fb4a8e 100644 ---- a/device/serial/serial_io_handler_posix.cc -+++ b/device/serial/serial_io_handler_posix.cc -@@ -6,6 +6,7 @@ - - #include - #include -+#include - - #include "base/posix/eintr_wrapper.h" - #include "build/build_config.h" --- -2.13.2 - diff --git a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch new file mode 100644 index 00000000..c9801899 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch @@ -0,0 +1,26 @@ +From be624e7cc1bc18e9e198bba16fcb224a7f9746fc Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 15:39:57 -0700 +Subject: [PATCH] chromium: musl: Do not define __sbrk on musl + +musl libc does not have sbrk. on musl libc will only work when called with 0 as +argument, so we just let it out for now + +Signed-off-by: Khem Raj +--- + chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h +index edc8cf2db7..a868b50d30 100644 +--- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h ++++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h +@@ -233,7 +233,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size, + } + + // Don't hook sbrk() in Android, since it doesn't expose __sbrk. +-#if !defined(__ANDROID__) ++#if !defined(__ANDROID__) && defined(__GLIBC__) + // libc's version: + extern "C" void* __sbrk(ptrdiff_t increment); + diff --git a/recipes-qt/qt5/qtwebengine/0014-link-with-libexecinfo-on-musl.patch b/recipes-qt/qt5/qtwebengine/0014-link-with-libexecinfo-on-musl.patch deleted file mode 100644 index 1b65420b..00000000 --- a/recipes-qt/qt5/qtwebengine/0014-link-with-libexecinfo-on-musl.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4b5aab95e34e1cbebc7566c1267cddc2560601c8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 17:41:43 -0700 -Subject: [PATCH 2/2] link with libexecinfo on musl - -Signed-off-by: Khem Raj ---- - base/base.gyp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/base/base.gyp b/base/base.gyp -index 67e051ae4..7f5dfe214 100644 ---- a/base/base.gyp -+++ b/base/base.gyp -@@ -126,6 +126,7 @@ - '-lrt', - # For 'native_library_linux.cc' - '-ldl', -+ '-lexecinfo', - ], - }, - 'conditions': [ --- -2.13.2 - diff --git a/recipes-qt/qt5/qtwebengine/0015-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/0015-chromium-musl-Adjust-default-pthread-stack-size.patch new file mode 100644 index 00000000..997e3124 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0015-chromium-musl-Adjust-default-pthread-stack-size.patch @@ -0,0 +1,47 @@ +From 295fd835b22203807962a3eea08a12b74ae54c2c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 16:41:23 -0700 +Subject: [PATCH] chromium: musl: Adjust default pthread stack size + +Signed-off-by: Khem Raj +--- + chromium/base/threading/platform_thread_linux.cc | 3 ++- + chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp | 4 ++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc +index 95ed32418f..666e85ba33 100644 +--- a/chromium/base/threading/platform_thread_linux.cc ++++ b/chromium/base/threading/platform_thread_linux.cc +@@ -96,7 +96,8 @@ void TerminateOnThread() {} + + size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { + #if !defined(THREAD_SANITIZER) +- return 0; ++ // use 8mb like glibc to avoid running out of space ++ return (1 << 23); + #else + // ThreadSanitizer bloats the stack heavily. Evidence has been that the + // default stack size isn't enough for some browser tests. +diff --git a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp +index 3c0a0395b1..2af6073e21 100644 +--- a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp ++++ b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp +@@ -73,7 +73,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() + // FIXME: On Mac OSX and Linux, this method cannot estimate stack size + // correctly for the main thread. + +-#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + // pthread_getattr_np() can fail if the thread is not invoked by + // pthread_create() (e.g., the main thread of webkit_unit_tests). + // If so, a conservative size estimate is returned. +@@ -135,7 +135,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() + + void* StackFrameDepth::getStackStart() + { +-#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + pthread_attr_t attr; + int error; + #if OS(FREEBSD) diff --git a/recipes-qt/qt5/qtwebengine/0016-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch b/recipes-qt/qt5/qtwebengine/0016-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch new file mode 100644 index 00000000..2e80de8c --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0016-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch @@ -0,0 +1,22 @@ +From 91d9e3476c6432ae9ea8f8c0a9f6c435be844da0 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 17:15:34 -0700 +Subject: [PATCH] chromium: musl: include asm-generic/ioctl.h for TCGETS2 + +Signed-off-by: Khem Raj +--- + chromium/device/serial/serial_io_handler_posix.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/chromium/device/serial/serial_io_handler_posix.cc b/chromium/device/serial/serial_io_handler_posix.cc +index 158c374a03..c08fb4a8ec 100644 +--- a/chromium/device/serial/serial_io_handler_posix.cc ++++ b/chromium/device/serial/serial_io_handler_posix.cc +@@ -6,6 +6,7 @@ + + #include + #include ++#include + + #include "base/posix/eintr_wrapper.h" + #include "build/build_config.h" diff --git a/recipes-qt/qt5/qtwebengine/0017-chromium-musl-link-with-libexecinfo-on-musl.patch b/recipes-qt/qt5/qtwebengine/0017-chromium-musl-link-with-libexecinfo-on-musl.patch new file mode 100644 index 00000000..5e28adb7 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0017-chromium-musl-link-with-libexecinfo-on-musl.patch @@ -0,0 +1,22 @@ +From a8163b060b699aa6678c45c970f4fbc806a6c198 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 17:41:43 -0700 +Subject: [PATCH] chromium: musl: link with libexecinfo on musl + +Signed-off-by: Khem Raj +--- + chromium/base/base.gyp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/chromium/base/base.gyp b/chromium/base/base.gyp +index 3c3aded640..347b7e7856 100644 +--- a/chromium/base/base.gyp ++++ b/chromium/base/base.gyp +@@ -126,6 +126,7 @@ + '-lrt', + # For 'native_library_linux.cc' + '-ldl', ++ '-lexecinfo', + ], + }, + 'conditions': [ diff --git a/recipes-qt/qt5/qtwebengine/0018-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch b/recipes-qt/qt5/qtwebengine/0018-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch new file mode 100644 index 00000000..fe141aa8 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0018-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch @@ -0,0 +1,23 @@ +From d05c22bdabe10c0db9b65252e442251efc81a379 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 8 Jul 2017 09:08:23 -0700 +Subject: [PATCH] chromium: musl: tcmalloc: Use off64_t insread of __off64_t + +Signed-off-by: Khem Raj +--- + chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +index b53dd46c57..58da4d19d7 100644 +--- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h ++++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +@@ -1930,7 +1930,7 @@ typedef unsigned long int ulong; + #if defined(__x86_64__) + /* Need to make sure __off64_t isn't truncated to 32-bits under x32. */ + LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d, +- __off64_t o) { ++ off64_t o) { + LSS_BODY(6, void*, mmap, LSS_SYSCALL_ARG(s), LSS_SYSCALL_ARG(l), + LSS_SYSCALL_ARG(p), LSS_SYSCALL_ARG(f), + LSS_SYSCALL_ARG(d), (uint64_t)(o)); diff --git a/recipes-qt/qt5/qtwebengine/0018-tcmalloc-Use-off64_t-insread-of-__off64_t.patch b/recipes-qt/qt5/qtwebengine/0018-tcmalloc-Use-off64_t-insread-of-__off64_t.patch deleted file mode 100644 index 2ef54339..00000000 --- a/recipes-qt/qt5/qtwebengine/0018-tcmalloc-Use-off64_t-insread-of-__off64_t.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1a468dd5239ebdf013d9ffb3a2d181d0434b4c6c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 8 Jul 2017 09:08:23 -0700 -Subject: [PATCH 2/2] tcmalloc: Use off64_t insread of __off64_t - -Signed-off-by: Khem Raj ---- - third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -index b53dd46c5..58da4d19d 100644 ---- a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -+++ b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -@@ -1930,7 +1930,7 @@ typedef unsigned long int ulong; - #if defined(__x86_64__) - /* Need to make sure __off64_t isn't truncated to 32-bits under x32. */ - LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d, -- __off64_t o) { -+ off64_t o) { - LSS_BODY(6, void*, mmap, LSS_SYSCALL_ARG(s), LSS_SYSCALL_ARG(l), - LSS_SYSCALL_ARG(p), LSS_SYSCALL_ARG(f), - LSS_SYSCALL_ARG(d), (uint64_t)(o)); --- -2.13.2 - diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 033bdaae..84c46688 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -133,20 +133,20 @@ SRC_URI += " \ file://0004-chromium-WebKit-fix-build-with-gcc7.patch;patchdir=src/3rdparty \ " SRC_URI_append_libc-musl = "\ - file://0001-sandbox-Define-TEMP_FAILURE_RETRY-if-not-defined.patch;patchdir=src/3rdparty/chromium \ - file://0003-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty/chromium \ - file://0004-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty/chromium \ - file://0005-use-off64_t-instead-of-the-internal-__off64_t.patch;patchdir=src/3rdparty/chromium \ - file://0006-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty/chromium \ - file://0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch;patchdir=src/3rdparty/chromium \ - file://0008-Use-correct-member-name-__si_fields-from-LinuxSigInf.patch;patchdir=src/3rdparty/chromium \ - file://0009-Match-syscalls-to-match-musl.patch;patchdir=src/3rdparty/chromium \ - file://0010-Define-res_ninit-and-res_nclose-for-non-glibc-platfo.patch;patchdir=src/3rdparty/chromium \ - file://0011-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty/chromium \ - file://0012-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty/chromium \ - file://0013-include-asm-generic-ioctl.h-for-TCGETS2.patch;patchdir=src/3rdparty/chromium \ - file://0014-link-with-libexecinfo-on-musl.patch;patchdir=src/3rdparty/chromium \ - file://0018-tcmalloc-Use-off64_t-insread-of-__off64_t.patch;patchdir=src/3rdparty/chromium \ + file://0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ + file://0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ + file://0007-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ + file://0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ + file://0009-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ + file://0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ + file://0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \ + file://0012-chromium-musl-Match-syscalls-to-match-musl.patch;patchdir=src/3rdparty \ + file://0013-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ + file://0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ + file://0015-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ + file://0016-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \ + file://0017-chromium-musl-link-with-libexecinfo-on-musl.patch;patchdir=src/3rdparty \ + file://0018-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ " SRCREV_qtwebengine = "d740d6a7dbfec387752c7bc8a8b06db0e757c9dc" -- cgit v1.2.3 From 142f8880b5d18ed90cf0c34a0c970379ff769e47 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 17 Aug 2017 20:44:06 +0200 Subject: qt3d: refresh patches Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch | 6 +++--- .../0002-Fix-BlenderDNA-for-clang-cross-compiler.patch | 14 ++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch index b19f963e..ba4e2d01 100644 --- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch @@ -1,4 +1,4 @@ -From 64f46f5399627430f9ce1a888fb9212b33977231 Mon Sep 17 00:00:00 2001 +From 22ccc94b5501509b516fce17195a598d04dcc2f3 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 10 Feb 2016 09:02:09 +0200 Subject: [PATCH] Allow a tools-only build @@ -9,7 +9,7 @@ Subject: [PATCH] Allow a tools-only build 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/qt3d.pro b/qt3d.pro -index 2cc347a..81cdeef 100644 +index 2cc347a1c..81cdeefb0 100644 --- a/qt3d.pro +++ b/qt3d.pro @@ -1,4 +1,4 @@ @@ -28,7 +28,7 @@ index 2cc347a..81cdeef 100644 + SUBDIRS = sub_tools +} diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri -index 8ba2d9a..e973d93 100644 +index 8ba2d9a41..e973d93dd 100644 --- a/src/3rdparty/assimp/assimp_dependency.pri +++ b/src/3rdparty/assimp/assimp_dependency.pri @@ -1,5 +1,5 @@ diff --git a/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch b/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch index 8b36a0a6..95b5479e 100644 --- a/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch +++ b/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch @@ -1,14 +1,15 @@ -From b28ad8e101d4e2ffae00e43d53b22ace35f8c308 Mon Sep 17 00:00:00 2001 +From bc5ef10fc6f71cb340ad339bc43f6ce48adb1f59 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Mon, 7 Nov 2016 17:19:49 +0100 Subject: [PATCH] Fix BlenderDNA for clang cross compiler. +Signed-off-by: Martin Jansa --- src/3rdparty/assimp/code/BlenderDNA.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/3rdparty/assimp/code/BlenderDNA.cpp b/src/3rdparty/assimp/code/BlenderDNA.cpp -index b380fbe8d..437e44349 100644 +index b380fbe8d..3cc27dff1 100644 --- a/src/3rdparty/assimp/code/BlenderDNA.cpp +++ b/src/3rdparty/assimp/code/BlenderDNA.cpp @@ -56,10 +56,10 @@ using namespace Assimp::Formatter; @@ -19,9 +20,9 @@ index b380fbe8d..437e44349 100644 - (stream).GetI1(), - (stream).GetI1(), - (stream).GetI1() -+ (const char)(stream).GetI1(), -+ (const char)(stream).GetI1(), -+ (const char)(stream).GetI1(), ++ (const char)(stream).GetI1(), ++ (const char)(stream).GetI1(), ++ (const char)(stream).GetI1(), + (const char)(stream).GetI1() }; return (tmp[0]==string[0] && tmp[1]==string[1] && tmp[2]==string[2] && tmp[3]==string[3]); @@ -41,6 +42,3 @@ index b380fbe8d..437e44349 100644 }; current.id = std::string(tmp,tmp[3]?4:tmp[2]?3:tmp[1]?2:1); --- -2.13.3 - -- cgit v1.2.3 From 3522d3dca07494fa2bd060d53c53081d8483b910 Mon Sep 17 00:00:00 2001 From: Matt Hoosier Date: Thu, 17 Aug 2017 07:27:33 -0500 Subject: qtbase: fix Krogoth build regression from efa8aaf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With commit efa8aaf82e580a7d32eaaab48eb92d436f2e222a Author: Andreas Müller Date: Thu Feb 9 00:26:09 2017 qmake5_base.bbclass: set qt.conf by environment variable again we stopped pointing ${OE_QMAKE_QTCONF_PATH} at a valid file and instead directed it to a path which was intended not to exist. The motivation was to permit qtbase/qtbase-native/nativesdk-qtbase to build again after Qt 5.8 started paying attention to the contents of this file. The change as done in efa8aaf works well enough for Morty and subsequent releases' copies of Bitbake, but fails on earlier releases because they lack the following change: commit 2afcbfef2cd1ca568e5225884a8021df38ee3db0 Author: Ross Burton Date: 2016-07-14 13:56:22 bitbake: build: don't use $B as the default cwd for functions The result is that when we build with Krogoth or prior, the body of do_generate_qt_config_file() runs with a cwd of ${B}, which was _not_ the intent of efa8aaf. Because the working directory is ${B}, ${OE_QMAKE_QTCONF_PATH} is written in there too. do_configure() -- whose cwd is by design also ${B} -- then finds the file 'foodummy', and the build breaks for the reasons outlined in efa8aaf. This change simply shifts the implementation tactics to suppress the creation of ${OE_QMAKE_QTCONF_PATH} during qtbase rather than rely on unspecified behavior about the cwd of do_generate_qt_config_file(). (cherry picked from commit a17ff281aa8d99f770b0a049cb798235005fb93e at https://codereview.qt-project.org/yocto/meta-qt5.) Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 0f1c6d6c..6f334c12 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -97,7 +97,7 @@ OE_QMAKE_PATH_HOST_LIBS = "${libdir}" # for qtbase configuration we need default settings # since we cannot set empty set filename to a not existent file -export OE_QMAKE_QTCONF_PATH = "foodummy" +deltask generate_qt_config_file do_configure() { ${S}/configure -v \ diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 2420580b..c8bf0083 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -82,7 +82,7 @@ PACKAGECONFIG_CONFARGS = " \ # for qtbase configuration we need default settings # since we cannot set empty set filename to a not existent file -export OE_QMAKE_QTCONF_PATH = "foodummy" +deltask generate_qt_config_file do_configure_prepend() { # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 2115557f..8cd23a02 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -141,7 +141,7 @@ QT_CONFIG_FLAGS += " \ # for qtbase configuration we need default settings # since we cannot set empty set filename to a not existent file -export OE_QMAKE_QTCONF_PATH = "foodummy" +deltask generate_qt_config_file do_configure() { # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" during configuration -- cgit v1.2.3 From d9f4b6e55e02458e6bd4b66188cb87d8a7c474fc Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Wed, 16 Aug 2017 09:13:04 -0700 Subject: meta-toolchain-qt5: don't rely on COREBASE/LICENSE This file lists the licenses in use by OE-Core and it not a proper license file, just use the COPYING.MIT. Signed-off-by: Saul Wold Signed-off-by: Martin Jansa --- recipes-qt/meta/meta-toolchain-qt5.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes-qt/meta/meta-toolchain-qt5.bb b/recipes-qt/meta/meta-toolchain-qt5.bb index 89911765..2027b54e 100644 --- a/recipes-qt/meta/meta-toolchain-qt5.bb +++ b/recipes-qt/meta/meta-toolchain-qt5.bb @@ -1,7 +1,6 @@ SUMMARY = "Meta package for building an installable Qt5 toolchain and SDK" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" inherit populate_sdk populate_sdk_qt5 -- cgit v1.2.3 From 209e7e6dd8e23bc6501ada7d7b4caa99e449de6a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 19 Aug 2017 12:32:55 +0200 Subject: qtwebengine: disable SECURITY_STRINGFORMAT to fix the build * meta/conf/distro/include/security_flags.inc adds -Wformat and -Wformat-security, but openh264 adds -Wno-format after that causing build to fail Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebengine_git.bb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 84c46688..ab293a96 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -32,6 +32,14 @@ EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm \ GYP_CONFIG+=use_experimental_allocator_shim=false \ " +# 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" -- cgit v1.2.3 From 648f7b0a2eb202d4378ce50ae566b6ca450dd010 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 19 Aug 2017 12:45:34 +0200 Subject: qtbase, qtgraphicaleffect, qtmultimedia, qtscript, qtlocation, qtwayland: disable gold to work around binutils bug Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase_git.bb | 25 ++++++++++++++++++++++++- recipes-qt/qt5/qtgraphicaleffects_git.bb | 4 ++++ recipes-qt/qt5/qtlocation_git.bb | 4 ++++ recipes-qt/qt5/qtmultimedia_git.bb | 4 ++++ recipes-qt/qt5/qtscript_git.bb | 4 ++++ recipes-qt/qt5/qtwayland_git.bb | 4 ++++ 6 files changed, 44 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 8cd23a02..550968cd 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -41,6 +41,28 @@ SRC_URI += "\ # for syncqt RDEPENDS_${PN}-tools += "perl" +# workaround for gold bug: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=842304 +# https://sourceware.org/bugzilla/show_bug.cgi?id=21712 +# it's triggered only in combination of gold and security_flags.inc, +# because security_flags.inc now enable pie by default. +# Adding -no-pie or changing -fuse-ld=gold to -fuse-ld=bfd +# works around this issue, will use -fuse-ld=bfd as it's considered +# binutils bug. +# OE @ ~/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/build/tests/auto/corelib/kernel/qmetatype $ i586-oe-linux-g++ -m32 -march=i586 --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot -Wl,-O1 -fuse-ld=gold -Wl,--enable-new-dtags -o tst_qmetatype .obj/tst_qmetatype.o -L/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/build/lib -lQt5Test -lQt5Core -lpthread +# .obj/tst_qmetatype.o(.qtversion+0x0): error: unexpected reloc 3 against global symbol qt_version_tag without base register in object file when generating a position-independent output file +# collect2: error: ld returned 1 exit status +# +# with -no-pie: +# OE @ ~/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/build/tests/auto/corelib/kernel/qmetatype $ i586-oe-linux-g++ -no-pie -m32 -march=i586 --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot -Wl,-O1 -fuse-ld=gold -Wl,--enable-new-dtags -o tst_qmetatype .obj/tst_qmetatype.o -L/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/build/lib -lQt5Test -lQt5Core -lpthread +# +# with -fuse-ld=gold replaced with -fuse-ld=bfd: +# OE @ ~/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/build/tests/auto/corelib/kernel/qmetatype $ i586-oe-linux-g++ -m32 -march=i586 --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot -Wl,-O1 -fuse-ld=bfd -Wl,--enable-new-dtags -o tst_qmetatype .obj/tst_qmetatype.o -L/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/build/lib -lQt5Test -lQt5Core -lpthread +# +# http://errors.yoctoproject.org/Errors/Details/150329/ +QT_CONFIG_FLAGS_GOLD_x86 = "-no-use-gold-linker" +LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" + # separate some parts of PACKAGECONFIG which are often changed PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" @@ -129,8 +151,9 @@ PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy" PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput" PACKAGECONFIG[journald] = "-journald,-no-journald,systemd" +QT_CONFIG_FLAGS_GOLD = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-use-gold-linker', '-no-use-gold-linker', d)}" QT_CONFIG_FLAGS += " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-use-gold-linker', '-no-use-gold-linker', d)} \ + ${QT_CONFIG_FLAGS_GOLD} \ -shared \ -silent \ -no-pch \ diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index f4b43e75..eadd4bc3 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -20,3 +20,7 @@ DEPENDS += "qtdeclarative" RDEPENDS_${PN}-dev = "" SRCREV = "1583bb5569cfc50141d879107a46146d5ccccf28" + +# The same issue as in qtbase: +# http://errors.yoctoproject.org/Errors/Build/44912/ +LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index f25d57ef..ab96029e 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -21,3 +21,7 @@ PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" SRCREV = "41cc347040226d2c5c16b9df001d03f2724b87e5" + +# The same issue as in qtbase: +# http://errors.yoctoproject.org/Errors/Details/152640/ +LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 7d3c3cc0..aa79e3f0 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -34,3 +34,7 @@ SRC_URI += "\ " SRCREV = "544a8a4251ff9694780e563ddb6e4af1325e0115" + +# The same issue as in qtbase: +# http://errors.yoctoproject.org/Errors/Build/44914/ +LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 3f8b64a2..2875988e 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -26,3 +26,7 @@ ARM_INSTRUCTION_SET_armv5 = "arm" DEPENDS += "qtbase" SRCREV = "c35df2ec0ee05351912e768d298a7c627dbdd1ef" + +# The same issue as in qtbase: +# http://errors.yoctoproject.org/Errors/Build/44915/ +LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index bcddb32c..ffe22086 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -50,3 +50,7 @@ SRC_URI += " \ " BBCLASSEXTEND =+ "native nativesdk" + +# The same issue as in qtbase: +# http://errors.yoctoproject.org/Errors/Details/152641/ +LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -- cgit v1.2.3 From 969f1f80bf255498abbec6886d443670c20a79c8 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 9 Jun 2017 09:34:09 +0300 Subject: Upgrade to Qt 5.9.0 * adapt QtWebEngine recipe to use GN instead of GYP * add QtRemoteObjects and QtWebView as a new Qt modules * update available QtBase configure arguments * remove obsolete patches * patch all .pc files to remove build paths * include generated QML cache files in packages * the patch "configure paths for target qmake properly" could not be applied anymore and support must be done differently * QtWebEngine now requires gcc-multilib to be installed on the host system, because the host tools are built to the same bitness as the target (arm -> x86, aarch64 -> x86-64) * refresh the patches to match with b5.9* branches on: https://github.com/meta-qt5/qtbase https://github.com/meta-qt5/qtwebengine and 56-based branch on https://github.com/meta-qt5/qtwebengine-chromium Signed-off-by: Samuli Piippo Signed-off-by: Martin Jansa --- classes/qmake5_base.bbclass | 6 +- recipes-qt/qt5/nativesdk-qtbase_git.bb | 22 ++-- .../qt5/qt3d/0001-Allow-a-tools-only-build.patch | 15 ++- ...2-Fix-BlenderDNA-for-clang-cross-compiler.patch | 56 ++++----- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qt5-git.inc | 4 +- recipes-qt/qt5/qt5.inc | 10 +- recipes-qt/qt5/qtbase-native_git.bb | 24 ++-- .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 14 +-- ...make-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch | 86 ++++++++++++++ ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 36 ------ .../0003-Add-external-hostbindir-option.patch | 86 -------------- ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 36 ++++++ ...ump-path-length-from-256-to-512-character.patch | 34 ++++++ ...le-Fix-pkgconfig-and-libtool-replacements.patch | 106 ----------------- ...-unknown-features-instead-of-erroring-out.patch | 25 ++++ ...ump-path-length-from-256-to-512-character.patch | 33 ------ ...-unknown-features-instead-of-erroring-out.patch | 25 ---- ...-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch | 63 ++++++++++ .../0007-Delete-qlonglong-and-qulonglong.patch | 25 ++++ ...-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch | 63 ---------- .../0008-Delete-qlonglong-and-qulonglong.patch | 25 ---- ...08-Replace-pthread_yield-with-sched_yield.patch | 60 ++++++++++ recipes-qt/qt5/qtbase/0009-Always-build-uic.patch | 28 +++++ ...-Disable-Wformat-security-with-clang-as-w.patch | 28 ----- ...10-Replace-pthread_yield-with-sched_yield.patch | 60 ---------- recipes-qt/qt5/qtbase/0011-Always-build-uic.patch | 28 ----- ...configure-paths-for-target-qmake-properly.patch | 75 ------------ recipes-qt/qt5/qtbase_git.bb | 26 ++-- recipes-qt/qt5/qtcanvas3d_git.bb | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 6 +- recipes-qt/qt5/qtdatavis3d_git.bb | 2 +- .../qtdeclarative/0002-Fix-memory-leak-in-V4.patch | 44 ------- ...leak-in-QQuickWindowPrivate-deliverTouchA.patch | 84 ------------- recipes-qt/qt5/qtdeclarative_git.bb | 8 +- recipes-qt/qt5/qtenginio_git.bb | 5 - recipes-qt/qt5/qtgamepad_git.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 4 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- .../0001-Make-mapbox-gl-build-configurable.patch | 27 +++++ recipes-qt/qt5/qtlocation_git.bb | 15 ++- recipes-qt/qt5/qtmultimedia_git.bb | 8 +- recipes-qt/qt5/qtnetworkauth_git.bb | 3 +- recipes-qt/qt5/qtquick1_git.bb | 2 +- ...rols2-fix-compilation-of-examples-textedi.patch | 28 ----- recipes-qt/qt5/qtquickcontrols2_git.bb | 10 +- recipes-qt/qt5/qtquickcontrols_git.bb | 7 +- .../0001-Allow-a-tools-only-build.patch | 37 ++++++ recipes-qt/qt5/qtremoteobjects_git.bb | 27 +++++ recipes-qt/qt5/qtscript_git.bb | 4 +- recipes-qt/qt5/qtscxml_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- recipes-qt/qt5/qtsvg_git.bb | 2 +- ...t-help-fix-linking-of-dependent-libraries.patch | 29 ----- recipes-qt/qt5/qttools_git.bb | 8 +- recipes-qt/qt5/qttranslations_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 6 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- ...ange-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch | 63 ++++++++++ ...se.gypi-include-atomicops_internals_x86_g.patch | 24 ---- ...rf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch | 27 ----- ...s.prf-allow-build-for-linux-oe-g-platform.patch | 30 +++++ ...quickwebengineview_p_p.h-add-include-QCol.patch | 23 ++++ ...ange-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch | 63 ---------- ...romium-Force-host-toolchain-configuration.patch | 40 +++++++ ...rf-Make-sure-we-only-use-the-file-name-to.patch | 26 ---- ...-dependency-to-QCoreApplication-translate.patch | 23 ++++ ...sl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch | 33 ++++++ .../0003-chromium-v8-fix-build-with-gcc7.patch | 131 --------------------- ...s.prf-allow-build-for-linux-oe-g-platform.patch | 30 ----- .../0004-Force-host-toolchain-configuration.patch | 44 +++++++ ...quickwebengineview_p_p.h-add-include-QCol.patch | 23 ---- .../0004-chromium-WebKit-fix-build-with-gcc7.patch | 41 ------- ...sl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | 45 +++++++ ...-dependency-to-QCoreApplication-translate.patch | 23 ---- ...-chromium-musl-include-fcntl.h-for-loff_t.patch | 22 ++++ ...sl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch | 33 ------ ...sl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | 45 ------- ...sl-use-off64_t-instead-of-the-internal-__.patch | 62 ++++++++++ ...-chromium-musl-include-fcntl.h-for-loff_t.patch | 22 ---- ...ium-musl-linux-glibc-make-the-distinction.patch | 23 ++++ ...sl-allocator-Do-not-include-glibc_weak_sy.patch | 24 ++++ ...sl-use-off64_t-instead-of-the-internal-__.patch | 62 ---------- ...sl-Use-correct-member-name-__si_fields-fr.patch | 24 ++++ ...ium-musl-linux-glibc-make-the-distinction.patch | 23 ---- ...hromium-musl-Match-syscalls-to-match-musl.patch | 44 +++++++ ...sl-allocator-Do-not-include-glibc_weak_sy.patch | 24 ---- ...sl-Define-res_ninit-and-res_nclose-for-no.patch | 79 +++++++++++++ ...sl-Use-correct-member-name-__si_fields-fr.patch | 24 ---- ...hromium-musl-Do-not-define-__sbrk-on-musl.patch | 26 ++++ ...hromium-musl-Match-syscalls-to-match-musl.patch | 44 ------- ...um-musl-Adjust-default-pthread-stack-size.patch | 47 ++++++++ ...sl-Define-res_ninit-and-res_nclose-for-no.patch | 79 ------------- ...hromium-musl-Do-not-define-__sbrk-on-musl.patch | 26 ---- ...sl-include-asm-generic-ioctl.h-for-TCGETS.patch | 22 ++++ ...um-musl-Adjust-default-pthread-stack-size.patch | 47 -------- ...sl-tcmalloc-Use-off64_t-insread-of-__off6.patch | 23 ++++ ...sl-include-asm-generic-ioctl.h-for-TCGETS.patch | 22 ---- ...romium-musl-link-with-libexecinfo-on-musl.patch | 22 ---- ...sl-tcmalloc-Use-off64_t-insread-of-__off6.patch | 23 ---- recipes-qt/qt5/qtwebengine_git.bb | 88 +++++++------- recipes-qt/qt5/qtwebkit-examples_git.bb | 2 +- .../qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch | 76 ------------ recipes-qt/qt5/qtwebkit_git.bb | 3 +- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- .../0001-Add-missing-include-for-qWarning.patch | 22 ++++ recipes-qt/qt5/qtwebview_git.bb | 24 ++++ recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 113 files changed, 1379 insertions(+), 1912 deletions(-) create mode 100644 recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch delete mode 100644 recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch delete mode 100644 recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch create mode 100644 recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch create mode 100644 recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch delete mode 100644 recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch create mode 100644 recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch delete mode 100644 recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch delete mode 100644 recipes-qt/qt5/qtbase/0006-Disable-all-unknown-features-instead-of-erroring-out.patch create mode 100644 recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch create mode 100644 recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch delete mode 100644 recipes-qt/qt5/qtbase/0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch delete mode 100644 recipes-qt/qt5/qtbase/0008-Delete-qlonglong-and-qulonglong.patch create mode 100644 recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch create mode 100644 recipes-qt/qt5/qtbase/0009-Always-build-uic.patch delete mode 100644 recipes-qt/qt5/qtbase/0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch delete mode 100644 recipes-qt/qt5/qtbase/0010-Replace-pthread_yield-with-sched_yield.patch delete mode 100644 recipes-qt/qt5/qtbase/0011-Always-build-uic.patch delete mode 100644 recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch delete mode 100644 recipes-qt/qt5/qtdeclarative/0002-Fix-memory-leak-in-V4.patch delete mode 100644 recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch create mode 100644 recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch delete mode 100644 recipes-qt/qt5/qtquickcontrols2/0001-qtquickcontrols2-fix-compilation-of-examples-textedi.patch create mode 100644 recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch create mode 100644 recipes-qt/qt5/qtremoteobjects_git.bb delete mode 100644 recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch create mode 100644 recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch create mode 100644 recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch create mode 100644 recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch create mode 100644 recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch create mode 100644 recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch create mode 100644 recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0003-chromium-v8-fix-build-with-gcc7.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch create mode 100644 recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch create mode 100644 recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch create mode 100644 recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch create mode 100644 recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0007-chromium-musl-include-fcntl.h-for-loff_t.patch create mode 100644 recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch create mode 100644 recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch create mode 100644 recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0009-chromium-musl-linux-glibc-make-the-distinction.patch create mode 100644 recipes-qt/qt5/qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch create mode 100644 recipes-qt/qt5/qtwebengine/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch create mode 100644 recipes-qt/qt5/qtwebengine/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0012-chromium-musl-Match-syscalls-to-match-musl.patch create mode 100644 recipes-qt/qt5/qtwebengine/0013-chromium-musl-Adjust-default-pthread-stack-size.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0013-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch create mode 100644 recipes-qt/qt5/qtwebengine/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0015-chromium-musl-Adjust-default-pthread-stack-size.patch create mode 100644 recipes-qt/qt5/qtwebengine/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0016-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0017-chromium-musl-link-with-libexecinfo-on-musl.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0018-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch delete mode 100644 recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch create mode 100644 recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch create mode 100644 recipes-qt/qt5/qtwebview_git.bb diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index df8f6246..a556f4f9 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -214,7 +214,9 @@ qmake5_base_do_install() { qmake5_base_fix_install ${STAGING_DIR_HOST} qmake5_base_fix_install ${STAGING_DIR_NATIVE} - if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>/dev/null; then - sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/Qt5*.pc + if ls ${D}${libdir}/pkgconfig/*.pc >/dev/null 2>/dev/null; then + sed -i ${D}${libdir}/pkgconfig/*.pc \ + -e "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" \ + -e "s@${STAGING_DIR_TARGET}@@g" fi } diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 6f334c12..e1b30c9a 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -27,20 +27,18 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ - file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ - file://0003-Add-external-hostbindir-option.patch \ - file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ - file://0005-configure-bump-path-length-from-256-to-512-character.patch \ - file://0006-Disable-all-unknown-features-instead-of-erroring-out.patch \ - file://0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ - file://0008-Delete-qlonglong-and-qulonglong.patch \ - file://0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch \ - file://0010-Replace-pthread_yield-with-sched_yield.patch \ + file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ + file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ + file://0004-configure-bump-path-length-from-256-to-512-character.patch \ + file://0005-Disable-all-unknown-features-instead-of-erroring-out.patch \ + file://0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ + file://0007-Delete-qlonglong-and-qulonglong.patch \ + file://0008-Replace-pthread_yield-with-sched_yield.patch \ " # common for qtbase-native and nativesdk-qtbase SRC_URI += " \ - file://0011-Always-build-uic.patch \ + file://0009-Always-build-uic.patch \ " # CMake's toolchain configuration of nativesdk-qtbase @@ -118,6 +116,7 @@ do_configure() { -no-opengl \ -no-openssl \ -no-xcb \ + -no-feature-bearermanagement \ -no-icu \ -verbose \ -release \ @@ -137,7 +136,6 @@ do_configure() { -testsdir ${OE_QMAKE_PATH_TESTS} \ -hostbindir ${OE_QMAKE_PATH_HOST_BINS} \ -hostdatadir ${OE_QMAKE_PATH_HOST_DATA} \ - -host-option CROSS_COMPILE=${HOST_PREFIX} \ -external-hostbindir ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \ -no-glib \ -no-iconv \ @@ -195,4 +193,4 @@ fakeroot do_generate_qt_environment_file() { addtask generate_qt_environment_file after do_install before do_package -SRCREV = "49dc9aa409d727824f26b246054a22b5a7dd5980" +SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b" diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch index ba4e2d01..8cf1f501 100644 --- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch @@ -1,4 +1,4 @@ -From 22ccc94b5501509b516fce17195a598d04dcc2f3 Mon Sep 17 00:00:00 2001 +From dd0f3fefeeefb31ec8cf2417bd3f447f7b9c25c6 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 10 Feb 2016 09:02:09 +0200 Subject: [PATCH] Allow a tools-only build @@ -6,7 +6,8 @@ Subject: [PATCH] Allow a tools-only build --- qt3d.pro | 7 ++++++- src/3rdparty/assimp/assimp_dependency.pri | 2 +- - 2 files changed, 7 insertions(+), 2 deletions(-) + tools/tools.pro | 2 +- + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/qt3d.pro b/qt3d.pro index 2cc347a1c..81cdeefb0 100644 @@ -38,3 +39,13 @@ index 8ba2d9a41..e973d93dd 100644 QMAKE_USE_PRIVATE += assimp } else { include(assimp.pri) +diff --git a/tools/tools.pro b/tools/tools.pro +index 8e973aecb..ad51db585 100644 +--- a/tools/tools.pro ++++ b/tools/tools.pro +@@ -1,4 +1,4 @@ + TEMPLATE = subdirs + QT_FOR_CONFIG += 3dcore-private +-!android:qtConfig(assimp):qtConfig(commandlineparser): \ ++!android:tools-only|qtConfig(assimp):qtConfig(commandlineparser): \ + SUBDIRS += qgltf diff --git a/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch b/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch index 95b5479e..eeb402f6 100644 --- a/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch +++ b/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch @@ -1,4 +1,4 @@ -From bc5ef10fc6f71cb340ad339bc43f6ce48adb1f59 Mon Sep 17 00:00:00 2001 +From ec40913bc563e3cb0abc1965ce457d3a2fe663b3 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Mon, 7 Nov 2016 17:19:49 +0100 Subject: [PATCH] Fix BlenderDNA for clang cross compiler. @@ -9,36 +9,36 @@ Signed-off-by: Martin Jansa 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/3rdparty/assimp/code/BlenderDNA.cpp b/src/3rdparty/assimp/code/BlenderDNA.cpp -index b380fbe8d..3cc27dff1 100644 +index 18ec9f2b4..5b0b2090f 100644 --- a/src/3rdparty/assimp/code/BlenderDNA.cpp +++ b/src/3rdparty/assimp/code/BlenderDNA.cpp -@@ -56,10 +56,10 @@ using namespace Assimp::Formatter; - #define for_each BOOST_FOREACH +@@ -55,10 +55,10 @@ using namespace Assimp::Formatter; + bool match4(StreamReaderAny& stream, const char* string) { - char tmp[] = { -- (stream).GetI1(), -- (stream).GetI1(), -- (stream).GetI1(), -- (stream).GetI1() -+ (const char)(stream).GetI1(), -+ (const char)(stream).GetI1(), -+ (const char)(stream).GetI1(), -+ (const char)(stream).GetI1() - }; - return (tmp[0]==string[0] && tmp[1]==string[1] && tmp[2]==string[2] && tmp[3]==string[3]); + char tmp[] = { +- (stream).GetI1(), +- (stream).GetI1(), +- (stream).GetI1(), +- (stream).GetI1() ++ (const char)(stream).GetI1(), ++ (const char)(stream).GetI1(), ++ (const char)(stream).GetI1(), ++ (const char)(stream).GetI1() + }; + return (tmp[0]==string[0] && tmp[1]==string[1] && tmp[2]==string[2] && tmp[3]==string[3]); } -@@ -344,10 +344,10 @@ void SectionParser :: Next() - stream.SetCurrentPos(current.start + current.size); +@@ -345,10 +345,10 @@ void SectionParser :: Next() + stream.SetCurrentPos(current.start + current.size); - const char tmp[] = { -- stream.GetI1(), -- stream.GetI1(), -- stream.GetI1(), -- stream.GetI1() -+ (const char)stream.GetI1(), -+ (const char)stream.GetI1(), -+ (const char)stream.GetI1(), -+ (const char)stream.GetI1() - }; - current.id = std::string(tmp,tmp[3]?4:tmp[2]?3:tmp[1]?2:1); + const char tmp[] = { +- stream.GetI1(), +- stream.GetI1(), +- stream.GetI1(), +- stream.GetI1() ++ (const char)stream.GetI1(), ++ (const char)stream.GetI1(), ++ (const char)stream.GetI1(), ++ (const char)stream.GetI1() + }; + current.id = std::string(tmp,tmp[3]?4:tmp[2]?3:tmp[1]?2:1); diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 2891470d..41b5fbc3 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -35,6 +35,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "440589a0747d9668fec3ff924b390d75be5c6733" +SRCREV = "f39d0a0c32cc489849a0cd5c2880f6e824223485" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 1cb115f3..927912fd 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Martin Jansa QT_MODULE ?= "${BPN}" -QT_MODULE_BRANCH ?= "5.8" +QT_MODULE_BRANCH ?= "5.9" QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" # each module needs to define valid SRCREV @@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" S = "${WORKDIR}/git" -PV = "5.8.0+git${SRCPV}" +PV = "5.9.0+git${SRCPV}" diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 90d7896f..4b5fe8a8 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -97,34 +97,42 @@ FILES_${PN}-qmldesigner += " \ ${OE_QMAKE_PATH_QML}/*/*/*/designer \ " -# qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js} +# qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*.qmlc,*.js,*.jsc} FILES_${PN}-qmlplugins = " \ ${OE_QMAKE_PATH_QML}/*.qmltypes \ ${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \ ${OE_QMAKE_PATH_QML}/*/qmldir \ ${OE_QMAKE_PATH_QML}/*/*.qmltypes \ ${OE_QMAKE_PATH_QML}/*/*.qml \ + ${OE_QMAKE_PATH_QML}/*/*.qmlc \ ${OE_QMAKE_PATH_QML}/*/*.js \ + ${OE_QMAKE_PATH_QML}/*/*.jsc \ ${OE_QMAKE_PATH_QML}/*/*.png \ ${OE_QMAKE_PATH_QML}/*/*/*${SOLIBSDEV} \ ${OE_QMAKE_PATH_QML}/*/*/qmldir \ ${OE_QMAKE_PATH_QML}/*/*/*.qmltypes \ ${OE_QMAKE_PATH_QML}/*/*/*.qml \ + ${OE_QMAKE_PATH_QML}/*/*/*.qmlc \ ${OE_QMAKE_PATH_QML}/*/*/*.js \ + ${OE_QMAKE_PATH_QML}/*/*/*.jsc \ ${OE_QMAKE_PATH_QML}/*/*/*.png \ ${OE_QMAKE_PATH_QML}/*/*/*/*${SOLIBSDEV} \ ${OE_QMAKE_PATH_QML}/*/*/*/qmldir \ ${OE_QMAKE_PATH_QML}/*/*/*/images \ ${OE_QMAKE_PATH_QML}/*/*/*/*.qmltypes \ ${OE_QMAKE_PATH_QML}/*/*/*/*.qml \ + ${OE_QMAKE_PATH_QML}/*/*/*/*.qmlc \ ${OE_QMAKE_PATH_QML}/*/*/*/*.js \ + ${OE_QMAKE_PATH_QML}/*/*/*/*.jsc \ ${OE_QMAKE_PATH_QML}/*/*/*/*.png \ ${OE_QMAKE_PATH_QML}/*/*/*/*.metainfo \ ${OE_QMAKE_PATH_QML}/*/*/*/*/*${SOLIBSDEV} \ ${OE_QMAKE_PATH_QML}/*/*/*/*/qmldir \ ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qmltypes \ ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qml \ + ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qmlc \ ${OE_QMAKE_PATH_QML}/*/*/*/*/*.js \ + ${OE_QMAKE_PATH_QML}/*/*/*/*/*.jsc \ ${OE_QMAKE_PATH_QML}/*/*/*/*/*/*.png \ ${OE_QMAKE_PATH_IMPORTS}/*.qmltypes \ ${OE_QMAKE_PATH_IMPORTS}/*/*${SOLIBSDEV} \ diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index c8bf0083..84cb2b00 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -22,20 +22,18 @@ require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ - file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ - file://0003-Add-external-hostbindir-option.patch \ - file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ - file://0005-configure-bump-path-length-from-256-to-512-character.patch \ - file://0006-Disable-all-unknown-features-instead-of-erroring-out.patch \ - file://0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ - file://0008-Delete-qlonglong-and-qulonglong.patch \ - file://0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch \ - file://0010-Replace-pthread_yield-with-sched_yield.patch \ + file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ + file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ + file://0004-configure-bump-path-length-from-256-to-512-character.patch \ + file://0005-Disable-all-unknown-features-instead-of-erroring-out.patch \ + file://0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ + file://0007-Delete-qlonglong-and-qulonglong.patch \ + file://0008-Replace-pthread_yield-with-sched_yield.patch \ " # common for qtbase-native and nativesdk-qtbase SRC_URI += " \ - file://0011-Always-build-uic.patch \ + file://0009-Always-build-uic.patch \ " CLEANBROKEN = "1" @@ -109,9 +107,7 @@ do_install() { done fi - # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt) - # e.g. qt3d, qtwayland - ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt + install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} } -SRCREV = "49dc9aa409d727824f26b246054a22b5a7dd5980" +SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b" diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 3f373c76..28c26603 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From 805b338154ed0262a7b8bf5c582ff5b193a55492 Mon Sep 17 00:00:00 2001 +From e13425e6f1e784b0b016cf68a54dfbae32995b86 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH] Add linux-oe-g++ platform @@ -30,10 +30,10 @@ Signed-off-by: Martin Jansa create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index bc18e614d2..579a96d787 100755 +index 73679de621..5a0eebce50 100755 --- a/configure +++ b/configure -@@ -1614,7 +1614,7 @@ fi +@@ -709,7 +709,7 @@ fi # is where the resulting variable is written to setBootstrapVariable() { @@ -43,10 +43,10 @@ index bc18e614d2..579a96d787 100755 # build qmake diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index 4ca7c6ba07..5b5ac13f1d 100644 +index 934a18a924..0f5b1b6333 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf -@@ -44,14 +44,14 @@ defineTest(qtCompileTest) { +@@ -46,14 +46,14 @@ defineTest(qtCompileTest) { } # Clean up after previous run @@ -64,10 +64,10 @@ index 4ca7c6ba07..5b5ac13f1d 100644 msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 999cd18154..2ac91ba519 100644 +index c00fdb73f8..0cf4de7b49 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf -@@ -67,7 +67,7 @@ defineTest(qtHaveModule) { +@@ -69,7 +69,7 @@ defineTest(qtHaveModule) { defineTest(qtPrepareTool) { cmd = $$eval(QT_TOOL.$${2}.binary) isEmpty(cmd) { diff --git a/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch new file mode 100644 index 00000000..5ee6e049 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch @@ -0,0 +1,86 @@ +From 5ed152f8caa7ef00fb20d19a06ab5f7887e9aba6 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 6 Apr 2013 13:15:07 +0200 +Subject: [PATCH] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS + +... to determine path to host binaries + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Martin Jansa +Signed-off-by: Simon Busch +Signed-off-by: Jonathan Liu + +Change-Id: Iacaa1c5531cd6dcc094891610c351673db55d7b2 +--- + src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- + src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- + src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in +index 545b9a3d1e..c991a9ba41 100644 +--- a/src/corelib/Qt5CoreConfigExtras.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtras.cmake.in +@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake$$CMAKE_BIN_SUFFIX\") + !!ENDIF + _qt5_Core_check_file_exists(${imported_location}) + +@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::moc) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc$$CMAKE_BIN_SUFFIX\") + !!ENDIF + _qt5_Core_check_file_exists(${imported_location}) + +@@ -37,7 +37,7 @@ if (NOT TARGET Qt5::rcc) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/rcc$$CMAKE_BIN_SUFFIX\") + !!ENDIF + _qt5_Core_check_file_exists(${imported_location}) + +diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in +index 1d947159e2..301af8f1b2 100644 +--- a/src/dbus/Qt5DBusConfigExtras.cmake.in ++++ b/src/dbus/Qt5DBusConfigExtras.cmake.in +@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") + !!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") + !!ENDIF + _qt5_DBus_check_file_exists(${imported_location}) + +@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") + !!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") + !!ENDIF + _qt5_DBus_check_file_exists(${imported_location}) + +diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +index 99d87e2e46..5621dc0fae 100644 +--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in ++++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic$$CMAKE_BIN_SUFFIX\") + !!ENDIF + _qt5_Widgets_check_file_exists(${imported_location}) + diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch deleted file mode 100644 index f9859620..00000000 --- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 18e2f4368f22bf5ac8b2a36c30a7ad39ed97bf49 Mon Sep 17 00:00:00 2001 -From: Holger Freyther -Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the - environment - -Allow to set a qt.conf from the outside using the environment. This allows -to inject new prefixes and other paths into qmake. This is needed when using -the same qmake binary to build qt/x11 and qt/embedded - -Upstream-Status: Inappropriate [embedded specific] - again very OE specific to read everything from environment (reusing the same - qmake from sstate and replacing all configured paths in it with qt.conf from - environment). - -Signed-off-by: Martin Jansa ---- - src/corelib/global/qlibraryinfo.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 27fe10a79e..29ffcda203 100644 ---- a/src/corelib/global/qlibraryinfo.cpp -+++ b/src/corelib/global/qlibraryinfo.cpp -@@ -164,7 +164,10 @@ void QLibrarySettings::load() - QSettings *QLibraryInfoPrivate::findConfiguration() - { - #ifdef QT_BUILD_QMAKE -- QString qtconfig = qmake_libraryInfoFile(); -+ QByteArray config = getenv("OE_QMAKE_QTCONF_PATH"); -+ QString qtconfig = QFile::decodeName(config); -+ if(!QFile::exists(qtconfig)) -+ qtconfig = qmake_libraryInfoFile(); - if (QFile::exists(qtconfig)) - return new QSettings(qtconfig, QSettings::IniFormat); - #else diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch deleted file mode 100644 index 9f1a2b2c..00000000 --- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 67977e16e5d0aecd931d8e4355c12cc907df592f Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH] Add -external-hostbindir option - -* cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to host binaries - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Martin Jansa -Signed-off-by: Simon Busch -Signed-off-by: Jonathan Liu - -Change-Id: Iacaa1c5531cd6dcc094891610c351673db55d7b2 ---- - src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- - src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- - src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index 545b9a3d1e..c991a9ba41 100644 ---- a/src/corelib/Qt5CoreConfigExtras.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in -@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake$$CMAKE_BIN_SUFFIX\") - !!ENDIF - _qt5_Core_check_file_exists(${imported_location}) - -@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::moc) - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc$$CMAKE_BIN_SUFFIX\") - !!ENDIF - _qt5_Core_check_file_exists(${imported_location}) - -@@ -37,7 +37,7 @@ if (NOT TARGET Qt5::rcc) - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/rcc$$CMAKE_BIN_SUFFIX\") - !!ENDIF - _qt5_Core_check_file_exists(${imported_location}) - -diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in -index 1d947159e2..301af8f1b2 100644 ---- a/src/dbus/Qt5DBusConfigExtras.cmake.in -+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in -@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") - !!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") - !!ENDIF - _qt5_DBus_check_file_exists(${imported_location}) - -@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp) - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") - !!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") - !!ENDIF - _qt5_DBus_check_file_exists(${imported_location}) - -diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -index 99d87e2e46..5621dc0fae 100644 ---- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in -+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic) - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") - !!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic$$CMAKE_BIN_SUFFIX\") - !!ENDIF - _qt5_Widgets_check_file_exists(${imported_location}) - diff --git a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch new file mode 100644 index 00000000..7ff1ff71 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -0,0 +1,36 @@ +From 77fab782e8a199f9ede83bc97cbce21a544961c2 Mon Sep 17 00:00:00 2001 +From: Holger Freyther +Date: Wed, 26 Sep 2012 17:22:30 +0200 +Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the + environment + +Allow to set a qt.conf from the outside using the environment. This allows +to inject new prefixes and other paths into qmake. This is needed when using +the same qmake binary to build qt/x11 and qt/embedded + +Upstream-Status: Inappropriate [embedded specific] + again very OE specific to read everything from environment (reusing the same + qmake from sstate and replacing all configured paths in it with qt.conf from + environment). + +Signed-off-by: Martin Jansa +--- + src/corelib/global/qlibraryinfo.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp +index b4ba0b5b2e..11d4c00f39 100644 +--- a/src/corelib/global/qlibraryinfo.cpp ++++ b/src/corelib/global/qlibraryinfo.cpp +@@ -172,7 +172,10 @@ void QLibrarySettings::load() + QSettings *QLibraryInfoPrivate::findConfiguration() + { + #ifdef QT_BUILD_QMAKE +- QString qtconfig = qmake_libraryInfoFile(); ++ QByteArray config = getenv("OE_QMAKE_QTCONF_PATH"); ++ QString qtconfig = QFile::decodeName(config); ++ if(!QFile::exists(qtconfig)) ++ qtconfig = qmake_libraryInfoFile(); + if (QFile::exists(qtconfig)) + return new QSettings(qtconfig, QSettings::IniFormat); + #else diff --git a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch new file mode 100644 index 00000000..5ab6a7b1 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch @@ -0,0 +1,34 @@ +From 4848804312f0045b53c85db113ac9e42fe1b7360 Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko +Date: Tue, 25 Aug 2015 10:05:15 -0400 +Subject: [PATCH] configure: bump path length from 256 to 512 characters + +Increase the path length that gets hardcoded into generated config.cpp file +from 256 to 512 characters, as nativesdk path can be quite long. + +Also update length of EXT_PREFIX and HOST_PREFIX now. + +Change-Id: If98dd57160efe9c98c36148cdf872f50b3d38118 +Signed-off-by: Denys Dmytriyenko +--- + configure.pri | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.pri b/configure.pri +index be1b166080..52f03bf3f2 100644 +--- a/configure.pri ++++ b/configure.pri +@@ -796,10 +796,10 @@ defineTest(qtConfOutput_preparePaths) { + "static const char qt_configure_installation [12+11] = \"qt_instdate=2012-12-20\";" \ + "" \ + "/* Installation Info */" \ +- "static const char qt_configure_prefix_path_str [12+256] = \"qt_prfxpath=$$config.input.prefix\";" \ ++ "static const char qt_configure_prefix_path_str [12+512] = \"qt_prfxpath=$$config.input.prefix\";" \ + "$${LITERAL_HASH}ifdef QT_BUILD_QMAKE" \ +- "static const char qt_configure_ext_prefix_path_str [12+256] = \"qt_epfxpath=$$config.input.extprefix\";" \ +- "static const char qt_configure_host_prefix_path_str [12+256] = \"qt_hpfxpath=$$config.input.hostprefix\";" \ ++ "static const char qt_configure_ext_prefix_path_str [12+512] = \"qt_epfxpath=$$config.input.extprefix\";" \ ++ "static const char qt_configure_host_prefix_path_str [12+512] = \"qt_hpfxpath=$$config.input.hostprefix\";" \ + "$${LITERAL_HASH}endif" \ + "" \ + "static const short qt_configure_str_offsets[] = {" \ diff --git a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch deleted file mode 100644 index aa97b56f..00000000 --- a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +++ /dev/null @@ -1,106 +0,0 @@ -From fe9cfbde28c651d00b8f5fda7dc85a97af0c50a1 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH] qt_module: Fix pkgconfig and libtool replacements -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* in situation like this: - QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm - QT_INSTALL_LIBS:/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib - QT_INSTALL_LIBS/raw:/usr/lib - QT_INSTALL_LIBS/get:/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib - - I don't want the replacement like this: - sed - -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/include,/usr/include/qt5,g" - -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib,/usr/lib,g" - "../../lib/pkgconfig/Qt5Core.pc" - >"/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/image/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib/pkgconfig/Qt5Core.pc" - because that way I'll end with -L/usr/lib in .pc file which is - cross-compile unfriendly, keeping ${libdir}/${includedir} works better - in my case - -* qt_module: Fix paths in .prl files -* qmake does not prefix them with QT_SYSROOT when using them - so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE - variable, which is unsafe for cross-compilation -* writting QT_SYSROOT in .prl files is dangerous for sstate when - builds are in different directories, so we need - SSTATE_SCAN_FILES += "*.pri *.prl" - to make them relocateble - -* fix paths in packageconfig files - This reverts parts of: - - enable path replacement in installed prl files on all platforms - - Task-number: QTBUG-33794 - Change-Id: Id0d38715673b8a1c0c034e9c15783eb255c4315b - Reviewed-by: Joerg Bornemann - -* to debug this, rebuild qtbase and read build/src/corelib/Makefile -* this is example of broken install_target rule (added line feeds): - -$(SED) -e s,/OE/5.3.1-r0/build/lib,/usr/lib,g - -e 's,/OE/5.3.1-r0/build/include,$$\{includedir},g' - -e 's,/OE/5.3.1-r0/build/lib,$$\{libdir},g' - "../../lib/pkgconfig/Qt5Core.pc" - >"$(INSTALL_ROOT)/usr/lib/pkgconfig/Qt5Core.pc" - change .prf files, create copy of WORKDIR, re-excecute only - do_configure task and compare generated Makefile, repeat until - replace in generated Makefile works ok, then refresh patch and - try complete rebuild for qtbase -* if everything is ok, then try: - image $ grep -R "\-L/usr" . - image $ grep -R "\-I/usr" . - and it should return only few cases of - qmake.conf:QMAKE_LFLAGS_THREAD = -L/usr/lib/threads - for aix* platformas - -Change-Id: Ie1c94b15f2a4e736b65b4d0924d99eb2a7d92a6c -Signed-off-by: Martin Jansa -Signed-off-by: Andreas Müller -Signed-off-by: Jonathan Liu ---- - mkspecs/features/qt.prf | 13 +++++++++++++ - mkspecs/features/qt_common.prf | 2 +- - 2 files changed, 14 insertions(+), 1 deletion(-) - -diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index 98f794c485..bd8b7b52e4 100644 ---- a/mkspecs/features/qt.prf -+++ b/mkspecs/features/qt.prf -@@ -315,6 +315,19 @@ contains(TEMPLATE, .*app) { - QTPLUGIN = $$manualplugs $$autoplugs - } - -+contains(TEMPLATE, .*lib) { -+ pkgconfig_prefix_replace.match = "prefix=$$[QT_SYSROOT]" -+ pkgconfig_prefix_replace.replace = "prefix=" -+ pkgconfig_prefix_replace.CONFIG = path -+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_prefix_replace -+ -+ # drop -L/usr/lib in .prl files -+ prl_replace.match = "-L\$${libdir}" -+ prl_replace.replace = "" -+ prl_replace.CONFIG = path -+ QMAKE_PRL_INSTALL_REPLACE += prl_replace -+} -+ - QT_PLUGIN_VERIFY = DEPLOYMENT_PLUGIN - qtConfig(static) { - QT_PLUGIN_VERIFY += QTPLUGIN -diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index d30983f62b..6da07e032c 100644 ---- a/mkspecs/features/qt_common.prf -+++ b/mkspecs/features/qt_common.prf -@@ -37,7 +37,7 @@ contains(TEMPLATE, .*lib) { - lib_replace.replace = - } else { - lib_replace.match = $$rplbase/lib -- lib_replace.replace = $$qqt_libdir -+ lib_replace.replace = "\$$\\{libdir}" - } - lib_replace.CONFIG = path - QMAKE_PRL_INSTALL_REPLACE += lib_replace diff --git a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch new file mode 100644 index 00000000..8538901f --- /dev/null +++ b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch @@ -0,0 +1,25 @@ +From 6ecb404346525a92f4c8926aa285662f3f5010b3 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Mon, 24 Oct 2016 09:45:18 +0300 +Subject: [PATCH] Disable all unknown features instead of erroring out + +Task-number: QTBUG-56656 +Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447 +--- + mkspecs/features/qt_configure.prf | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf +index 966c43108c..32f0dd0041 100644 +--- a/mkspecs/features/qt_configure.prf ++++ b/mkspecs/features/qt_configure.prf +@@ -1180,7 +1180,8 @@ defineReplace(qtConfEvaluateSingleExpression) { + error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.") + return($$result) + } +- error("Unknown feature object $${feature} in expression '$${1}'.") ++ warning("Unknown feature object $${feature} in expression '$${1}'.") ++ result = false + } + !qtConfCheckFeature($$feature): \ + error("Expression '$$1' is accessing non-emitted feature $${feature}.") diff --git a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch deleted file mode 100644 index 0c0d2c73..00000000 --- a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch +++ /dev/null @@ -1,33 +0,0 @@ -From be9179d2cbb9009794940092d30dac7800708964 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko -Date: Tue, 25 Aug 2015 10:05:15 -0400 -Subject: [PATCH] configure: bump path length from 256 to 512 characters - -Increase the path length that gets hardcoded into generated config.cpp file -from 256 to 512 characters, as nativesdk path can be quite long. - -Also update length of EXT_PREFIX and HOST_PREFIX now. - -Signed-off-by: Denys Dmytriyenko ---- - configure | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure b/configure -index 579a96d787..5af98cd77e 100755 ---- a/configure -+++ b/configure -@@ -1551,10 +1551,10 @@ cat > "$outpath/src/corelib/global/qconfig.cpp.new" < -Date: Mon, 24 Oct 2016 09:45:18 +0300 -Subject: [PATCH] Disable all unknown features instead of erroring out - -Task-number: QTBUG-56656 -Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447 ---- - mkspecs/features/qt_configure.prf | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf -index eaaa161270..fa3addae11 100644 ---- a/mkspecs/features/qt_configure.prf -+++ b/mkspecs/features/qt_configure.prf -@@ -1035,7 +1035,8 @@ defineReplace(qtConfEvaluateSingleExpression) { - error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.") - return($$result) - } -- error("Unknown feature object $${feature} in expression '$${1}'.") -+ warning("Unknown feature object $${feature} in expression '$${1}'.") -+ result = false - } - !qtConfCheckFeature($$feature): \ - error("Expression '$$1' is accessing non-emitted feature $${feature}.") diff --git a/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch b/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch new file mode 100644 index 00000000..253815bd --- /dev/null +++ b/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch @@ -0,0 +1,63 @@ +From 3730ac03a1473a0e1fdfe1537b73818ab99961e9 Mon Sep 17 00:00:00 2001 +From: Pascal Bach +Date: Wed, 11 May 2016 15:20:41 +0200 +Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS + isn't set + +This prevents errors like: + +| The imported target "Qt5::Core" references the file +| +| "/qmake" +| +| but this file does not exist. Possible reasons include: + +Which happen if CMake is used without setting OE_QMAKE_PATH_EXTERNAL_HOST_BINS. +To achieve this a check for OE_QMAKE_PATH_EXTERNAL_HOST_BINS is added to each Qt5*Config.cmake +file. And in the case where the variable is not set we just return which is basically +equal to telling CMake that Qt5 wasn't found. + +Upstream-Status: Pending + The patch only makes sense in connection with other patches included here. + Specifically this are: + - 0003-Add-external-hostbindir-option.patch + - 0010-Add-external-hostbindir-option-for-native-sdk.patch + +Signed-off-by: Pascal Bach +--- + mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 5 +++++ + src/corelib/Qt5Config.cmake.in | 5 +++++ + 2 files changed, 10 insertions(+) + +diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +index 4f342d67d7..202b723882 100644 +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -9,6 +9,11 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) + endif() + !!ENDIF + ++if(NOT DEFINED OE_QMAKE_PATH_EXTERNAL_HOST_BINS) ++ message(WARNING "Skipping because OE_QMAKE_PATH_EXTERNAL_HOST_BINS is not defined") ++ return() ++endif() ++ + !!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) + !!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) + set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +diff --git a/src/corelib/Qt5Config.cmake.in b/src/corelib/Qt5Config.cmake.in +index 75b53485b7..ed31888c93 100644 +--- a/src/corelib/Qt5Config.cmake.in ++++ b/src/corelib/Qt5Config.cmake.in +@@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 2.8.9) + message(FATAL_ERROR \"Qt5 requires at least CMake version 2.8.9\") + endif() + ++if(NOT DEFINED OE_QMAKE_PATH_EXTERNAL_HOST_BINS) ++ message(WARNING "Skipping because OE_QMAKE_PATH_EXTERNAL_HOST_BINS is not defined") ++ return() ++endif() ++ + if (NOT Qt5_FIND_COMPONENTS) + set(Qt5_NOT_FOUND_MESSAGE \"The Qt5 package requires at least one component\") + set(Qt5_FOUND False) diff --git a/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch new file mode 100644 index 00000000..68e4b201 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch @@ -0,0 +1,25 @@ +From 2fa6b447302abbaf1fd710e94b92692a300baaaf Mon Sep 17 00:00:00 2001 +From: Huang Qiyu +Date: Wed, 7 Jun 2017 21:00:49 +0900 +Subject: [PATCH] Delete qlonglong and qulonglong + +Signed-off-by: Huang Qiyu +--- + tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro +index 09458bd9c3..59a120eb26 100644 +--- a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro ++++ b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro +@@ -5,10 +5,8 @@ SUBDIRS=\ + char32_t \ + int \ + long \ +- qlonglong \ + qptrdiff \ + quintptr \ +- qulonglong \ + schar \ + short \ + uchar \ diff --git a/recipes-qt/qt5/qtbase/0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch b/recipes-qt/qt5/qtbase/0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch deleted file mode 100644 index b70b0d35..00000000 --- a/recipes-qt/qt5/qtbase/0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 5316b420dc408d3a47daa3ba854a7883c911f6b9 Mon Sep 17 00:00:00 2001 -From: Pascal Bach -Date: Wed, 11 May 2016 15:20:41 +0200 -Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS - isn't set - -This prevents errors like: - -| The imported target "Qt5::Core" references the file -| -| "/qmake" -| -| but this file does not exist. Possible reasons include: - -Which happen if CMake is used without setting OE_QMAKE_PATH_EXTERNAL_HOST_BINS. -To achieve this a check for OE_QMAKE_PATH_EXTERNAL_HOST_BINS is added to each Qt5*Config.cmake -file. And in the case where the variable is not set we just return which is basically -equal to telling CMake that Qt5 wasn't found. - -Upstream-Status: Pending - The patch only makes sense in connection with other patches included here. - Specifically this are: - - 0003-Add-external-hostbindir-option.patch - - 0010-Add-external-hostbindir-option-for-native-sdk.patch - -Signed-off-by: Pascal Bach ---- - mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 5 +++++ - src/corelib/Qt5Config.cmake.in | 5 +++++ - 2 files changed, 10 insertions(+) - -diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index d2358cae4b..feb73c02a5 100644 ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -9,6 +9,11 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) - endif() - !!ENDIF - -+if(NOT DEFINED OE_QMAKE_PATH_EXTERNAL_HOST_BINS) -+ message(WARNING "Skipping because OE_QMAKE_PATH_EXTERNAL_HOST_BINS is not defined") -+ return() -+endif() -+ - !!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) - !!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") -diff --git a/src/corelib/Qt5Config.cmake.in b/src/corelib/Qt5Config.cmake.in -index 75b53485b7..ed31888c93 100644 ---- a/src/corelib/Qt5Config.cmake.in -+++ b/src/corelib/Qt5Config.cmake.in -@@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 2.8.9) - message(FATAL_ERROR \"Qt5 requires at least CMake version 2.8.9\") - endif() - -+if(NOT DEFINED OE_QMAKE_PATH_EXTERNAL_HOST_BINS) -+ message(WARNING "Skipping because OE_QMAKE_PATH_EXTERNAL_HOST_BINS is not defined") -+ return() -+endif() -+ - if (NOT Qt5_FIND_COMPONENTS) - set(Qt5_NOT_FOUND_MESSAGE \"The Qt5 package requires at least one component\") - set(Qt5_FOUND False) diff --git a/recipes-qt/qt5/qtbase/0008-Delete-qlonglong-and-qulonglong.patch b/recipes-qt/qt5/qtbase/0008-Delete-qlonglong-and-qulonglong.patch deleted file mode 100644 index c992586a..00000000 --- a/recipes-qt/qt5/qtbase/0008-Delete-qlonglong-and-qulonglong.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2755a80114433e75f08fbb0df0fee9f7526172aa Mon Sep 17 00:00:00 2001 -From: Huang Qiyu -Date: Wed, 7 Jun 2017 21:00:49 +0900 -Subject: [PATCH] Delete qlonglong and qulonglong - -Signed-off-by: Huang Qiyu ---- - tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro -index 09458bd9c3..59a120eb26 100644 ---- a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro -+++ b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro -@@ -5,10 +5,8 @@ SUBDIRS=\ - char32_t \ - int \ - long \ -- qlonglong \ - qptrdiff \ - quintptr \ -- qulonglong \ - schar \ - short \ - uchar \ diff --git a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch new file mode 100644 index 00000000..678de529 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch @@ -0,0 +1,60 @@ +From 41d7028d2239a98a76cc91939edb2cb728019d08 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 27 Jul 2017 08:02:51 -0700 +Subject: [PATCH] Replace pthread_yield with sched_yield + +On Linux pthead_yield is same as sched_yield implementation wise +and sched_yield is available on all libc +implementations on Linux + +Signed-off-by: Khem Raj +--- + tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 4 ++-- + tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 5 +++-- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +index b6106e8c9e..6d6ea0b739 100644 +--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp ++++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +@@ -34,7 +34,7 @@ + #include "tst_qvariant_common.h" + + #ifdef Q_OS_LINUX +-# include ++# include + #endif + + #include +@@ -197,7 +197,7 @@ protected: + const char *nm = name.constData(); + int tp = qRegisterMetaType(nm); + #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) +- pthread_yield(); ++ sched_yield(); + #endif + QMetaType info(tp); + if (!info.isValid()) { +diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +index 7340817ade..f34162a105 100644 +--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp ++++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +@@ -77,6 +77,7 @@ + #include + #include + #include ++#include + #endif + + #include "private/qhostinfo_p.h" +@@ -2131,8 +2132,8 @@ public slots: + + #if defined(Q_OS_MAC) + pthread_yield_np(); +-#elif defined Q_OS_LINUX && !defined Q_OS_ANDROID +- pthread_yield(); ++#elif defined Q_OS_LINUX ++ sched_yield(); + #endif + if (!sock->waitForConnected()) { + networkTimeout = true; diff --git a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch new file mode 100644 index 00000000..118a4f29 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch @@ -0,0 +1,28 @@ +From 294e4c718407e66631ce36c37258217c9adb3f83 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 16 Nov 2013 00:32:30 +0100 +Subject: [PATCH] Always build uic + +Even if we are not building gui or widgets. This tool is needed later +as a native tool when compiling the target. + +Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 +Signed-off-by: Mikko Levonmaa +Signed-off-by: Martin Jansa +--- + src/src.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/src.pro b/src/src.pro +index 43fc06f2e5..1e9d4dcc0d 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -203,7 +203,7 @@ qtConfig(gui) { + } + } + } +-SUBDIRS += src_plugins ++SUBDIRS += src_plugins src_tools_uic + + nacl: SUBDIRS -= src_network src_testlib + diff --git a/recipes-qt/qt5/qtbase/0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch b/recipes-qt/qt5/qtbase/0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch deleted file mode 100644 index 609cd846..00000000 --- a/recipes-qt/qt5/qtbase/0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7bab0171601bc769403be62d145164137f1b7b66 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 25 Jul 2017 19:40:52 -0700 -Subject: [PATCH] tst_qstring: Disable Wformat-security with clang as well - -Currently, its only disabled for gcc, but we need to disable -it with clang as well in order to compile it successfully with -clang - -Signed-off-by: Khem Raj ---- - tests/auto/corelib/tools/qstring/tst_qstring.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/tests/auto/corelib/tools/qstring/tst_qstring.cpp b/tests/auto/corelib/tools/qstring/tst_qstring.cpp -index a0a872710c..20a9a9f9db 100644 ---- a/tests/auto/corelib/tools/qstring/tst_qstring.cpp -+++ b/tests/auto/corelib/tools/qstring/tst_qstring.cpp -@@ -1066,6 +1066,9 @@ void tst_QString::acc_01() - - QT_WARNING_PUSH - QT_WARNING_DISABLE_GCC("-Wformat-security") -+#ifdef __clang__ -+QT_WARNING_DISABLE_CLANG("-Wformat-security") -+#endif - - void tst_QString::isNull() - { diff --git a/recipes-qt/qt5/qtbase/0010-Replace-pthread_yield-with-sched_yield.patch b/recipes-qt/qt5/qtbase/0010-Replace-pthread_yield-with-sched_yield.patch deleted file mode 100644 index 5c625e08..00000000 --- a/recipes-qt/qt5/qtbase/0010-Replace-pthread_yield-with-sched_yield.patch +++ /dev/null @@ -1,60 +0,0 @@ -From bbe822066913c0908b6366009517c19e828e1458 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 27 Jul 2017 08:02:51 -0700 -Subject: [PATCH] Replace pthread_yield with sched_yield - -On Linux pthead_yield is same as sched_yield implementation wise -and sched_yield is available on all libc -implementations on Linux - -Signed-off-by: Khem Raj ---- - tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 4 ++-- - tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 5 +++-- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp -index 7d9f56ef38..bc115ef61d 100644 ---- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp -+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp -@@ -34,7 +34,7 @@ - #include "tst_qvariant_common.h" - - #ifdef Q_OS_LINUX --# include -+# include - #endif - - #include -@@ -197,7 +197,7 @@ protected: - const char *nm = name.constData(); - int tp = qRegisterMetaType(nm); - #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) -- pthread_yield(); -+ sched_yield(); - #endif - QMetaType info(tp); - if (!info.isValid()) { -diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp -index fe1057bdde..e23e97b259 100644 ---- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp -+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp -@@ -75,6 +75,7 @@ - #include - #include - #include -+#include - #endif - - #include "private/qhostinfo_p.h" -@@ -2129,8 +2130,8 @@ public slots: - - #if defined(Q_OS_MAC) - pthread_yield_np(); --#elif defined Q_OS_LINUX && !defined Q_OS_ANDROID -- pthread_yield(); -+#elif defined Q_OS_LINUX -+ sched_yield(); - #endif - if (!sock->waitForConnected()) { - networkTimeout = true; diff --git a/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch deleted file mode 100644 index 244cc0bc..00000000 --- a/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7c42f9b42c34d75f6c8e21e55af9b0e58f5743cc Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 16 Nov 2013 00:32:30 +0100 -Subject: [PATCH] Always build uic - -Even if we are not building gui or widgets. This tool is needed later -as a native tool when compiling the target. - -Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 -Signed-off-by: Mikko Levonmaa -Signed-off-by: Martin Jansa ---- - src/src.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/src.pro b/src/src.pro -index 90d7e2b76c..4ca6b0bd01 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -188,7 +188,7 @@ qtConfig(gui) { - } - } - } --SUBDIRS += src_plugins -+SUBDIRS += src_plugins src_tools_uic - - nacl: SUBDIRS -= src_network src_testlib - diff --git a/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch deleted file mode 100644 index c527c131..00000000 --- a/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch +++ /dev/null @@ -1,75 +0,0 @@ -From b8e94df3d49be69659e8dfb0809c614f73c21706 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 13 Nov 2015 12:36:11 +0100 -Subject: [PATCH] configure paths for target qmake properly -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -to use this patch in all qtbase/qtbase-native(sdk) changes ore made -conditionally based on QT_CROSS_COMPILE - -Upstream-Status: Inappropriate [OE specific] - -Change-Id: I2b2f00c496216e98fbe14801f9e840ef5333c4b6 -Signed-off-by: Andreas Müller -Signed-off-by: Martin Jansa ---- - configure | 23 +++++++++++++++++++---- - 1 file changed, 19 insertions(+), 4 deletions(-) - -diff --git a/configure b/configure -index 5af98cd77e..34dedafe91 100755 ---- a/configure -+++ b/configure -@@ -1500,8 +1500,13 @@ if [ -z "$QT_REL_HOST_DATA" ]; then - fi - fi - --shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` --shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` -+if [ "$QT_CROSS_COMPILE" = "yes" ] ; then -+ shortxspec=linux-g++ -+ shortspec=linux-g++ -+else -+ shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` -+ shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` -+fi - - QT_CONFIGURE_STR_OFF=0 - -@@ -1534,7 +1539,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS - - QT_CONFIGURE_STR_OFFSETS= - QT_CONFIGURE_STRS= --addConfStr "$CFG_SYSROOT" -+if [ "$QT_CROSS_COMPILE" = "yes" ] ; then -+ addConfStr "" -+else -+ addConfStr "$CFG_SYSROOT" -+fi - addConfStr "$QT_REL_HOST_BINS" - addConfStr "$QT_REL_HOST_LIBS" - addConfStr "$QT_REL_HOST_DATA" -@@ -1546,6 +1555,12 @@ addConfStr "$shortspec" - #------------------------------------------------------------------------------- - [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global" - -+if [ "$QT_CROSS_COMPILE" = "yes" ] ; then -+ QT_TARGET_PREFIX=$QT_EXT_PREFIX -+else -+ QT_TARGET_PREFIX=$QT_HOST_PREFIX -+fi -+ - cat > "$outpath/src/corelib/global/qconfig.cpp.new" < -Date: Thu, 19 Jan 2017 09:05:46 +0100 -Subject: [PATCH 2/3] Fix memory leak in V4 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Transitions contain both an id and a set of flags, but the sorting -failed to take the flags into account in the operator<. As a result -we would some times end up with duplicate entries if the same id -was added multiple times with different flags. - -If the same id was added again and again with varying flags, this -could lead to an ever expanding list filled with duplicate entries. - -Fix this by also taking flags into account in operator< so that -operator< and operator== are symetric and the list gets correctly -sorted. - -Change-Id: I762ec3f0c5b4ed9a1aecb9a883187a0445491591 -Reviewed-by: Simon Hausmann -Reviewed-by: Robin Burchell -Signed-off-by: Gordan Markuš ---- - src/qml/jsruntime/qv4internalclass_p.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/qml/jsruntime/qv4internalclass_p.h b/src/qml/jsruntime/qv4internalclass_p.h -index dcda949..1d8ef4b 100644 ---- a/src/qml/jsruntime/qv4internalclass_p.h -+++ b/src/qml/jsruntime/qv4internalclass_p.h -@@ -234,7 +234,7 @@ struct InternalClassTransition - { return id == other.id && flags == other.flags; } - - bool operator<(const InternalClassTransition &other) const -- { return id < other.id; } -+ { return id < other.id || (id == other.id && flags < other.flags); } - }; - - struct InternalClass : public QQmlJS::Managed { --- -2.9.3 - diff --git a/recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch b/recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch deleted file mode 100644 index 79a48f54..00000000 --- a/recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 6aa9001064c19e75e58c830eedc583e2342a7f20 Mon Sep 17 00:00:00 2001 -From: Shawn Rutledge -Date: Wed, 1 Feb 2017 12:06:26 +0100 -Subject: [PATCH 3/3] fix memory leak in - QQuickWindowPrivate::deliverTouchAsMouse -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -A QTouchEvent is allocated with a reduced subset of TouchPoints for -each Item to which we attempt to deliver it, and thrown away afterwards. -(Ιt's not efficient to heap-allocate it, but we can't avoid doing it -at all without changing behavior.) So now it's stored in a QScopedPointer. - -Change-Id: I48badb493610d0a715e582a2eedae95e2006eb2b -Reviewed-by: Jan Arve Sæther -Signed-off-by: Gordan Markuš ---- - src/quick/items/qquickwindow.cpp | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp -index 1297dde..c130aec 100644 ---- a/src/quick/items/qquickwindow.cpp -+++ b/src/quick/items/qquickwindow.cpp -@@ -629,8 +629,8 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve - - // FIXME: make this work for mouse events too and get rid of the asTouchEvent in here. - Q_ASSERT(pointerEvent->asPointerTouchEvent()); -- QTouchEvent *event = pointerEvent->asPointerTouchEvent()->touchEventForItem(item); -- if (!event) -+ QScopedPointer event(pointerEvent->asPointerTouchEvent()->touchEventForItem(item)); -+ if (event.isNull()) - return false; - - // For each point, check if it is accepted, if not, try the next point. -@@ -647,7 +647,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve - break; - - qCDebug(DBG_TOUCH_TARGET) << "TP (mouse)" << p.id() << "->" << item; -- QScopedPointer mousePress(touchToMouseEvent(QEvent::MouseButtonPress, p, event, item, false)); -+ QScopedPointer mousePress(touchToMouseEvent(QEvent::MouseButtonPress, p, event.data(), item, false)); - - // Send a single press and see if that's accepted - QCoreApplication::sendEvent(item, mousePress.data()); -@@ -661,7 +661,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve - pointerEventPoint->setGrabber(item); - - if (checkIfDoubleClicked(event->timestamp())) { -- QScopedPointer mouseDoubleClick(touchToMouseEvent(QEvent::MouseButtonDblClick, p, event, item, false)); -+ QScopedPointer mouseDoubleClick(touchToMouseEvent(QEvent::MouseButtonDblClick, p, event.data(), item, false)); - QCoreApplication::sendEvent(item, mouseDoubleClick.data()); - event->setAccepted(mouseDoubleClick->isAccepted()); - if (!mouseDoubleClick->isAccepted()) { -@@ -678,7 +678,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve - } else if (touchMouseDevice == device && p.id() == touchMouseId) { - if (p.state() & Qt::TouchPointMoved) { - if (QQuickItem *mouseGrabberItem = q->mouseGrabberItem()) { -- QScopedPointer me(touchToMouseEvent(QEvent::MouseMove, p, event, mouseGrabberItem, false)); -+ QScopedPointer me(touchToMouseEvent(QEvent::MouseMove, p, event.data(), mouseGrabberItem, false)); - QCoreApplication::sendEvent(item, me.data()); - event->setAccepted(me->isAccepted()); - if (me->isAccepted()) { -@@ -689,7 +689,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve - // no grabber, check if we care about mouse hover - // FIXME: this should only happen once, not recursively... I'll ignore it just ignore hover now. - // hover for touch??? -- QScopedPointer me(touchToMouseEvent(QEvent::MouseMove, p, event, item, false)); -+ QScopedPointer me(touchToMouseEvent(QEvent::MouseMove, p, event.data(), item, false)); - if (lastMousePosition.isNull()) - lastMousePosition = me->windowPos(); - QPointF last = lastMousePosition; -@@ -707,7 +707,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve - } else if (p.state() & Qt::TouchPointReleased) { - // currently handled point was released - if (QQuickItem *mouseGrabberItem = q->mouseGrabberItem()) { -- QScopedPointer me(touchToMouseEvent(QEvent::MouseButtonRelease, p, event, mouseGrabberItem, false)); -+ QScopedPointer me(touchToMouseEvent(QEvent::MouseButtonRelease, p, event.data(), mouseGrabberItem, false)); - QCoreApplication::sendEvent(item, me.data()); - - if (item->acceptHoverEvents() && p.screenPos() != QGuiApplicationPrivate::lastCursorPosition) { --- -2.9.3 - diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 34a8897d..2194d33a 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -5,20 +5,14 @@ require qt5-ptest.inc LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " SRC_URI += " \ file://0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch \ - file://0002-Fix-memory-leak-in-V4.patch \ - file://0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch \ " DEPENDS += "qtbase" @@ -39,6 +33,6 @@ do_install_append_class-nativesdk() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" -SRCREV = "fffb997e192a72b4dcd66edc2fbad5473dd359f3" +SRCREV = "96f6ba5f562073f508cd8569ac354592fdd48f4a" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb index 2f32a884..8b4fb714 100644 --- a/recipes-qt/qt5/qtenginio_git.bb +++ b/recipes-qt/qt5/qtenginio_git.bb @@ -15,8 +15,3 @@ DEPENDS += "qtbase qtdeclarative qtxmlpatterns" QT_MODULE_BRANCH = "dev" SRCREV = "0555cf73c8b5abd41d8a4ff02457315c9e7c667d" -do_install_append() { - if ls ${D}${libdir}/pkgconfig/Enginio.pc >/dev/null 2>/dev/null; then - sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/Enginio.pc - fi -} diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 6abf8b77..94f04a49 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "13bbe6ea378d127b9b1d70e2858e41e86e754dc7" +SRCREV = "ef8850fee38e2552d535379a8477c9abebdf8bb4" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index eadd4bc3..edb150e3 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -19,8 +19,8 @@ DEPENDS += "qtdeclarative" RDEPENDS_${PN}-dev = "" -SRCREV = "1583bb5569cfc50141d879107a46146d5ccccf28" - # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Build/44912/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" + +SRCREV = "db93af5b2bb49af74fbad6c9cd80bd7010434e78" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 3725441c..4dd64df2 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "cd2de115c6216ad747cf4803e65a4ce4af220795" +SRCREV = "71ccf0dff82835ce7b5aed74c37829afdef44cde" diff --git a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch new file mode 100644 index 00000000..49fcff6b --- /dev/null +++ b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch @@ -0,0 +1,27 @@ +From f7c76b91e726a0e63e5226eb6e89b13e0c3509b7 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Wed, 7 Jun 2017 13:29:29 +0300 +Subject: [PATCH] Make mapbox-gl build configurable + +mapbox-gl-native won't compile for ARMv5 or older, so disable the +build by default. + +Task-number: QTBUG-61289 +Change-Id: I5f26200f2735b363c3c322f9035b331b9159c47b +--- + src/plugins/geoservices/geoservices.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro +index 0810d39..03fc119 100644 +--- a/src/plugins/geoservices/geoservices.pro ++++ b/src/plugins/geoservices/geoservices.pro +@@ -6,7 +6,7 @@ qtConfig(concurrent) { + SUBDIRS += osm + } + +-qtConfig(c++14):!win32|mingw:!qnx { ++mapboxgl:qtConfig(c++14):!win32|mingw:!qnx { + !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) { + warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.") + } else { diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index ab96029e..7d434a4b 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -13,15 +13,26 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" +SRC_URI += "file://0001-Make-mapbox-gl-build-configurable.patch" + PACKAGECONFIG ??= "" # older geoclue 0.12.99 is needed PACKAGECONFIG[geoclue] = ",,geoclue" PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy" +PACKAGECONFIG[mapboxgl] = "" +EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'mapboxgl', 'CONFIG+=mapboxgl', '', d)}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "41cc347040226d2c5c16b9df001d03f2724b87e5" - # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152640/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" + +SRC_URI += " \ + ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ +" + +SRCREV_qtlocation = "888d351cb0c7fe6d05ab1efe8d4dbb4b6f06cd5f" +SRCREV_qtlocation-mapboxgl = "d45c177e8a23eefcc94930af9fa085e61136bb94" + +SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index aa79e3f0..19966183 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -4,13 +4,9 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " @@ -33,8 +29,8 @@ SRC_URI += "\ file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ " -SRCREV = "544a8a4251ff9694780e563ddb6e4af1325e0115" - # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Build/44914/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" + +SRCREV = "559c305ded730e23505e8b29536a98dc59e2acfa" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 5657c869..eb5e4f61 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb @@ -1,7 +1,6 @@ LICENSE = "BSD & GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " @@ -10,4 +9,4 @@ require qt5-git.inc DEPENDS += "qtbase" -SRCREV = "ec7663382bc6382323f3261ab199ec2edbeb5e37" +SRCREV = "86c5036848ad004208803d9d497cfcd08c9623d6" diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index d41b8382..1f680e62 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb @@ -24,4 +24,4 @@ do_configure_prepend() { } QT_MODULE_BRANCH = "dev" -SRCREV = "64faeb0d8003e699a4d09e7dcee1ef6eb10302ad" +SRCREV = "695460401d9a89d2f156016d51601b2e59b64105" diff --git a/recipes-qt/qt5/qtquickcontrols2/0001-qtquickcontrols2-fix-compilation-of-examples-textedi.patch b/recipes-qt/qt5/qtquickcontrols2/0001-qtquickcontrols2-fix-compilation-of-examples-textedi.patch deleted file mode 100644 index d08c57e9..00000000 --- a/recipes-qt/qt5/qtquickcontrols2/0001-qtquickcontrols2-fix-compilation-of-examples-textedi.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3696a416bd594d3f280c281cb2a66bc837829238 Mon Sep 17 00:00:00 2001 -From: Steffen Sledz -Date: Thu, 6 Jul 2017 13:28:07 +0200 -Subject: [PATCH] qtquickcontrols2: fix compilation of examples/texteditor - -git/examples/quickcontrols2/texteditor/documenthandler.cpp:284:18: error: invalid use of incomplete type 'class QDebug' - qWarning() << "load() called before DocumentHandler has QQmlEngine"; - -Signed-off-by: Steffen Sledz ---- - examples/quickcontrols2/texteditor/documenthandler.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/examples/quickcontrols2/texteditor/documenthandler.cpp b/examples/quickcontrols2/texteditor/documenthandler.cpp -index e57946fd..94ca82ad 100644 ---- a/examples/quickcontrols2/texteditor/documenthandler.cpp -+++ b/examples/quickcontrols2/texteditor/documenthandler.cpp -@@ -59,6 +59,7 @@ - #include - #include - #include -+#include - - DocumentHandler::DocumentHandler(QObject *parent) - : QObject(parent) --- -2.13.2 - diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 371f4aef..a84cfb32 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -4,14 +4,10 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0" LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ - file://LICENSE.LGPLv3;md5=a37e6cd7102174853307e03e6edc5f30 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ + file://LICENSE.LGPLv3;md5=382747d0119037529ec2b98b24038eb0 \ + file://LICENSE.GPLv3;md5=dce746aa5261707df6d6999ab9958d8b \ " DEPENDS += "qtdeclarative" -SRC_URI += " \ - file://0001-qtquickcontrols2-fix-compilation-of-examples-textedi.patch \ -" - -SRCREV = "6f7852a307c7ebbdb3b6efa00cbf7626b072bbc1" +SRCREV = "ef6b8d3081f0bf93d6d59e67c8e3f82c63c511c3" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 69f3d3ba..83ed908d 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -17,8 +17,13 @@ DEPENDS += "qtdeclarative" RDEPENDS_${PN}-dev = "" +FILES_${PN}-qmlplugins += " \ + ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders \ + ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ +" + SRC_URI += " \ file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ " -SRCREV = "201c86391c7ff78d570fdec6e0c0b71eb1e9aae4" +SRCREV = "dacb91916b202208681471ba764504c7c7d086f0" diff --git a/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch new file mode 100644 index 00000000..dfebc184 --- /dev/null +++ b/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch @@ -0,0 +1,37 @@ +From dd9d1e5ecdcd8267215523ad08ea893656a7f42d Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Wed, 7 Jun 2017 15:17:12 +0300 +Subject: [PATCH] Allow a tools-only build + +Change-Id: I3b33fc1c8877fc82568bd386b063e7a0aa57b706 +--- + mkspecs/features/repccommon.pri | 2 +- + qtremoteobjects.pro | 5 +++++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/mkspecs/features/repccommon.pri b/mkspecs/features/repccommon.pri +index 5e88bf8..6efd19e 100644 +--- a/mkspecs/features/repccommon.pri ++++ b/mkspecs/features/repccommon.pri +@@ -3,7 +3,7 @@ cmd = $${QT.remoteobjects.bins}/repc + contains(QMAKE_HOST.os, Windows) { + cmd = $$system_path($${cmd}.exe) + } +-exists($$cmd): QT_TOOL.repc.binary = $$cmd ++false:exists($$cmd): QT_TOOL.repc.binary = $$cmd + + # qtPrepareTool honors QT_TOOL.repc.binary if set + qtPrepareTool(QMAKE_REPC, repc) +diff --git a/qtremoteobjects.pro b/qtremoteobjects.pro +index c2e2b6b..93c2bb5 100644 +--- a/qtremoteobjects.pro ++++ b/qtremoteobjects.pro +@@ -2,3 +2,8 @@ CONFIG += examples_need_tools tests_need_tools + load(qt_parts) + + SUBDIRS += mkspecs ++ ++tools-only { ++ sub_tools.depends -= sub_src ++ SUBDIRS = sub_tools ++} diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb new file mode 100644 index 00000000..f563818d --- /dev/null +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -0,0 +1,27 @@ +LICENSE = "BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial" +LIC_FILES_CHKSUM = " \ + file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ + file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ +" + +require qt5.inc +require qt5-git.inc + +DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" + +SRC_URI += " \ + file://0001-Allow-a-tools-only-build.patch \ +" + +PACKAGECONFIG ??= "" +PACKAGECONFIG_class-native ??= "tools-only" +PACKAGECONFIG_class-nativesdk ??= "tools-only" +PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" + +EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" + +SRCREV = "ae0b101884b05355e3a7bc06dbca722ad3d08d0f" + +BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 2875988e..e7acafe5 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -25,8 +25,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm" DEPENDS += "qtbase" -SRCREV = "c35df2ec0ee05351912e768d298a7c627dbdd1ef" - # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Build/44915/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" + +SRCREV = "e00ca9b6bec2adf78fd14e02376ecf1b55a93b0c" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index d69d00fe..c2c00e1b 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,7 +10,7 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "4704292500b98143eee9b0fb0b6a34a858ed1253" +SRCREV = "eff82ac957e051f16f64c287f2dfaec9049bdfc1" SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 93a09719..17d06394 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "1220a31e6c2f91b34b4a05773621dddab8c4315a" +SRCREV = "0c3c4d01ea34ed98a0d2928662f07b673f00535d" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 325d9754..93a826bd 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "c8fe92ef54b2d310e8c8c143962fd6f43bf46c27" +SRCREV = "20811e3b004af817e3f02982c755e8b1560b8c3d" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index edecc041..957000c4 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "74aad2578ecb6739007449a06a54dd7abd64c85b" +SRCREV = "687f5a9bd44a45a29d24925f29470c43d6729dee" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 24a0d911..fb8d44e1 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "1b3a7ae14d25f1caa3f6bedad3cfeb7d83b3904e" +SRCREV = "4fd787e90c70afbaa168abb3efdb8757ba77f3a4" diff --git a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch deleted file mode 100644 index 17d5d514..00000000 --- a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 95a418157ce5f49052ec1c349581d1811a79c9eb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 17 Jan 2014 14:33:19 +0100 -Subject: [PATCH] assistant/help: fix linking of dependent libraries -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -else we get: -| ...ld: warning: libQt5CLucene.so.5, needed by ...libQt5Help.so, not found (try using -rpath or -rpath-link) -| ...undefined reference to `QCLucenePhraseQuery::getTerms() const' - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andreas Müller ---- - src/assistant/help/help.pro | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro -index 37d5ba4..8de8763 100644 ---- a/src/assistant/help/help.pro -+++ b/src/assistant/help/help.pro -@@ -60,3 +60,5 @@ HEADERS += qhelpsearchindexwriter_clucene_p.h \ - qhelpsearchindexreader_clucene_p.h - - load(qt_module) -+ -+LIBS += -lQt5CLucene diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 5c0f51cc..9ca90a2c 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -4,13 +4,9 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://LICENSE.LGPLv21;md5=fb91571854638f10b2e5f36562661a5a \ - file://LICENSE.LGPLv3;md5=a909b94c1c9674b2aa15ff03a86f518a \ file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ - file://LICENSE.GPLv3;md5=bfdd8aa675169432d6d9b63d056de148 \ - file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " @@ -20,8 +16,6 @@ DEPENDS += "qtbase qtdeclarative qtxmlpatterns" SRC_URI += " \ file://run-ptest \ - file://0002-assistant-help-fix-linking-of-dependent-libraries.patch \ - file://0003-add-noqtwebkit-configuration.patch \ file://0004-linguist-tools-cmake-allow-overriding-the-location-f.patch \ " @@ -33,7 +27,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" -SRCREV = "30c10900adecca55faa1d59c2f0caac74b1f9df6" +SRCREV = "88e02bb0a9b97d68a4b270e4ddfb6d0847c702a9" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 53ab1996..822517f6 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -114,4 +114,4 @@ FILES_${PN}-qt = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ " -SRCREV = "c0ae29b2328922f16cb2305f8579c2a869c871b0" +SRCREV = "3e727a890f7856978469ee38ef0619b1b59a8ca7" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 244e529d..2b865bbb 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -50,4 +50,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" -SRCREV = "cfa4ab4cbf13971d4b71ee920353822755a3bf31" +SRCREV = "bdf61afe76e94ef03da1332c4540646f18f5852f" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index ffe22086..91c7230a 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -7,13 +7,9 @@ DEPENDS_append_class-target = " libxkbcommon" LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " @@ -41,7 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "0e2a950895805457a45abe860bc91a7cc4ba405e" +SRCREV = "f1cf62fa8e9ffa2548c9968906848596f50dbc0b" # From https://bugreports.qt.io/browse/QTBUG-57767 SRC_URI += " \ diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index d5f86850..f1167a9e 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -17,4 +17,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "e3ddde4b26a72d57beeeed4e2d3384896e3a399d" +SRCREV = "6383f0fc5eec4935697a6d2d2f87b511bbeb678e" diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch new file mode 100644 index 00000000..44c3f0b2 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch @@ -0,0 +1,63 @@ +From 1634633d27cea7369111c9ea6d08be8515c15ccd Mon Sep 17 00:00:00 2001 +From: Cleiton Bueno +Date: Thu, 24 Dec 2015 12:46:58 -0200 +Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX + qtwebengine compile + +Signed-off-by: Cleiton Bueno +Signed-off-by: Martin Jansa +--- + chromium/ui/gfx/codec/jpeg_codec.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/chromium/ui/gfx/codec/jpeg_codec.cc b/chromium/ui/gfx/codec/jpeg_codec.cc +index 6d926378be..738d3fdedf 100644 +--- a/chromium/ui/gfx/codec/jpeg_codec.cc ++++ b/chromium/ui/gfx/codec/jpeg_codec.cc +@@ -121,7 +121,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) { + // tell libjpeg where to write the next data + cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used]; + cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used; +- return 1; ++ return TRUE; + } + + // Cleans up the JpegEncoderState to prepare for returning in the final form. +@@ -262,7 +262,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format, + cinfo.data_precision = 8; + + jpeg_set_defaults(&cinfo); +- jpeg_set_quality(&cinfo, quality, 1); // quality here is 0-100 ++ jpeg_set_quality(&cinfo, quality, TRUE); // quality here is 0-100 + + // set up the destination manager + jpeg_destination_mgr destmgr; +@@ -274,7 +274,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format, + JpegEncoderState state(output); + cinfo.client_data = &state; + +- jpeg_start_compress(&cinfo, 1); ++ jpeg_start_compress(&cinfo, TRUE); + + // feed it the rows, doing necessary conversions for the color format + #ifdef JCS_EXTENSIONS +@@ -360,7 +360,7 @@ void InitSource(j_decompress_ptr cinfo) { + // set to a positive value if TRUE is returned. A FALSE return should only + // be used when I/O suspension is desired." + boolean FillInputBuffer(j_decompress_ptr cinfo) { +- return false; ++ return FALSE; + } + + // Skip data in the buffer. Since we have all the data at once, this operation +@@ -488,8 +488,8 @@ bool JPEGCodec::Decode(const unsigned char* input, size_t input_size, + cinfo.client_data = &state; + + // fill the file metadata into our buffer +- if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK) +- return false; ++ if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK) ++ return FALSE; + + // we want to always get RGB data out + switch (cinfo.jpeg_color_space) { diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch deleted file mode 100644 index 560a0277..00000000 --- a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d70a7ccba09ba96e0068ad253b3aac7a47125f8e Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Fri, 3 Oct 2014 03:52:11 +0200 -Subject: [PATCH] chromium base.gypi: include atomicops_internals_x86_gcc.cc - when building for x64 arch - -Signed-off-by: Martin Jansa ---- - chromium/base/base.gypi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chromium/base/base.gypi b/chromium/base/base.gypi -index a4da596070..13173d621e 100644 ---- a/chromium/base/base.gypi -+++ b/chromium/base/base.gypi -@@ -845,7 +845,7 @@ - ['include', '^nix/'], - ], - }], -- ['use_qt==1 and target_arch=="ia32"', { -+ ['use_qt==1 and target_arch=="ia32" or target_arch=="x64"', { - 'sources/': [ - ['include', 'atomicops_internals_x86_gcc.cc'], - ], diff --git a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch deleted file mode 100644 index 3d8b3b0f..00000000 --- a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2f3a16a0efaf02521425da2db7d88710da3074b4 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Mon, 30 Jun 2014 20:08:17 +0200 -Subject: [PATCH] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H - anywhere in path, but at the end - -Signed-off-by: Martin Jansa ---- - tools/qmake/mkspecs/features/functions.prf | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index 236ee8ac..0333bdd1 100644 ---- a/tools/qmake/mkspecs/features/functions.prf -+++ b/tools/qmake/mkspecs/features/functions.prf -@@ -319,9 +319,9 @@ defineReplace(mocOutput) { - out = $$1 - # The order is important, since the output of the second replace would end up accidentaly transformed by the first one - for(ext, $$list($${QMAKE_EXT_CPP})): \ -- out = $$replace(out, ^(.*)($$re_escape($${ext})), $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) -+ out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) - for(ext, $$list($${QMAKE_EXT_H})): \ -- out = $$replace(out, ^(.*)($$re_escape($${ext})), $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) -+ out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) - return($$out) - } - diff --git a/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch new file mode 100644 index 00000000..a91a2982 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch @@ -0,0 +1,30 @@ +From 491576d7e67d00b93106592140e5d7f0f34ea641 Mon Sep 17 00:00:00 2001 +From: Frieder Schrempf +Date: Mon, 1 Dec 2014 14:34:40 +0000 +Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Frieder Schrempf +Signed-off-by: Martin Jansa +--- + mkspecs/features/functions.prf | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf +index eb421f8b..4513742d 100644 +--- a/mkspecs/features/functions.prf ++++ b/mkspecs/features/functions.prf +@@ -33,6 +33,12 @@ defineTest(isPlatformSupported) { + return(false) + } + gcc:!clang:!isGCCVersionSupported(): return(false) ++ } else:linux-oe-g++* { ++ !gcc:!clang { ++ skipBuild("Qt WebEngine on Linux requires clang or GCC.") ++ return(false) ++ } ++ gcc:!clang:!isGCCVersionSupported(): return(false) + } else:win32 { + winrt { + skipBuild("WinRT is not supported.") diff --git a/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch new file mode 100644 index 00000000..d5567c35 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch @@ -0,0 +1,23 @@ +From 6b48d76b5af38a49f8e438e45c387f01b263e483 Mon Sep 17 00:00:00 2001 +From: Cleiton Bueno +Date: Fri, 25 Dec 2015 18:16:05 -0200 +Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor + +Signed-off-by: Cleiton Bueno +--- + src/webengine/api/qquickwebengineview_p_p.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h +index 2ecd70d7..703d1a92 100644 +--- a/src/webengine/api/qquickwebengineview_p_p.h ++++ b/src/webengine/api/qquickwebengineview_p_p.h +@@ -59,6 +59,8 @@ + #include + #include + #include ++#include ++ + + namespace QtWebEngineCore { + class WebContentsAdapter; diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch deleted file mode 100644 index 587b632f..00000000 --- a/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 79a62dbe498946f487edcb0228c350d9fe7e4d09 Mon Sep 17 00:00:00 2001 -From: Cleiton Bueno -Date: Thu, 24 Dec 2015 12:46:58 -0200 -Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX - qtwebengine compile - -Signed-off-by: Cleiton Bueno -Signed-off-by: Martin Jansa ---- - chromium/ui/gfx/codec/jpeg_codec.cc | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/chromium/ui/gfx/codec/jpeg_codec.cc b/chromium/ui/gfx/codec/jpeg_codec.cc -index 6d926378be..738d3fdedf 100644 ---- a/chromium/ui/gfx/codec/jpeg_codec.cc -+++ b/chromium/ui/gfx/codec/jpeg_codec.cc -@@ -121,7 +121,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) { - // tell libjpeg where to write the next data - cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used]; - cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used; -- return 1; -+ return TRUE; - } - - // Cleans up the JpegEncoderState to prepare for returning in the final form. -@@ -262,7 +262,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format, - cinfo.data_precision = 8; - - jpeg_set_defaults(&cinfo); -- jpeg_set_quality(&cinfo, quality, 1); // quality here is 0-100 -+ jpeg_set_quality(&cinfo, quality, TRUE); // quality here is 0-100 - - // set up the destination manager - jpeg_destination_mgr destmgr; -@@ -274,7 +274,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format, - JpegEncoderState state(output); - cinfo.client_data = &state; - -- jpeg_start_compress(&cinfo, 1); -+ jpeg_start_compress(&cinfo, TRUE); - - // feed it the rows, doing necessary conversions for the color format - #ifdef JCS_EXTENSIONS -@@ -360,7 +360,7 @@ void InitSource(j_decompress_ptr cinfo) { - // set to a positive value if TRUE is returned. A FALSE return should only - // be used when I/O suspension is desired." - boolean FillInputBuffer(j_decompress_ptr cinfo) { -- return false; -+ return FALSE; - } - - // Skip data in the buffer. Since we have all the data at once, this operation -@@ -488,8 +488,8 @@ bool JPEGCodec::Decode(const unsigned char* input, size_t input_size, - cinfo.client_data = &state; - - // fill the file metadata into our buffer -- if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK) -- return false; -+ if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK) -+ return FALSE; - - // we want to always get RGB data out - switch (cinfo.jpeg_color_space) { diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch new file mode 100644 index 00000000..5f9eb3a7 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch @@ -0,0 +1,40 @@ +From b1a6f73d49a340e99145a4c4cf70dc796ed632ff Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Wed, 15 Mar 2017 13:53:28 +0200 +Subject: [PATCH] chromium: Force host toolchain configuration + +Force gcc/g++ to be used for parts using host toolchain, since +the option(host_build) does not work in yocto builds. + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Samuli Piippo +Signed-off-by: Martin Jansa +--- + chromium/tools/gn/bootstrap/bootstrap.py | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py +index 43d252b43e..e58347848e 100755 +--- a/chromium/tools/gn/bootstrap/bootstrap.py ++++ b/chromium/tools/gn/bootstrap/bootstrap.py +@@ -298,14 +298,14 @@ def write_gn_ninja(path, root_gen_dir, options): + ld = os.environ.get('LD', 'link.exe') + ar = os.environ.get('AR', 'lib.exe') + else: +- cc = os.environ.get('CC', 'cc') +- cxx = os.environ.get('CXX', 'c++') ++ cc = os.environ.get('CC_host', 'gcc') ++ cxx = os.environ.get('CXX_host', 'g++') + ld = cxx +- ar = os.environ.get('AR', 'ar') ++ ar = os.environ.get('AR_host', 'ar') + +- cflags = os.environ.get('CFLAGS', '').split() +- cflags_cc = os.environ.get('CXXFLAGS', '').split() +- ldflags = os.environ.get('LDFLAGS', '').split() ++ cflags = os.environ.get('CFLAGS_host', '').split() ++ cflags_cc = os.environ.get('CXXFLAGS_host', '').split() ++ ldflags = os.environ.get('LDFLAGS_host', '').split() + include_dirs = [root_gen_dir, SRC_ROOT] + libs = [] + diff --git a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch deleted file mode 100644 index 93e68b51..00000000 --- a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch +++ /dev/null @@ -1,26 +0,0 @@ -From bf7f70ae0bf7345c2546f4f4bc371a9e8eeb0bd3 Mon Sep 17 00:00:00 2001 -From: Simon Busch -Date: Tue, 18 Nov 2014 10:38:18 +0100 -Subject: [PATCH] functions.prf: Make sure we only use the file name to - generate it's moc'ed abbreviation - -Signed-off-by: Simon Busch -Signed-off-by: Martin Jansa ---- - tools/qmake/mkspecs/features/functions.prf | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index 0333bdd1..687d34f8 100644 ---- a/tools/qmake/mkspecs/features/functions.prf -+++ b/tools/qmake/mkspecs/features/functions.prf -@@ -316,7 +316,8 @@ defineReplace(findIncludedMocFiles) { - } - - defineReplace(mocOutput) { -- out = $$1 -+ in = $$1 -+ out = $$basename(in) - # The order is important, since the output of the second replace would end up accidentaly transformed by the first one - for(ext, $$list($${QMAKE_EXT_CPP})): \ - out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) diff --git a/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch new file mode 100644 index 00000000..2fa1764d --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch @@ -0,0 +1,23 @@ +From 95a6e3fd9e8498cb1f59120d402ec8ecfcd3ec59 Mon Sep 17 00:00:00 2001 +From: Cleiton Bueno +Date: Thu, 24 Dec 2015 15:59:51 -0200 +Subject: [PATCH] Include dependency to QCoreApplication::translate() + +Signed-off-by: Cleiton Bueno +--- + src/core/media_capture_devices_dispatcher.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h +index c378c327..1d33d956 100644 +--- a/src/core/media_capture_devices_dispatcher.h ++++ b/src/core/media_capture_devices_dispatcher.h +@@ -45,6 +45,8 @@ + #include + #include + ++#include ++ + #include "web_contents_adapter_client.h" + + #include "base/callback.h" diff --git a/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch new file mode 100644 index 00000000..8785842a --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch @@ -0,0 +1,33 @@ +From 8910e65fd777120261f16c4a35ace2b0dc6181b3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 14:01:12 -0700 +Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not + defined + +Musl does not define this Macro + +Signed-off-by: Khem Raj +--- + chromium/sandbox/linux/suid/sandbox.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/chromium/sandbox/linux/suid/sandbox.c b/chromium/sandbox/linux/suid/sandbox.c +index b655d1c79c..3de34e36f2 100644 +--- a/chromium/sandbox/linux/suid/sandbox.c ++++ b/chromium/sandbox/linux/suid/sandbox.c +@@ -44,6 +44,15 @@ static bool DropRoot(); + + #define HANDLE_EINTR(x) TEMP_FAILURE_RETRY(x) + ++#ifndef TEMP_FAILURE_RETRY ++# define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif ++ + static void FatalError(const char* msg, ...) + __attribute__((noreturn, format(printf, 1, 2))); + diff --git a/recipes-qt/qt5/qtwebengine/0003-chromium-v8-fix-build-with-gcc7.patch b/recipes-qt/qt5/qtwebengine/0003-chromium-v8-fix-build-with-gcc7.patch deleted file mode 100644 index f2456dd6..00000000 --- a/recipes-qt/qt5/qtwebengine/0003-chromium-v8-fix-build-with-gcc7.patch +++ /dev/null @@ -1,131 +0,0 @@ -From 944746d5d04ea8eaf268a97440c98136beae1e47 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Tue, 11 Jul 2017 10:15:41 +0200 -Subject: [PATCH] chromium: v8 fix build with gcc7 - -Use the fix from nodejs: -https://github.com/nodejs/node/commit/2a2a5565c298639b823250b571101f51210c50e8 - -* fixes: -| ../../git/src/v8/src/objects-body-descriptors.h: In static member function 'static void v8::internal::FixedBodyDescriptor::IterateBody(v8::internal::HeapObject*, int)': -| ../../git/src/v8/src/objects-body-descriptors.h:102:20: error: no matching function for call to 'v8::internal::FixedBodyDescriptor::IterateBody(v8::internal::HeapObject*&)' -| IterateBody(obj); -| ^ - -and - -| ../../v8/src/objects.h: In member function 'uint32_t v8::internal::HashTable::Hash(Key)': -| ../../v8/src/objects.h:3205:46: error: invalid use of incomplete type 'class v8::internal::Heap' [-Werror] -| return Shape::SeededHash(key, GetHeap()->HashSeed()); -| ^~ - -and - -../../v8/src/heap/mark-compact.cc:3660:43: error: 'v8::internal::PointerUpdateJobTraits::UpdateTypedPointers(v8::internal::Heap*, v8::internal::MemoryChunk*):: [with v8::internal::PointerDirection direction = (v8::internal::PointerDirection)1; v8::internal::Address = unsigned char*; v8::internal::byte = unsigned char]::' declared with greater visibility than the type of its field 'v8::internal::PointerUpdateJobTraits::UpdateTypedPointers(v8::internal::Heap*, v8::internal::MemoryChunk*):: [with v8::internal::PointerDirection direction = (v8::internal::PointerDirection)1; v8::internal::Address = unsigned char*; v8::internal::byte = unsigned char]::::' [-Werror=attributes] - -Signed-off-by: Martin Jansa ---- - chromium/v8/src/heap/mark-compact.cc | 5 +++++ - chromium/v8/src/objects-body-descriptors.h | 2 +- - chromium/v8/src/objects-inl.h | 20 ++++++++++++++++++++ - chromium/v8/src/objects.h | 20 ++++---------------- - 4 files changed, 30 insertions(+), 17 deletions(-) - -diff --git a/chromium/v8/src/heap/mark-compact.cc b/chromium/v8/src/heap/mark-compact.cc -index f9a55dfc61..da46270aec 100644 ---- a/chromium/v8/src/heap/mark-compact.cc -+++ b/chromium/v8/src/heap/mark-compact.cc -@@ -3614,6 +3614,9 @@ void MarkCompactCollector::EvacuateNewSpaceAndCandidates() { - #endif - } - -+#pragma GCC diagnostic push -+#pragma GCC diagnostic warning "-Wattributes" -+ - template - class PointerUpdateJobTraits { - public: -@@ -3701,6 +3704,8 @@ class PointerUpdateJobTraits { - } - }; - -+#pragma GCC diagnostic pop -+ - int NumberOfPointerUpdateTasks(int pages) { - if (!FLAG_parallel_pointer_update) return 1; - const int kMaxTasks = 4; -diff --git a/chromium/v8/src/objects-body-descriptors.h b/chromium/v8/src/objects-body-descriptors.h -index 91cb8883be..a1c3634bd7 100644 ---- a/chromium/v8/src/objects-body-descriptors.h -+++ b/chromium/v8/src/objects-body-descriptors.h -@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public BodyDescriptorBase { - - template - static inline void IterateBody(HeapObject* obj, int object_size) { -- IterateBody(obj); -+ IterateBody(obj); - } - }; - -diff --git a/chromium/v8/src/objects-inl.h b/chromium/v8/src/objects-inl.h -index 58441d3853..e850fd787f 100644 ---- a/chromium/v8/src/objects-inl.h -+++ b/chromium/v8/src/objects-inl.h -@@ -38,6 +38,26 @@ - namespace v8 { - namespace internal { - -+template -+uint32_t HashTable::Hash(Key key) { -+ if (Shape::UsesSeed) { -+ return Shape::SeededHash(key, GetHeap()->HashSeed()); -+ } else { -+ return Shape::Hash(key); -+ } -+} -+ -+ -+template -+uint32_t HashTable::HashForObject(Key key, -+ Object* object) { -+ if (Shape::UsesSeed) { -+ return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); -+ } else { -+ return Shape::HashForObject(key, object); -+ } -+} -+ - PropertyDetails::PropertyDetails(Smi* smi) { - value_ = smi->value(); - } -diff --git a/chromium/v8/src/objects.h b/chromium/v8/src/objects.h -index 7d774beb5b..eda1478766 100644 ---- a/chromium/v8/src/objects.h -+++ b/chromium/v8/src/objects.h -@@ -3193,22 +3193,10 @@ class HashTable : public HashTableBase { - public: - typedef Shape ShapeT; - -- // Wrapper methods -- inline uint32_t Hash(Key key) { -- if (Shape::UsesSeed) { -- return Shape::SeededHash(key, GetHeap()->HashSeed()); -- } else { -- return Shape::Hash(key); -- } -- } -- -- inline uint32_t HashForObject(Key key, Object* object) { -- if (Shape::UsesSeed) { -- return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); -- } else { -- return Shape::HashForObject(key, object); -- } -- } -+ // Wrapper methods. Defined in src/objects-inl.h -+ // to break a cycle with src/heap/heap.h. -+ inline uint32_t Hash(Key key); -+ inline uint32_t HashForObject(Key key, Object* object); - - // Returns a new HashTable object. - MUST_USE_RESULT static Handle New( diff --git a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch deleted file mode 100644 index a4601780..00000000 --- a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5ff09196304a38304893e0703a8a7d2df2ec889a Mon Sep 17 00:00:00 2001 -From: Frieder Schrempf -Date: Mon, 1 Dec 2014 14:34:40 +0000 -Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Frieder Schrempf -Signed-off-by: Martin Jansa ---- - tools/qmake/mkspecs/features/functions.prf | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index 687d34f8..5c0c40fd 100644 ---- a/tools/qmake/mkspecs/features/functions.prf -+++ b/tools/qmake/mkspecs/features/functions.prf -@@ -21,6 +21,12 @@ defineTest(isPlatformSupported) { - return(false) - } - gcc:!clang:!isGCCVersionSupported(): return(false) -+ } else:linux-oe-g++* { -+ !gcc:!clang { -+ skipBuild("Qt WebEngine on Linux requires clang or GCC.") -+ return(false) -+ } -+ gcc:!clang:!isGCCVersionSupported(): return(false) - } else:win32 { - winrt { - skipBuild("WinRT is not supported.") diff --git a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch new file mode 100644 index 00000000..142595a3 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch @@ -0,0 +1,44 @@ +From e81f0a5139f8f1ea131438def3fe1aabe997aeff Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Wed, 15 Mar 2017 13:53:28 +0200 +Subject: [PATCH] Force host toolchain configuration + +Force gcc/g++ to be used for parts using host toolchain, since +the option(host_build) does not work in yocto builds. + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Samuli Piippo +--- + src/buildtools/configure_host.pro | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro +index fd27643e..f9acb6ff 100644 +--- a/src/buildtools/configure_host.pro ++++ b/src/buildtools/configure_host.pro +@@ -28,9 +28,9 @@ GN_CONTENTS = \ + "import(\"//build/config/sysroot.gni\")" \ + "import(\"//build/toolchain/gcc_toolchain.gni\")" \ + "gcc_toolchain(\"host\") {" \ +-" cc = \"$$which($$QMAKE_CC)\" " \ +-" cxx = \"$$which($$QMAKE_CXX)\" " \ +-" ld = \"$$which($$QMAKE_LINK)\" " \ ++" cc = \"$$which(gcc)\" " \ ++" cxx = \"$$which(g++)\" " \ ++" ld = \"$$which(g++)\" " \ + " ar = \"$$which(ar)\" " \ + " nm = \"$$which(nm)\" " \ + " toolchain_args = { " \ +@@ -41,9 +41,9 @@ GN_CONTENTS = \ + " } " \ + "}" \ + "gcc_toolchain(\"v8_snapshot\") {" \ +-" cc = \"$$which($$QMAKE_CC)\" " \ +-" cxx = \"$$which($$QMAKE_CXX)\" " \ +-" ld = \"$$which($$QMAKE_LINK)\" " \ ++" cc = \"$$which(gcc)\" " \ ++" cxx = \"$$which(g++)\" " \ ++" ld = \"$$which(g++)\" " \ + " ar = \"$$which(ar)\" " \ + " nm = \"$$which(nm)\" " \ + " toolchain_args = { " \ diff --git a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch deleted file mode 100644 index 40015637..00000000 --- a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0e1143af443c80cd49663b55128ab4dd8e570ee1 Mon Sep 17 00:00:00 2001 -From: Cleiton Bueno -Date: Fri, 25 Dec 2015 18:16:05 -0200 -Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor - -Signed-off-by: Cleiton Bueno ---- - src/webengine/api/qquickwebengineview_p_p.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h -index d692140e..58528114 100644 ---- a/src/webengine/api/qquickwebengineview_p_p.h -+++ b/src/webengine/api/qquickwebengineview_p_p.h -@@ -59,6 +59,8 @@ - #include - #include - #include -+#include -+ - - namespace QtWebEngineCore { - class WebContentsAdapter; diff --git a/recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch b/recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch deleted file mode 100644 index 041d29b2..00000000 --- a/recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch +++ /dev/null @@ -1,41 +0,0 @@ -From f62b851edbcc3ac3da448d7570908ad78ebe77dc Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Tue, 11 Jul 2017 10:18:13 +0200 -Subject: [PATCH] chromium: WebKit fix build with gcc7 - -Based on qtwebengine-opensource-src-5.8.0-wtf-gcc7.patch from -http://git.net/ml/scm-fedora-commits/2017-03/msg15697.html - -* Fixes: -In file included from ../../git/src/third_party/WebKit/Source/platform/heap/ThreadingTraits.h:14:0, - from ../../git/src/third_party/WebKit/Source/platform/heap/ThreadState.h:37, - from ../../git/src/third_party/WebKit/Source/platform/heap/GarbageCollected.h:8, - from ../../git/src/third_party/WebKit/Source/platform/heap/Visitor.h:35, - from ../../git/src/third_party/WebKit/Source/platform/heap/GCInfo.h:8, - from ../../git/src/third_party/WebKit/Source/platform/heap/Heap.h:35, - from ../../git/src/third_party/WebKit/Source/platform/heap/Handle.h:34, - from ../../git/src/third_party/WebKit/public/platform/WebPrivatePtr.h:38, - from ../../git/src/third_party/WebKit/public/platform/WebString.h:35, - from ../../git/src/third_party/WebKit/Source/platform/exported/FilePathConversion.cpp:8: -../../git/src/third_party/WebKit/Source/wtf/LinkedHashSet.h: In member function 'void WTF::LinkedHashSet::swap(WTF::LinkedHashSet&)': -../../git/src/third_party/WebKit/Source/wtf/LinkedHashSet.h:549:5: error: there are no arguments to 'swapAnchor' that depend on a template parameter, so a declaration of 'swapAnchor' must be available [-fpermissive] - swapAnchor(m_anchor, other.m_anchor); - ^~~~~~~~~~ -../../git/src/third_party/WebKit/Source/wtf/LinkedHashSet.h:549:5: note: (if you use '-fpermissive', G++ will accept your code, but allowing the use of an undeclared name is deprecated) ---- - chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h b/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h -index e85c72fd65..6f94cd6734 100644 ---- a/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h -+++ b/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h -@@ -542,6 +542,8 @@ inline LinkedHashSet& LinkedHashSet::operator=(LinkedHas - return *this; - } - -+inline void swapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b); -+ - template - inline void LinkedHashSet::swap(LinkedHashSet& other) - { diff --git a/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch new file mode 100644 index 00000000..05b813b2 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch @@ -0,0 +1,45 @@ +From 86f467724070e854c8c6b13269951c97c0832dae Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 14:09:06 -0700 +Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux + +Signed-off-by: Khem Raj +--- + chromium/base/trace_event/malloc_dump_provider.cc | 3 ++- + chromium/content/child/content_child_helpers.cc | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc +index 7d0cb57931..10be59ebad 100644 +--- a/chromium/base/trace_event/malloc_dump_provider.cc ++++ b/chromium/base/trace_event/malloc_dump_provider.cc +@@ -210,6 +210,7 @@ MallocDumpProvider::~MallocDumpProvider() {} + // the current process. + bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, + ProcessMemoryDump* pmd) { ++#if defined(__GLIBC__) + size_t total_virtual_size = 0; + size_t resident_size = 0; + size_t allocated_objects_size = 0; +@@ -321,7 +322,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, + pmd->DumpHeapUsage(metrics_by_context, overhead, "malloc"); + } + tid_dumping_heap_ = kInvalidThreadId; +- ++#endif // __GLIBC__ + return true; + } + +diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc +index 7ddeb4d16a..b8c73b09c5 100644 +--- a/chromium/content/child/content_child_helpers.cc ++++ b/chromium/content/child/content_child_helpers.cc +@@ -25,7 +25,7 @@ namespace content { + // though, this provides only a partial and misleading value. + // Unfortunately some telemetry benchmark rely on it and these need to + // be refactored before getting rid of this. See crbug.com/581365 . +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(__GLIBC__) || defined(OS_ANDROID) + size_t GetMemoryUsageKB() { + struct mallinfo minfo = mallinfo(); + uint64_t mem_usage = diff --git a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch deleted file mode 100644 index 196ef4c2..00000000 --- a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d8fd8c8388c54a0322e60e8be49236df3862ec56 Mon Sep 17 00:00:00 2001 -From: Cleiton Bueno -Date: Thu, 24 Dec 2015 15:59:51 -0200 -Subject: [PATCH] Include dependency to QCoreApplication::translate() - -Signed-off-by: Cleiton Bueno ---- - src/core/media_capture_devices_dispatcher.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h -index b21d40b8..758d5335 100644 ---- a/src/core/media_capture_devices_dispatcher.h -+++ b/src/core/media_capture_devices_dispatcher.h -@@ -46,6 +46,8 @@ - #include - #include - -+#include -+ - #include "web_contents_adapter_client.h" - - #include "base/callback.h" diff --git a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch new file mode 100644 index 00000000..2d7bd02b --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch @@ -0,0 +1,22 @@ +From 0a409a773f2b2936a2f1868d983e7bd1c92110bd Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 14:37:49 -0700 +Subject: [PATCH] chromium: musl: include fcntl.h for loff_t + +Signed-off-by: Khem Raj +--- + chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +index b29ec2d29a..91f77dd88d 100644 +--- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h ++++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +@@ -150,6 +150,7 @@ extern "C" { + #include + #include + #include ++#include + #include + #include + #include diff --git a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch deleted file mode 100644 index b1a08571..00000000 --- a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch +++ /dev/null @@ -1,33 +0,0 @@ -From fac50c58630264d67e447c2dcdcf54b4f806d35e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 14:01:12 -0700 -Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not - defined - -Musl does not define this Macro - -Signed-off-by: Khem Raj ---- - chromium/sandbox/linux/suid/sandbox.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/chromium/sandbox/linux/suid/sandbox.c b/chromium/sandbox/linux/suid/sandbox.c -index b655d1c79c..3de34e36f2 100644 ---- a/chromium/sandbox/linux/suid/sandbox.c -+++ b/chromium/sandbox/linux/suid/sandbox.c -@@ -44,6 +44,15 @@ static bool DropRoot(); - - #define HANDLE_EINTR(x) TEMP_FAILURE_RETRY(x) - -+#ifndef TEMP_FAILURE_RETRY -+# define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) -+#endif -+ - static void FatalError(const char* msg, ...) - __attribute__((noreturn, format(printf, 1, 2))); - diff --git a/recipes-qt/qt5/qtwebengine/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch deleted file mode 100644 index 43982daa..00000000 --- a/recipes-qt/qt5/qtwebengine/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +++ /dev/null @@ -1,45 +0,0 @@ -From e7e4def6d1422b84a9d6a6f7b285515d96210e87 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 14:09:06 -0700 -Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux - -Signed-off-by: Khem Raj ---- - chromium/base/trace_event/malloc_dump_provider.cc | 3 ++- - chromium/content/child/content_child_helpers.cc | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc -index 3b1a933bce..a554d03739 100644 ---- a/chromium/base/trace_event/malloc_dump_provider.cc -+++ b/chromium/base/trace_event/malloc_dump_provider.cc -@@ -103,6 +103,7 @@ MallocDumpProvider::~MallocDumpProvider() {} - // the current process. - bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, - ProcessMemoryDump* pmd) { -+#if defined(__GLIBC__) - size_t total_virtual_size = 0; - size_t resident_size = 0; - size_t allocated_objects_size = 0; -@@ -195,7 +196,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, - pmd->DumpHeapUsage(metrics_by_context, overhead, "malloc"); - } - tid_dumping_heap_ = kInvalidThreadId; -- -+#endif // __GLIBC__ - return true; - } - -diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc -index 7ddeb4d16a..b8c73b09c5 100644 ---- a/chromium/content/child/content_child_helpers.cc -+++ b/chromium/content/child/content_child_helpers.cc -@@ -25,7 +25,7 @@ namespace content { - // though, this provides only a partial and misleading value. - // Unfortunately some telemetry benchmark rely on it and these need to - // be refactored before getting rid of this. See crbug.com/581365 . --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(__GLIBC__) || defined(OS_ANDROID) - size_t GetMemoryUsageKB() { - struct mallinfo minfo = mallinfo(); - uint64_t mem_usage = diff --git a/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch new file mode 100644 index 00000000..f58de8f2 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch @@ -0,0 +1,62 @@ +From 375b70a99760c156b45e60def9bafd04902fb5a4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 14:38:37 -0700 +Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t + +- only do the glibc 32-bit ABI check for mmap/mmap64 on gnu libc. musl + does not support the 32-bit ABI. + +Signed-off-by: Khem Raj +--- + .../third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h +index 715c045f66..edc8cf2db7 100644 +--- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h ++++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h +@@ -77,7 +77,7 @@ typedef off64_t __off64_t; + + static inline void* do_mmap64(void *start, size_t length, + int prot, int flags, +- int fd, __off64_t offset) __THROW { ++ int fd, off64_t offset) __THROW { + // The original gperftools uses sys_mmap() here. But, it is not allowed by + // Chromium's sandbox. + return (void *)syscall(SYS_mmap, start, length, prot, flags, fd, offset); +@@ -90,7 +90,7 @@ static inline void* do_mmap64(void *start, size_t length, + + static inline void* do_mmap64(void *start, size_t length, + int prot, int flags, +- int fd, __off64_t offset) __THROW { ++ int fd, off64_t offset) __THROW { + void *result; + + // Try mmap2() unless it's not supported +@@ -161,7 +161,7 @@ static inline void* do_mmap64(void *start, size_t length, + + extern "C" { + void* mmap64(void *start, size_t length, int prot, int flags, +- int fd, __off64_t offset ) __THROW ++ int fd, off64_t offset ) __THROW + ATTRIBUTE_SECTION(malloc_hook); + void* mmap(void *start, size_t length,int prot, int flags, + int fd, off_t offset) __THROW +@@ -178,7 +178,7 @@ extern "C" { + } + + extern "C" void* mmap64(void *start, size_t length, int prot, int flags, +- int fd, __off64_t offset) __THROW { ++ int fd, off64_t offset) __THROW { + MallocHook::InvokePreMmapHook(start, length, prot, flags, fd, offset); + void *result; + if (!MallocHook::InvokeMmapReplacement( +@@ -189,7 +189,7 @@ extern "C" void* mmap64(void *start, size_t length, int prot, int flags, + return result; + } + +-# if !defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH) ++# if defined(__GLIBC__) && (!defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH)) + + extern "C" void* mmap(void *start, size_t length, int prot, int flags, + int fd, off_t offset) __THROW { diff --git a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/0007-chromium-musl-include-fcntl.h-for-loff_t.patch deleted file mode 100644 index 95a12b01..00000000 --- a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-include-fcntl.h-for-loff_t.patch +++ /dev/null @@ -1,22 +0,0 @@ -From eac1905c90085d3b9de3764078022643dd1b5ce9 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 14:37:49 -0700 -Subject: [PATCH] chromium: musl: include fcntl.h for loff_t - -Signed-off-by: Khem Raj ---- - chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -index bdbc4b7e3b..b53dd46c57 100644 ---- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -+++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -@@ -151,6 +151,7 @@ extern "C" { - #include - #include - #include -+#include - #include - #include - #include diff --git a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch new file mode 100644 index 00000000..c3b1cbb2 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch @@ -0,0 +1,23 @@ +From 314cfb7b41be8fc4f962956e0acd34f110114c6e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 14:54:38 -0700 +Subject: [PATCH] chromium: musl: linux != glibc, make the distinction + +Signed-off-by: Khem Raj +--- + chromium/base/allocator/allocator_check.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc +index 5a0564d2f3..8c2dc6491d 100644 +--- a/chromium/base/allocator/allocator_check.cc ++++ b/chromium/base/allocator/allocator_check.cc +@@ -21,7 +21,7 @@ bool IsAllocatorInitialized() { + #if defined(OS_WIN) && defined(ALLOCATOR_SHIM) + // Set by allocator_shim_win.cc when the shimmed _set_new_mode() is called. + return g_is_win_shim_layer_initialized; +-#elif defined(OS_LINUX) && defined(USE_TCMALLOC) && \ ++#elif defined(__GLIBC__) && defined(USE_TCMALLOC) && \ + !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) + // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h. + // TODO(primiano): replace with an include once base can depend on allocator. diff --git a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch new file mode 100644 index 00000000..550fd79e --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch @@ -0,0 +1,24 @@ +From bc3745992889e3dc3b42c890b6a458038c6994e0 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 15:09:02 -0700 +Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols + for musl + +Signed-off-by: Khem Raj +--- + chromium/base/allocator/allocator_shim.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc +index 95480ea4b6..1de3d1a532 100644 +--- a/chromium/base/allocator/allocator_shim.cc ++++ b/chromium/base/allocator/allocator_shim.cc +@@ -266,7 +266,7 @@ void ShimFree(void* address) { + // In the case of tcmalloc we also want to plumb into the glibc hooks + // to avoid that allocations made in glibc itself (e.g., strdup()) get + // accidentally performed on the glibc heap instead of the tcmalloc one. +-#if defined(USE_TCMALLOC) ++#if defined(USE_TCMALLOC) && defined(__GLIBC__) + #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h" + #endif + diff --git a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch deleted file mode 100644 index d15a63fd..00000000 --- a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 1690ac56cc013c3a18aa3c83e0efae47cc9da4f0 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 14:38:37 -0700 -Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t - -- only do the glibc 32-bit ABI check for mmap/mmap64 on gnu libc. musl - does not support the 32-bit ABI. - -Signed-off-by: Khem Raj ---- - .../third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h -index 715c045f66..edc8cf2db7 100644 ---- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h -+++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h -@@ -77,7 +77,7 @@ typedef off64_t __off64_t; - - static inline void* do_mmap64(void *start, size_t length, - int prot, int flags, -- int fd, __off64_t offset) __THROW { -+ int fd, off64_t offset) __THROW { - // The original gperftools uses sys_mmap() here. But, it is not allowed by - // Chromium's sandbox. - return (void *)syscall(SYS_mmap, start, length, prot, flags, fd, offset); -@@ -90,7 +90,7 @@ static inline void* do_mmap64(void *start, size_t length, - - static inline void* do_mmap64(void *start, size_t length, - int prot, int flags, -- int fd, __off64_t offset) __THROW { -+ int fd, off64_t offset) __THROW { - void *result; - - // Try mmap2() unless it's not supported -@@ -161,7 +161,7 @@ static inline void* do_mmap64(void *start, size_t length, - - extern "C" { - void* mmap64(void *start, size_t length, int prot, int flags, -- int fd, __off64_t offset ) __THROW -+ int fd, off64_t offset ) __THROW - ATTRIBUTE_SECTION(malloc_hook); - void* mmap(void *start, size_t length,int prot, int flags, - int fd, off_t offset) __THROW -@@ -178,7 +178,7 @@ extern "C" { - } - - extern "C" void* mmap64(void *start, size_t length, int prot, int flags, -- int fd, __off64_t offset) __THROW { -+ int fd, off64_t offset) __THROW { - MallocHook::InvokePreMmapHook(start, length, prot, flags, fd, offset); - void *result; - if (!MallocHook::InvokeMmapReplacement( -@@ -189,7 +189,7 @@ extern "C" void* mmap64(void *start, size_t length, int prot, int flags, - return result; - } - --# if !defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH) -+# if defined(__GLIBC__) && (!defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH)) - - extern "C" void* mmap(void *start, size_t length, int prot, int flags, - int fd, off_t offset) __THROW { diff --git a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch new file mode 100644 index 00000000..82a2ccc5 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch @@ -0,0 +1,24 @@ +From de4e672044de11c5927aeb42a554f5eced0abf6c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 15:12:39 -0700 +Subject: [PATCH] chromium: musl: Use correct member name __si_fields from + LinuxSigInfo + +Signed-off-by: Khem Raj +--- + chromium/sandbox/linux/seccomp-bpf/trap.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc +index 003708d2c8..0fef3148f9 100644 +--- a/chromium/sandbox/linux/seccomp-bpf/trap.cc ++++ b/chromium/sandbox/linux/seccomp-bpf/trap.cc +@@ -168,7 +168,7 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) { + // most versions of glibc don't include this information in siginfo_t. So, + // we need to explicitly copy it into a arch_sigsys structure. + struct arch_sigsys sigsys; +- memcpy(&sigsys, &info->_sifields, sizeof(sigsys)); ++ memcpy(&sigsys, &info->__si_fields, sizeof(sigsys)); + + #if defined(__mips__) + // When indirect syscall (syscall(__NR_foo, ...)) is made on Mips, the diff --git a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/0009-chromium-musl-linux-glibc-make-the-distinction.patch deleted file mode 100644 index 434d62cd..00000000 --- a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-linux-glibc-make-the-distinction.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 71072da07e963ae1b05f9d956ef715de8d249c5d Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 14:54:38 -0700 -Subject: [PATCH] chromium: musl: linux != glibc, make the distinction - -Signed-off-by: Khem Raj ---- - chromium/base/allocator/allocator_check.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc -index 5a0564d2f3..8c2dc6491d 100644 ---- a/chromium/base/allocator/allocator_check.cc -+++ b/chromium/base/allocator/allocator_check.cc -@@ -21,7 +21,7 @@ bool IsAllocatorInitialized() { - #if defined(OS_WIN) && defined(ALLOCATOR_SHIM) - // Set by allocator_shim_win.cc when the shimmed _set_new_mode() is called. - return g_is_win_shim_layer_initialized; --#elif defined(OS_LINUX) && defined(USE_TCMALLOC) && \ -+#elif defined(__GLIBC__) && defined(USE_TCMALLOC) && \ - !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) - // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h. - // TODO(primiano): replace with an include once base can depend on allocator. diff --git a/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch b/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch new file mode 100644 index 00000000..235e2cc8 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch @@ -0,0 +1,44 @@ +From e4d99e001315f1bb34e6ff6531c0a528640b76d8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 15:24:49 -0700 +Subject: [PATCH] chromium: musl: Match syscalls to match musl + +Signed-off-by: Khem Raj +--- + chromium/third_party/lss/linux_syscall_support.h | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h +index 9dbd2391b2..a715de177c 100644 +--- a/chromium/third_party/lss/linux_syscall_support.h ++++ b/chromium/third_party/lss/linux_syscall_support.h +@@ -793,6 +793,14 @@ struct kernel_statfs { + #endif + + ++#undef stat64 ++#undef fstat64 ++ ++#ifndef __NR_fstatat ++#define __NR_fstatat __NR_fstatat64 ++#endif ++ ++ + #if defined(__x86_64__) + #ifndef ARCH_SET_GS + #define ARCH_SET_GS 0x1001 +@@ -1210,6 +1218,14 @@ struct kernel_statfs { + #ifndef __NR_fallocate + #define __NR_fallocate 285 + #endif ++ ++#ifndef __NR_pread ++#define __NR_pread __NR_pread64 ++#endif ++#ifndef __NR_pwrite ++#define __NR_pwrite __NR_pwrite64 ++#endif ++ + /* End of x86-64 definitions */ + #elif defined(__mips__) + #if _MIPS_SIM == _MIPS_SIM_ABI32 diff --git a/recipes-qt/qt5/qtwebengine/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch deleted file mode 100644 index 4393103c..00000000 --- a/recipes-qt/qt5/qtwebengine/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 43384ce7ab1d3b14820cb9bc0698130be9291a8e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 15:09:02 -0700 -Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols - for musl - -Signed-off-by: Khem Raj ---- - chromium/base/allocator/allocator_shim.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc -index af08ec039f..15070b9a13 100644 ---- a/chromium/base/allocator/allocator_shim.cc -+++ b/chromium/base/allocator/allocator_shim.cc -@@ -244,7 +244,7 @@ void ShimFree(void* address) { - // In the case of tcmalloc we also want to plumb into the glibc hooks - // to avoid that allocations made in glibc itself (e.g., strdup()) get - // accidentally performed on the glibc heap instead of the tcmalloc one. --#if defined(USE_TCMALLOC) -+#if defined(USE_TCMALLOC) && defined(__GLIBC__) - #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h" - #endif - diff --git a/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch new file mode 100644 index 00000000..da0858a3 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch @@ -0,0 +1,79 @@ +From 80953719539b60ea6a908710d4bb7cb78acc6920 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 15:27:50 -0700 +Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc + platforms + +Signed-off-by: Khem Raj +--- + chromium/net/dns/dns_config_service_posix.cc | 4 ++++ + chromium/net/dns/dns_reloader.cc | 4 ++++ + chromium/net/dns/resolv_compat.h | 29 ++++++++++++++++++++++++++++ + 3 files changed, 37 insertions(+) + create mode 100644 chromium/net/dns/resolv_compat.h + +diff --git a/chromium/net/dns/dns_config_service_posix.cc b/chromium/net/dns/dns_config_service_posix.cc +index ba8a369133..e9b40d07fc 100644 +--- a/chromium/net/dns/dns_config_service_posix.cc ++++ b/chromium/net/dns/dns_config_service_posix.cc +@@ -25,6 +25,10 @@ + #include "net/dns/notify_watcher_mac.h" + #include "net/dns/serial_worker.h" + ++#if defined(OS_LINUX) && !defined(__GLIBC__) ++#include "net/dns/resolv_compat.h" ++#endif ++ + #if defined(OS_MACOSX) && !defined(OS_IOS) + #include "net/dns/dns_config_watcher_mac.h" + #endif +diff --git a/chromium/net/dns/dns_reloader.cc b/chromium/net/dns/dns_reloader.cc +index 74534e6b1b..2780a776e4 100644 +--- a/chromium/net/dns/dns_reloader.cc ++++ b/chromium/net/dns/dns_reloader.cc +@@ -9,6 +9,10 @@ + + #include + ++#if defined(OS_LINUX) && !defined(__GLIBC__) ++#include "net/dns/resolv_compat.h" ++#endif ++ + #include "base/lazy_instance.h" + #include "base/logging.h" + #include "base/macros.h" +diff --git a/chromium/net/dns/resolv_compat.h b/chromium/net/dns/resolv_compat.h +new file mode 100644 +index 0000000000..4f0e852a19 +--- /dev/null ++++ b/chromium/net/dns/resolv_compat.h +@@ -0,0 +1,29 @@ ++#if !defined(__GLIBC__) ++/*************************************************************************** ++ * resolv_compat.h ++ * ++ * Mimick GLIBC's res_ninit() and res_nclose() for musl libc ++ * Note: res_init() is actually deprecated according to ++ * http://docs.oracle.com/cd/E36784_01/html/E36875/res-nclose-3resolv.html ++ **************************************************************************/ ++#include ++ ++static inline int res_ninit(res_state statp) ++{ ++ int rc = res_init(); ++ if (statp != &_res) { ++ memcpy(statp, &_res, sizeof(*statp)); ++ } ++ return rc; ++} ++ ++static inline int res_nclose(res_state statp) ++{ ++ if (!statp) ++ return -1; ++ if (statp != &_res) { ++ memset(statp, 0, sizeof(*statp)); ++ } ++ return 0; ++} ++#endif diff --git a/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch deleted file mode 100644 index 04e0012a..00000000 --- a/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 701bb2640d5e5b03e8e019600a076c93508e1541 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 15:12:39 -0700 -Subject: [PATCH] chromium: musl: Use correct member name __si_fields from - LinuxSigInfo - -Signed-off-by: Khem Raj ---- - chromium/sandbox/linux/seccomp-bpf/trap.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc -index 003708d2c8..0fef3148f9 100644 ---- a/chromium/sandbox/linux/seccomp-bpf/trap.cc -+++ b/chromium/sandbox/linux/seccomp-bpf/trap.cc -@@ -168,7 +168,7 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) { - // most versions of glibc don't include this information in siginfo_t. So, - // we need to explicitly copy it into a arch_sigsys structure. - struct arch_sigsys sigsys; -- memcpy(&sigsys, &info->_sifields, sizeof(sigsys)); -+ memcpy(&sigsys, &info->__si_fields, sizeof(sigsys)); - - #if defined(__mips__) - // When indirect syscall (syscall(__NR_foo, ...)) is made on Mips, the diff --git a/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch new file mode 100644 index 00000000..16705e52 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch @@ -0,0 +1,26 @@ +From 0b4922e1ed4b7f4e7ada7a840dec067f05c8e9f7 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 15:39:57 -0700 +Subject: [PATCH] chromium: musl: Do not define __sbrk on musl + +musl libc does not have sbrk. on musl libc will only work when called with 0 as +argument, so we just let it out for now + +Signed-off-by: Khem Raj +--- + chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h +index edc8cf2db7..a868b50d30 100644 +--- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h ++++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h +@@ -233,7 +233,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size, + } + + // Don't hook sbrk() in Android, since it doesn't expose __sbrk. +-#if !defined(__ANDROID__) ++#if !defined(__ANDROID__) && defined(__GLIBC__) + // libc's version: + extern "C" void* __sbrk(ptrdiff_t increment); + diff --git a/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Match-syscalls-to-match-musl.patch b/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Match-syscalls-to-match-musl.patch deleted file mode 100644 index b5a0f849..00000000 --- a/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Match-syscalls-to-match-musl.patch +++ /dev/null @@ -1,44 +0,0 @@ -From ad184ecc5e5e67d1f3862e9ed3f767dff9bbc414 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 15:24:49 -0700 -Subject: [PATCH] chromium: musl: Match syscalls to match musl - -Signed-off-by: Khem Raj ---- - chromium/third_party/lss/linux_syscall_support.h | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h -index 8a42c1c868..8e878c70f2 100644 ---- a/chromium/third_party/lss/linux_syscall_support.h -+++ b/chromium/third_party/lss/linux_syscall_support.h -@@ -717,6 +717,14 @@ struct kernel_statfs { - #endif - - -+#undef stat64 -+#undef fstat64 -+ -+#ifndef __NR_fstatat -+#define __NR_fstatat __NR_fstatat64 -+#endif -+ -+ - #if defined(__x86_64__) - #ifndef ARCH_SET_GS - #define ARCH_SET_GS 0x1001 -@@ -1134,6 +1142,14 @@ struct kernel_statfs { - #ifndef __NR_fallocate - #define __NR_fallocate 285 - #endif -+ -+#ifndef __NR_pread -+#define __NR_pread __NR_pread64 -+#endif -+#ifndef __NR_pwrite -+#define __NR_pwrite __NR_pwrite64 -+#endif -+ - /* End of x86-64 definitions */ - #elif defined(__mips__) - #if _MIPS_SIM == _MIPS_SIM_ABI32 diff --git a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Adjust-default-pthread-stack-size.patch new file mode 100644 index 00000000..82e49f6f --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Adjust-default-pthread-stack-size.patch @@ -0,0 +1,47 @@ +From 54cf1a5476fac8b7d5a18742a63abdec788989a7 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 16:41:23 -0700 +Subject: [PATCH] chromium: musl: Adjust default pthread stack size + +Signed-off-by: Khem Raj +--- + chromium/base/threading/platform_thread_linux.cc | 3 ++- + chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp | 4 ++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc +index 92fbda5ee1..c41579d4ed 100644 +--- a/chromium/base/threading/platform_thread_linux.cc ++++ b/chromium/base/threading/platform_thread_linux.cc +@@ -175,7 +175,8 @@ void TerminateOnThread() {} + + size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { + #if !defined(THREAD_SANITIZER) +- return 0; ++ // use 8mb like glibc to avoid running out of space ++ return (1 << 23); + #else + // ThreadSanitizer bloats the stack heavily. Evidence has been that the + // default stack size isn't enough for some browser tests. +diff --git a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp +index 1d164f510a..3358deb256 100644 +--- a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp ++++ b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp +@@ -68,7 +68,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() { + // FIXME: On Mac OSX and Linux, this method cannot estimate stack size + // correctly for the main thread. + +-#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + // pthread_getattr_np() can fail if the thread is not invoked by + // pthread_create() (e.g., the main thread of webkit_unit_tests). + // If so, a conservative size estimate is returned. +@@ -135,7 +135,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() { + } + + void* StackFrameDepth::getStackStart() { +-#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + pthread_attr_t attr; + int error; + #if OS(FREEBSD) diff --git a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch deleted file mode 100644 index 68b8f45d..00000000 --- a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch +++ /dev/null @@ -1,79 +0,0 @@ -From c892406f07b4e214397c55de62eccac3d558b134 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 15:27:50 -0700 -Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc - platforms - -Signed-off-by: Khem Raj ---- - chromium/net/dns/dns_config_service_posix.cc | 4 ++++ - chromium/net/dns/dns_reloader.cc | 4 ++++ - chromium/net/dns/resolv_compat.h | 29 ++++++++++++++++++++++++++++ - 3 files changed, 37 insertions(+) - create mode 100644 chromium/net/dns/resolv_compat.h - -diff --git a/chromium/net/dns/dns_config_service_posix.cc b/chromium/net/dns/dns_config_service_posix.cc -index ba8a369133..e9b40d07fc 100644 ---- a/chromium/net/dns/dns_config_service_posix.cc -+++ b/chromium/net/dns/dns_config_service_posix.cc -@@ -25,6 +25,10 @@ - #include "net/dns/notify_watcher_mac.h" - #include "net/dns/serial_worker.h" - -+#if defined(OS_LINUX) && !defined(__GLIBC__) -+#include "net/dns/resolv_compat.h" -+#endif -+ - #if defined(OS_MACOSX) && !defined(OS_IOS) - #include "net/dns/dns_config_watcher_mac.h" - #endif -diff --git a/chromium/net/dns/dns_reloader.cc b/chromium/net/dns/dns_reloader.cc -index 74534e6b1b..2780a776e4 100644 ---- a/chromium/net/dns/dns_reloader.cc -+++ b/chromium/net/dns/dns_reloader.cc -@@ -9,6 +9,10 @@ - - #include - -+#if defined(OS_LINUX) && !defined(__GLIBC__) -+#include "net/dns/resolv_compat.h" -+#endif -+ - #include "base/lazy_instance.h" - #include "base/logging.h" - #include "base/macros.h" -diff --git a/chromium/net/dns/resolv_compat.h b/chromium/net/dns/resolv_compat.h -new file mode 100644 -index 0000000000..4f0e852a19 ---- /dev/null -+++ b/chromium/net/dns/resolv_compat.h -@@ -0,0 +1,29 @@ -+#if !defined(__GLIBC__) -+/*************************************************************************** -+ * resolv_compat.h -+ * -+ * Mimick GLIBC's res_ninit() and res_nclose() for musl libc -+ * Note: res_init() is actually deprecated according to -+ * http://docs.oracle.com/cd/E36784_01/html/E36875/res-nclose-3resolv.html -+ **************************************************************************/ -+#include -+ -+static inline int res_ninit(res_state statp) -+{ -+ int rc = res_init(); -+ if (statp != &_res) { -+ memcpy(statp, &_res, sizeof(*statp)); -+ } -+ return rc; -+} -+ -+static inline int res_nclose(res_state statp) -+{ -+ if (!statp) -+ return -1; -+ if (statp != &_res) { -+ memset(statp, 0, sizeof(*statp)); -+ } -+ return 0; -+} -+#endif diff --git a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch deleted file mode 100644 index c9801899..00000000 --- a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch +++ /dev/null @@ -1,26 +0,0 @@ -From be624e7cc1bc18e9e198bba16fcb224a7f9746fc Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 15:39:57 -0700 -Subject: [PATCH] chromium: musl: Do not define __sbrk on musl - -musl libc does not have sbrk. on musl libc will only work when called with 0 as -argument, so we just let it out for now - -Signed-off-by: Khem Raj ---- - chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h -index edc8cf2db7..a868b50d30 100644 ---- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h -+++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h -@@ -233,7 +233,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size, - } - - // Don't hook sbrk() in Android, since it doesn't expose __sbrk. --#if !defined(__ANDROID__) -+#if !defined(__ANDROID__) && defined(__GLIBC__) - // libc's version: - extern "C" void* __sbrk(ptrdiff_t increment); - diff --git a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch new file mode 100644 index 00000000..ac3afbf7 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch @@ -0,0 +1,22 @@ +From 77bac704279103e74d8d7d35c933517dcfb9b7fc Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 17:15:34 -0700 +Subject: [PATCH] chromium: musl: include asm-generic/ioctl.h for TCGETS2 + +Signed-off-by: Khem Raj +--- + chromium/device/serial/serial_io_handler_posix.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/chromium/device/serial/serial_io_handler_posix.cc b/chromium/device/serial/serial_io_handler_posix.cc +index a2ca2e2309..e139cdf9e9 100644 +--- a/chromium/device/serial/serial_io_handler_posix.cc ++++ b/chromium/device/serial/serial_io_handler_posix.cc +@@ -6,6 +6,7 @@ + + #include + #include ++#include + + #include "base/files/file_util.h" + #include "base/posix/eintr_wrapper.h" diff --git a/recipes-qt/qt5/qtwebengine/0015-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/0015-chromium-musl-Adjust-default-pthread-stack-size.patch deleted file mode 100644 index 997e3124..00000000 --- a/recipes-qt/qt5/qtwebengine/0015-chromium-musl-Adjust-default-pthread-stack-size.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 295fd835b22203807962a3eea08a12b74ae54c2c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 16:41:23 -0700 -Subject: [PATCH] chromium: musl: Adjust default pthread stack size - -Signed-off-by: Khem Raj ---- - chromium/base/threading/platform_thread_linux.cc | 3 ++- - chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp | 4 ++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc -index 95ed32418f..666e85ba33 100644 ---- a/chromium/base/threading/platform_thread_linux.cc -+++ b/chromium/base/threading/platform_thread_linux.cc -@@ -96,7 +96,8 @@ void TerminateOnThread() {} - - size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { - #if !defined(THREAD_SANITIZER) -- return 0; -+ // use 8mb like glibc to avoid running out of space -+ return (1 << 23); - #else - // ThreadSanitizer bloats the stack heavily. Evidence has been that the - // default stack size isn't enough for some browser tests. -diff --git a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp -index 3c0a0395b1..2af6073e21 100644 ---- a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp -+++ b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp -@@ -73,7 +73,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() - // FIXME: On Mac OSX and Linux, this method cannot estimate stack size - // correctly for the main thread. - --#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) -+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) - // pthread_getattr_np() can fail if the thread is not invoked by - // pthread_create() (e.g., the main thread of webkit_unit_tests). - // If so, a conservative size estimate is returned. -@@ -135,7 +135,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() - - void* StackFrameDepth::getStackStart() - { --#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) -+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) - pthread_attr_t attr; - int error; - #if OS(FREEBSD) diff --git a/recipes-qt/qt5/qtwebengine/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch b/recipes-qt/qt5/qtwebengine/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch new file mode 100644 index 00000000..668697cb --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch @@ -0,0 +1,23 @@ +From 27690efdf920cafeab96f70eec0c66803c908cd4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 8 Jul 2017 09:08:23 -0700 +Subject: [PATCH] chromium: musl: tcmalloc: Use off64_t insread of __off64_t + +Signed-off-by: Khem Raj +--- + chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +index 91f77dd88d..bb84a0b305 100644 +--- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h ++++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +@@ -1929,7 +1929,7 @@ typedef unsigned long int ulong; + #if defined(__x86_64__) + /* Need to make sure __off64_t isn't truncated to 32-bits under x32. */ + LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d, +- __off64_t o) { ++ off64_t o) { + LSS_BODY(6, void*, mmap, LSS_SYSCALL_ARG(s), LSS_SYSCALL_ARG(l), + LSS_SYSCALL_ARG(p), LSS_SYSCALL_ARG(f), + LSS_SYSCALL_ARG(d), (uint64_t)(o)); diff --git a/recipes-qt/qt5/qtwebengine/0016-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch b/recipes-qt/qt5/qtwebengine/0016-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch deleted file mode 100644 index 2e80de8c..00000000 --- a/recipes-qt/qt5/qtwebengine/0016-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 91d9e3476c6432ae9ea8f8c0a9f6c435be844da0 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 17:15:34 -0700 -Subject: [PATCH] chromium: musl: include asm-generic/ioctl.h for TCGETS2 - -Signed-off-by: Khem Raj ---- - chromium/device/serial/serial_io_handler_posix.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/chromium/device/serial/serial_io_handler_posix.cc b/chromium/device/serial/serial_io_handler_posix.cc -index 158c374a03..c08fb4a8ec 100644 ---- a/chromium/device/serial/serial_io_handler_posix.cc -+++ b/chromium/device/serial/serial_io_handler_posix.cc -@@ -6,6 +6,7 @@ - - #include - #include -+#include - - #include "base/posix/eintr_wrapper.h" - #include "build/build_config.h" diff --git a/recipes-qt/qt5/qtwebengine/0017-chromium-musl-link-with-libexecinfo-on-musl.patch b/recipes-qt/qt5/qtwebengine/0017-chromium-musl-link-with-libexecinfo-on-musl.patch deleted file mode 100644 index 5e28adb7..00000000 --- a/recipes-qt/qt5/qtwebengine/0017-chromium-musl-link-with-libexecinfo-on-musl.patch +++ /dev/null @@ -1,22 +0,0 @@ -From a8163b060b699aa6678c45c970f4fbc806a6c198 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 17:41:43 -0700 -Subject: [PATCH] chromium: musl: link with libexecinfo on musl - -Signed-off-by: Khem Raj ---- - chromium/base/base.gyp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/chromium/base/base.gyp b/chromium/base/base.gyp -index 3c3aded640..347b7e7856 100644 ---- a/chromium/base/base.gyp -+++ b/chromium/base/base.gyp -@@ -126,6 +126,7 @@ - '-lrt', - # For 'native_library_linux.cc' - '-ldl', -+ '-lexecinfo', - ], - }, - 'conditions': [ diff --git a/recipes-qt/qt5/qtwebengine/0018-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch b/recipes-qt/qt5/qtwebengine/0018-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch deleted file mode 100644 index fe141aa8..00000000 --- a/recipes-qt/qt5/qtwebengine/0018-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d05c22bdabe10c0db9b65252e442251efc81a379 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 8 Jul 2017 09:08:23 -0700 -Subject: [PATCH] chromium: musl: tcmalloc: Use off64_t insread of __off64_t - -Signed-off-by: Khem Raj ---- - chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -index b53dd46c57..58da4d19d7 100644 ---- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -+++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -@@ -1930,7 +1930,7 @@ typedef unsigned long int ulong; - #if defined(__x86_64__) - /* Need to make sure __off64_t isn't truncated to 32-bits under x32. */ - LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d, -- __off64_t o) { -+ off64_t o) { - LSS_BODY(6, void*, mmap, LSS_SYSCALL_ARG(s), LSS_SYSCALL_ARG(l), - LSS_SYSCALL_ARG(p), LSS_SYSCALL_ARG(f), - LSS_SYSCALL_ARG(d), (uint64_t)(o)); diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index ab293a96..19583f91 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -14,6 +14,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += " \ ninja-native \ + yasm-native \ qtwebchannel \ qtbase qtdeclarative qtxmlpatterns qtquickcontrols \ qtlocation \ @@ -31,6 +32,7 @@ EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm \ 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 @@ -42,7 +44,7 @@ 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" +PACKAGECONFIG ??= "libwebp flac libevent libxslt speex nss" PACKAGECONFIG[opus] = "WEBENGINE_CONFIG+=use_system_opus,,libopus" PACKAGECONFIG[icu] = "WEBENGINE_CONFIG+=use_system_icu,,icu" PACKAGECONFIG[ffmpeg] = "WEBENGINE_CONFIG+=use_system_ffmpeg,,libav" @@ -53,6 +55,7 @@ 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}" @@ -76,30 +79,29 @@ def gettext_oeconf(d): require qt5.inc require qt5-git.inc -export NINJA_PATH="${STAGING_BINDIR_NATIVE}/ninja" - do_configure() { - # replace LD with CXX, to workaround a possible gyp inheritssue? - export LD="${CXX}" - export CC="${CC}" - export CXX="${CXX}" - export CC_host="gcc" - export CXX_host="g++" - export QMAKE_MAKE_ARGS="${EXTRA_OEMAKE}" - export QMAKE_CACHE_EVAL="${PACKAGECONFIG_CONFARGS}" - # Disable autodetection from sysroot: - sed -i 's/packagesExist([^)]*vpx[^)]*):/false:/g; s/config_libvpx:/false:/g; s/config_srtp:/false:/g; s/config_snappy:/false:/g; s/packagesExist(nss):/false:/g; s/packagesExist(minizip, zlib):/false:/g; s/packagesExist(libwebp,libwebpdemux):/false:/g; s/packagesExist(libxml-2.0,libxslt):/false:/g; s/^ *packagesExist($$package):/false:/g' ${S}/tools/qmake/mkspecs/features/configure.prf + sed -e 's/packagesExist([^)]*vpx[^)]*):/false:/g'\ + -e 's/config_libvpx:/false:/g' \ + -e 's/config_srtp:/false:/g' \ + -e 's/config_snappy:/false:/g' \ + -e 's/packagesExist(nss):/false:/g' \ + -e 's/packagesExist(minizip, zlib):/false:/g' \ + -e 's/packagesExist(libwebp,libwebpdemux):/false:/g' \ + -e 's/packagesExist(libxml-2.0,libxslt):/false:/g'\ + -e 's/^ *packagesExist($$package):/false:/g' \ + -i ${S}/mkspecs/features/configure.prf # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as # arguments here - ${OE_QMAKE_QMAKE} -r ${EXTRA_QMAKEVARS_PRE} ${S} \ - QMAKE_CXX="${OE_QMAKE_CXX}" QMAKE_CC="${OE_QMAKE_CC}" \ + ${OE_QMAKE_QMAKE} ${EXTRA_QMAKEVARS_PRE} ${S} \ + QMAKE_CXX="${OE_QMAKE_CXX}" \ + QMAKE_CC="${OE_QMAKE_CC}" \ QMAKE_LINK="${OE_QMAKE_LINK}" \ QMAKE_CFLAGS="${OE_QMAKE_CFLAGS}" \ QMAKE_CXXFLAGS="${OE_QMAKE_CXXFLAGS}" \ - QMAKE_AR="${OE_QMAKE_AR} cqs" \ - -after ${EXTRA_QMAKEVARS_POST} + -after ${EXTRA_QMAKEVARS_POST} -- \ + ${EXTRA_QMAKEVARS_CONFIGURE} } do_configure_prepend_libc-musl() { @@ -112,8 +114,7 @@ do_configure_prepend_libc-musl() { do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+" do_install_append() { - rmdir ${D}${OE_QMAKE_PATH_PLUGINS}/${BPN} ${D}${OE_QMAKE_PATH_PLUGINS} || true - sed -i 's@ -Wl,--start-group.*-Wl,--end-group@@g; s@-L${B}[^ ]* @ @g' ${D}${libdir}/pkgconfig/Qt5WebEngineCore.pc + sed -i 's@ -Wl,--start-group.*-Wl,--end-group@@g; s@[^ ]*${B}[^ ]* @@g' ${D}${libdir}/pkgconfig/Qt5WebEngineCore.pc } PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" @@ -126,39 +127,36 @@ RDEPENDS_${PN}-examples += " \ qtdeclarative-qmlplugins \ " -QT_MODULE_BRANCH_CHROMIUM = "53-based" +QT_MODULE_BRANCH_CHROMIUM = "56-based" SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ - file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ - file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \ - file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ - file://0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ - file://0005-Include-dependency-to-QCoreApplication-translate.patch \ - file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch;patchdir=src/3rdparty \ - file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \ - file://0003-chromium-v8-fix-build-with-gcc7.patch;patchdir=src/3rdparty \ - file://0004-chromium-WebKit-fix-build-with-gcc7.patch;patchdir=src/3rdparty \ + 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://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 \ " + SRC_URI_append_libc-musl = "\ - file://0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ - file://0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ - file://0007-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ - file://0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ - file://0009-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ - file://0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ - file://0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \ - file://0012-chromium-musl-Match-syscalls-to-match-musl.patch;patchdir=src/3rdparty \ - file://0013-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ - file://0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ - file://0015-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ - file://0016-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \ - file://0017-chromium-musl-link-with-libexecinfo-on-musl.patch;patchdir=src/3rdparty \ - file://0018-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ + file://0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ + file://0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ + file://0005-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ + file://0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ + file://0007-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ + file://0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ + file://0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \ + file://0010-chromium-musl-Match-syscalls-to-match-musl.patch;patchdir=src/3rdparty \ + file://0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ + file://0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ + file://0013-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ + file://0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \ + file://0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "d740d6a7dbfec387752c7bc8a8b06db0e757c9dc" -SRCREV_chromium = "15d257fd921f37b32ef643225f21df0ea24c8302" +SRCREV_qtwebengine = "73f7be5b2a95eab3dce11caede538eeb7beb71f2" +SRCREV_chromium = "aa2fdd6be3d465280d2a0c3aacdc738bb4ffec05" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb index 84b4d0ba..286aecae 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb @@ -17,4 +17,4 @@ DEPENDS += "qtwebkit qtxmlpatterns" RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" -SRCREV = "f0898f83abdcacc8bd3bca3479884376b0963398" +SRCREV = "822426abc77a74752b0ee0da4d0a1c106c4dac22" diff --git a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch b/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch deleted file mode 100644 index d7627ec2..00000000 --- a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch +++ /dev/null @@ -1,76 +0,0 @@ -From f6989fec34f0bafdeda549d71751f236ef1f3b96 Mon Sep 17 00:00:00 2001 -From: Magnus Granberg -Date: Fri, 27 Feb 2015 11:55:09 +0100 -Subject: [PATCH] Remove TEXTREL tag in x86 - -Fix textrel QA warnings when building qtwebkit for x86: - - WARNING: QA Issue: ELF binary '/home/andre/rdk/rdk-master/build-vbox32/tmp/work/core2-32-rdk-linux/qtwebkit/5.4.0-r0/packages-split/qtwebkit/usr/lib/libQt5WebKit.so.5.4.0' has relocations in .text [textrel] - -Patch from upstream webkit: - - https://bugs.webkit.org/show_bug.cgi?id=70610 - -Minor refresh required to apply cleanly to the older webkit sources used -by qtwebkit. Specifically, the patch needed to be modified to account -for PLATFORM(MAC) -> OS(DARWIN) renaming in recent webkit which is not -part of qtwebkit yet ( https://bugs.webkit.org/show_bug.cgi?id=99683 ). - -Upstream status [webkit] : backport -Upstream status [qtwebkit] : unclear - -Bug: https://bugs.webkit.org/show_bug.cgi?id=70610 -Signed-off-by: Martin Jansa ---- - Source/JavaScriptCore/jit/ThunkGenerators.cpp | 24 ++++++++++++++++++++++++ - Source/WTF/wtf/InlineASM.h | 2 ++ - 2 files changed, 26 insertions(+) - -diff --git a/Source/JavaScriptCore/jit/ThunkGenerators.cpp b/Source/JavaScriptCore/jit/ThunkGenerators.cpp -index 9684df2..8af82d8 100644 ---- a/Source/JavaScriptCore/jit/ThunkGenerators.cpp -+++ b/Source/JavaScriptCore/jit/ThunkGenerators.cpp -@@ -524,6 +524,30 @@ double jsRound(double d) - } \ - static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk; - -+#elif CPU(X86) && COMPILER(GCC) && OS(LINUX) && defined(__PIC__) -+#define defineUnaryDoubleOpWrapper(function) \ -+ asm( \ -+ ".text\n" \ -+ ".globl " SYMBOL_STRING(function##Thunk) "\n" \ -+ HIDE_SYMBOL(function##Thunk) "\n" \ -+ SYMBOL_STRING(function##Thunk) ":" "\n" \ -+ "pushl %ebx\n" \ -+ "subl $20, %esp\n" \ -+ "movsd %xmm0, (%esp) \n" \ -+ "call __x86.get_pc_thunk.bx\n" \ -+ "addl $_GLOBAL_OFFSET_TABLE_, %ebx\n" \ -+ "call " GLOBAL_REFERENCE(function) "\n" \ -+ "fstpl (%esp) \n" \ -+ "movsd (%esp), %xmm0 \n" \ -+ "addl $20, %esp\n" \ -+ "popl %ebx\n" \ -+ "ret\n" \ -+ );\ -+ extern "C" { \ -+ MathThunkCallingConvention function##Thunk(MathThunkCallingConvention); \ -+ } \ -+ static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk; -+ - #elif CPU(X86) && COMPILER(GCC) && (PLATFORM(MAC) || OS(LINUX)) - #define defineUnaryDoubleOpWrapper(function) \ - asm( \ -diff --git a/Source/WTF/wtf/InlineASM.h b/Source/WTF/wtf/InlineASM.h -index 0a2fe78..2dc40ef 100644 ---- a/Source/WTF/wtf/InlineASM.h -+++ b/Source/WTF/wtf/InlineASM.h -@@ -46,6 +46,8 @@ - #define GLOBAL_REFERENCE(name) #name "@plt" - #elif CPU(X86) && COMPILER(MINGW) - #define GLOBAL_REFERENCE(name) "@" #name "@4" -+#elif OS(LINUX) && CPU(X86) && defined(__PIC__) -+#define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) "@plt" - #else - #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) - #endif diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 3c52ef3c..5c1ecfa8 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -20,7 +20,6 @@ ARM_INSTRUCTION_SET_armv5 = "arm" SRC_URI += "\ file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \ - file://0002-Remove-TEXTREL-tag-in-x86.patch \ file://0003-Exclude-backtrace-API-for-non-glibc-libraries.patch \ file://0004-Fix-compilation-with-ICU-59.patch \ " @@ -87,4 +86,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" -SRCREV = "74ac5b0f3489f9a08d083b6c9607c9d5c2d4afd2" +SRCREV = "f27089657a207ef8c5c9d27d661d3d12c3af8df2" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 043b394e..41ec27f6 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "afb3c58d035db1119666c8556c215187be4f64b8" +SRCREV = "1421c3e4ae4213ca18f2f51d5ddb38e223450222" diff --git a/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch b/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch new file mode 100644 index 00000000..82087b9a --- /dev/null +++ b/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch @@ -0,0 +1,22 @@ +From b946b6ea4a2a30bd12ecd036e40c9ef671681ba8 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Fri, 2 Jun 2017 13:12:18 +0300 +Subject: [PATCH] Add missing include for qWarning + +Change-Id: I7c7699e7a2b7ce59e4f659d460ec835f59bba439 +--- + src/webview/qquickwebview.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/webview/qquickwebview.cpp b/src/webview/qquickwebview.cpp +index d760564..fbbbfd6 100644 +--- a/src/webview/qquickwebview.cpp ++++ b/src/webview/qquickwebview.cpp +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + + namespace { + diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb new file mode 100644 index 00000000..d48b6c42 --- /dev/null +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -0,0 +1,24 @@ +LICENSE = "GFDL-1.3 & BSD & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial" +LIC_FILES_CHKSUM = " \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ + file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ + file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ + file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ +" + +require qt5.inc +require qt5-git.inc + +SRC_URI += "file://0001-Add-missing-include-for-qWarning.patch" + +DEPENDS += "qtbase qtwebengine" + +COMPATIBLE_MACHINE = "(-)" +COMPATIBLE_MACHINE_x86 = "(.*)" +COMPATIBLE_MACHINE_x86-64 = "(.*)" +COMPATIBLE_MACHINE_armv6 = "(.*)" +COMPATIBLE_MACHINE_armv7a = "(.*)" +COMPATIBLE_MACHINE_armv7ve = "(.*)" +COMPATIBLE_MACHINE_aarch64 = "(.*)" + +SRCREV = "6e55abf3b6a5f373cd4b649c2318a45c49b40589" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 81c72ec8..bf03e9bb 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "54cc3158acfc75d12338df3b678e013909e66f60" +SRCREV = "9e83ff8713c1a3f69ce514bf3e31335194668da7" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 9333be0b..30e52629 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "9f7e01b582b1bd83cc6b8a854c510871335e2e74" +SRCREV = "c1c3af0ae456247c9bcd30161d51a94c9b38dc52" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3 From a0b2220b5e08a7914d55afec0ff6e2316cb47404 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 19 Aug 2017 11:24:55 +0200 Subject: qtwebengine: add a fix for building demobrowser without printing support Signed-off-by: Martin Jansa --- .../0005-Always-compile-QWebEnginePage-print.patch | 241 +++++++++++++++++++++ recipes-qt/qt5/qtwebengine_git.bb | 6 + 2 files changed, 247 insertions(+) create mode 100644 recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch diff --git a/recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch b/recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch new file mode 100644 index 00000000..c63086d5 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch @@ -0,0 +1,241 @@ +From a8c0deca850ca519b3f146c71492a8f42a33dd84 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=BCri=20Valdmann?= +Date: Tue, 20 Jun 2017 15:36:43 +0200 +Subject: [PATCH] Always compile QWebEnginePage::print + +- Remove two out of five layers of ifdefs around and inside this method. +- Now always compiled but will yield an error if printing is disabled. +- Remove printing-related ifdefs from demobrowser. + +Task-number: QTBUG-61510 +Change-Id: I79781189d3d3fb62db0a2216b2b989e3fa1d1f86 +Reviewed-by: Allan Sandfeld Jensen +Reviewed-by: Rolf Eike Beer +--- + examples/webenginewidgets/demobrowser/browsermainwindow.cpp | 12 ------------ + examples/webenginewidgets/demobrowser/browsermainwindow.h | 6 ------ + examples/webenginewidgets/demobrowser/printtopdfdialog.cpp | 7 ------- + src/webenginewidgets/api/qwebenginepage.cpp | 10 ++-------- + src/webenginewidgets/api/qwebenginepage.h | 8 -------- + 5 files changed, 2 insertions(+), 41 deletions(-) + +diff --git a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp +index 327d7a9d..14d49f7f 100644 +--- a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp ++++ b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp +@@ -109,9 +109,7 @@ BrowserMainWindow::BrowserMainWindow(QWidget *parent, Qt::WindowFlags flags) + , m_historyForward(0) + , m_stop(0) + , m_reload(0) +-#ifndef QT_NO_PRINTER + , m_currentPrinter(nullptr) +-#endif + { + setToolButtonStyle(Qt::ToolButtonFollowStyle); + setAttribute(Qt::WA_DeleteOnClose, true); +@@ -312,9 +310,7 @@ void BrowserMainWindow::setupMenu() + #if defined(QWEBENGINEPAGE_PRINT) + fileMenu->addAction(tr("P&rint Preview..."), this, SLOT(slotFilePrintPreview())); + #endif +-#ifndef QT_NO_PRINTER + fileMenu->addAction(tr("&Print..."), this, SLOT(slotFilePrint()), QKeySequence::Print); +-#endif + fileMenu->addAction(tr("&Print to PDF..."), this, SLOT(slotFilePrintToPDF())); + fileMenu->addSeparator(); + +@@ -702,23 +698,19 @@ void BrowserMainWindow::slotFileOpen() + + void BrowserMainWindow::slotFilePrintPreview() + { +-#ifndef QT_NO_PRINTPREVIEWDIALOG + if (!currentTab()) + return; + QPrintPreviewDialog *dialog = new QPrintPreviewDialog(this); + connect(dialog, SIGNAL(paintRequested(QPrinter*)), + currentTab(), SLOT(print(QPrinter*))); + dialog->exec(); +-#endif + } + + void BrowserMainWindow::slotFilePrint() + { +-#ifndef QT_NO_PRINTER + if (!currentTab()) + return; + printRequested(currentTab()->page()); +-#endif + } + + void BrowserMainWindow::slotHandlePdfPrinted(const QByteArray& result) +@@ -751,7 +743,6 @@ void BrowserMainWindow::slotFilePrintToPDF() + currentTab()->page()->printToPdf(invoke(this, &BrowserMainWindow::slotHandlePdfPrinted), dialog->pageLayout()); + } + +-#ifndef QT_NO_PRINTER + void BrowserMainWindow::slotHandlePagePrinted(bool result) + { + Q_UNUSED(result); +@@ -763,7 +754,6 @@ void BrowserMainWindow::slotHandlePagePrinted(bool result) + + void BrowserMainWindow::printRequested(QWebEnginePage *page) + { +-#ifndef QT_NO_PRINTDIALOG + if (m_currentPrinter) + return; + m_currentPrinter = new QPrinter(); +@@ -774,9 +764,7 @@ void BrowserMainWindow::printRequested(QWebEnginePage *page) + return; + } + page->print(m_currentPrinter, invoke(this, &BrowserMainWindow::slotHandlePagePrinted)); +-#endif + } +-#endif + + void BrowserMainWindow::slotPrivateBrowsing() + { +diff --git a/examples/webenginewidgets/demobrowser/browsermainwindow.h b/examples/webenginewidgets/demobrowser/browsermainwindow.h +index 91e1c1d2..5bbbb292 100644 +--- a/examples/webenginewidgets/demobrowser/browsermainwindow.h ++++ b/examples/webenginewidgets/demobrowser/browsermainwindow.h +@@ -56,9 +56,7 @@ + #include + + QT_BEGIN_NAMESPACE +-#ifndef QT_NO_PRINTER + class QPrinter; +-#endif + class QWebEnginePage; + QT_END_NAMESPACE + +@@ -142,10 +140,8 @@ private slots: + void slotSwapFocus(); + void slotHandlePdfPrinted(const QByteArray&); + +-#ifndef QT_NO_PRINTER + void slotHandlePagePrinted(bool result); + void printRequested(QWebEnginePage *page); +-#endif + void geometryChangeRequested(const QRect &geometry); + void updateToolbarActionText(bool visible); + void updateBookmarksToolbarActionText(bool visible); +@@ -180,9 +176,7 @@ private: + QAction *m_restoreLastSession; + QAction *m_addBookmark; + +-#ifndef QT_NO_PRINTER + QPrinter *m_currentPrinter; +-#endif + + QIcon m_reloadIcon; + QIcon m_stopIcon; +diff --git a/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp b/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp +index 0f3b1765..50a8bb91 100644 +--- a/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp ++++ b/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp +@@ -52,10 +52,8 @@ + #include "ui_printtopdfdialog.h" + + #include +-#ifndef QT_NO_PRINTER + #include + #include +-#endif // QT_NO_PRINTER + #include + + PrintToPdfDialog::PrintToPdfDialog(const QString &filePath, QWidget *parent) : +@@ -66,11 +64,8 @@ PrintToPdfDialog::PrintToPdfDialog(const QString &filePath, QWidget *parent) : + ui->setupUi(this); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + connect(ui->chooseFilePathButton, &QToolButton::clicked, this, &PrintToPdfDialog::onChooseFilePathButtonClicked); +-#ifndef QT_NO_PRINTER + connect(ui->choosePageLayoutButton, &QToolButton::clicked, this, &PrintToPdfDialog::onChoosePageLayoutButtonClicked); +-#else + ui->choosePageLayoutButton->hide(); +-#endif // QT_NO_PRINTER + updatePageLayoutLabel(); + setFilePath(filePath); + } +@@ -82,7 +77,6 @@ PrintToPdfDialog::~PrintToPdfDialog() + + void PrintToPdfDialog::onChoosePageLayoutButtonClicked() + { +-#ifndef QT_NO_PRINTER + QPrinter printer; + printer.setPageLayout(currentPageLayout); + +@@ -92,7 +86,6 @@ void PrintToPdfDialog::onChoosePageLayoutButtonClicked() + currentPageLayout.setPageSize(printer.pageLayout().pageSize()); + currentPageLayout.setOrientation(printer.pageLayout().orientation()); + updatePageLayoutLabel(); +-#endif // QT_NO_PRINTER + } + + void PrintToPdfDialog::onChooseFilePathButtonClicked() +diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp +index 82720ae3..20d3268c 100644 +--- a/src/webenginewidgets/api/qwebenginepage.cpp ++++ b/src/webenginewidgets/api/qwebenginepage.cpp +@@ -80,11 +80,9 @@ + #include + #include + #include +-#if defined(QT_PRINTSUPPORT_LIB) +-#ifndef QT_NO_PRINTER ++#ifdef ENABLE_PRINTING + #include +-#endif //QT_NO_PRINTER +-#endif //QT_PRINTSUPPORT_LIB ++#endif + #include + #include + #include +@@ -2052,8 +2050,6 @@ void QWebEnginePage::printToPdf(const QWebEngineCallback &res + #endif // if defined(ENABLE_PDF) + } + +-#if defined(QT_PRINTSUPPORT_LIB) +-#ifndef QT_NO_PRINTER + /*! + \fn void QWebEnginePage::print(QPrinter *printer, FunctorOrLambda resultCallback) + Renders the current content of the page into a temporary PDF document, then prints it using \a printer. +@@ -2090,8 +2086,6 @@ void QWebEnginePage::print(QPrinter *printer, const QWebEngineCallback &re + d->m_callbacks.invokeDirectly(resultCallback, false); + #endif // if defined(ENABLE_PDF) + } +-#endif // if defined(QT_NO_PRINTER) +-#endif // if defined(QT_PRINTSUPPORT_LIB) + + /*! + \since 5.7 +diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h +index c7d5a19e..5619639c 100644 +--- a/src/webenginewidgets/api/qwebenginepage.h ++++ b/src/webenginewidgets/api/qwebenginepage.h +@@ -55,11 +55,7 @@ + + QT_BEGIN_NAMESPACE + class QMenu; +-#if defined(QT_PRINTSUPPORT_LIB) +-#ifndef QT_NO_PRINTER + class QPrinter; +-#endif // QT_NO_PRINTER +-#endif // QT_PRINTSUPPORT_LIB + + class QWebChannel; + class QWebEngineContextMenuData; +@@ -294,15 +290,11 @@ public: + void printToPdf(const QWebEngineCallback &resultCallback, const QPageLayout &layout = QPageLayout(QPageSize(QPageSize::A4), QPageLayout::Portrait, QMarginsF())); + #endif + +-#if defined(QT_PRINTSUPPORT_LIB) +-#ifndef QT_NO_PRINTER + #ifdef Q_QDOC + void print(QPrinter *printer, FunctorOrLambda resultCallback); + #else + void print(QPrinter *printer, const QWebEngineCallback &resultCallback); + #endif // QDOC +-#endif // QT_NO_PRINTER +-#endif // QT_PRINTSUPPORT_LIB + + const QWebEngineContextMenuData &contextMenuData() const; + diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 19583f91..830e6402 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -129,12 +129,18 @@ RDEPENDS_${PN}-examples += " \ QT_MODULE_BRANCH_CHROMIUM = "56-based" +# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ 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-Always-compile-QWebEnginePage-print.patch \ +" + +# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based +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 \ " -- cgit v1.2.3 From 2d14d9956f21f3f096bdda7df1d1ba99cca4a6ed Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 19 Aug 2017 15:44:17 +0200 Subject: qt: refresh remaining patches and add links to meta-qt5 repos * remove qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch which is already applied and fuzzy patch just apply the same section twice * restore qttools/0001-add-noqtwebkit-configuration.patch which was removed from SRC_URI in 5.9 upgrade * add comment with link to meta-qt5 repository where the meta-qt5 .patch files are maintained, include branch and tag name so that it's more clear from where these changes are exported (with: git format-patch --no-numbered --no-signature) Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 4 + recipes-qt/qt5/qt3d_git.bb | 2 + recipes-qt/qt5/qtbase-native_git.bb | 4 + recipes-qt/qt5/qtbase_git.bb | 2 + ...-QQmlExpression-leaking-QQmlError-objects.patch | 35 -------- recipes-qt/qt5/qtdeclarative_git.bb | 4 - recipes-qt/qt5/qtlocation_git.bb | 2 + recipes-qt/qt5/qtmultimedia_git.bb | 2 + recipes-qt/qt5/qtquickcontrols_git.bb | 2 + recipes-qt/qt5/qtremoteobjects_git.bb | 2 + recipes-qt/qt5/qtscxml_git.bb | 2 + .../0001-add-noqtwebkit-configuration.patch | 48 +++++++++++ ...ols-cmake-allow-overriding-the-location-f.patch | 60 ++++++++++++++ .../0003-add-noqtwebkit-configuration.patch | 48 ----------- ...ols-cmake-allow-overriding-the-location-f.patch | 60 -------------- recipes-qt/qt5/qttools_git.bb | 5 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 3 + .../0001-fix-build-without-xkbcommon-evdev.patch | 17 ++-- ...l-window-property-values-being-propagated.patch | 35 -------- recipes-qt/qt5/qtwayland_git.bb | 3 +- recipes-qt/qt5/qtwebengine_git.bb | 2 + .../0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | 4 +- ...ude-backtrace-API-for-non-glibc-libraries.patch | 35 ++++++++ ...ude-backtrace-API-for-non-glibc-libraries.patch | 35 -------- .../0003-Fix-compilation-with-ICU-59.patch | 89 +++++++++++++++++++++ .../0004-Fix-compilation-with-ICU-59.patch | 92 ---------------------- recipes-qt/qt5/qtwebkit_git.bb | 6 +- recipes-qt/qt5/qtwebview_git.bb | 2 + 28 files changed, 280 insertions(+), 325 deletions(-) delete mode 100644 recipes-qt/qt5/qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch create mode 100644 recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch create mode 100644 recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch delete mode 100644 recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch delete mode 100644 recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch delete mode 100644 recipes-qt/qt5/qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch create mode 100644 recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch delete mode 100644 recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch create mode 100644 recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch delete mode 100644 recipes-qt/qt5/qtwebkit/0004-Fix-compilation-with-ICU-59.patch diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index e1b30c9a..d229c21d 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -25,6 +25,8 @@ require qt5-git.inc FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared +# 5.9.meta-qt5-shared.1 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -37,6 +39,8 @@ SRC_URI += "\ " # common for qtbase-native and nativesdk-qtbase +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native +# 5.9.meta-qt5-native.1 SRC_URI += " \ file://0009-Always-build-uic.patch \ " diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 41b5fbc3..4226bac6 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" DEPENDS_class-target += "qtdeclarative qt3d-native" +# Patches from https://github.com/meta-qt5/qt3d/commits/b5.9 +# 5.9.meta-qt5.1 SRC_URI += " \ file://0001-Allow-a-tools-only-build.patch \ file://0002-Fix-BlenderDNA-for-clang-cross-compiler.patch \ diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 84cb2b00..336df95b 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -20,6 +20,8 @@ require qt5-native.inc require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared +# 5.9.meta-qt5-shared.1 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -32,6 +34,8 @@ SRC_URI += "\ " # common for qtbase-native and nativesdk-qtbase +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native +# 5.9.meta-qt5-native.1 SRC_URI += " \ file://0009-Always-build-uic.patch \ " diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index c535380b..1c18d0dc 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -15,6 +15,8 @@ LIC_FILES_CHKSUM = " \ " # common for qtbase-native, qtbase-nativesdk and qtbase +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared +# 5.9.meta-qt5-shared.1 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ diff --git a/recipes-qt/qt5/qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch b/recipes-qt/qt5/qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch deleted file mode 100644 index 050a914e..00000000 --- a/recipes-qt/qt5/qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f9dcbf008b430aadd464985b7a618eca8173d264 Mon Sep 17 00:00:00 2001 -From: Robert Griebl -Date: Thu, 23 Feb 2017 15:11:13 +0100 -Subject: [PATCH 1/3] Fix QQmlExpression leaking QQmlError objects -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -If the user doesn't clear any potential errors manually via clearError(), -then do it automatically in the destructor. Found with valgrind. - -[ChangeLog][QtQml][QQmlExpression] Fixed memory leak - -Change-Id: If5b1181850c7463c939a7ba536d74e7054c53d60 -Reviewed-by: Simon Hausmann -Signed-off-by: Gordan Markuš ---- - src/qml/qml/qqmlexpression.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp -index 6afbd05..5cb3d4d 100644 ---- a/src/qml/qml/qqmlexpression.cpp -+++ b/src/qml/qml/qqmlexpression.cpp -@@ -200,6 +200,7 @@ QQmlExpression::QQmlExpression(QQmlContextData *ctxt, QObject *scope, - */ - QQmlExpression::~QQmlExpression() - { -+ clearError(); - } - - /*! --- -2.9.3 - diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 2194d33a..ecd64ee3 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -11,10 +11,6 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " -SRC_URI += " \ - file://0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch \ -" - DEPENDS += "qtbase" PACKAGECONFIG ??= "qtxmlpatterns" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 7d434a4b..c50a917a 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -13,6 +13,8 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" +# Patches from https://github.com/meta-qt5/qtlocation/commits/b5.9 +# 5.9.meta-qt5.1 SRC_URI += "file://0001-Make-mapbox-gl-build-configurable.patch" PACKAGECONFIG ??= "" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 19966183..998f32f5 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -25,6 +25,8 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" # Disable GStreamer if completely disabled EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}" +# Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.9 +# 5.9.meta-qt5.1 SRC_URI += "\ file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ " diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 83ed908d..0ea314b8 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -22,6 +22,8 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ " +# Patches from https://github.com/meta-qt5/qtquickcontrols/commits/b5.9 +# 5.9.meta-qt5.1 SRC_URI += " \ file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ " diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index f563818d..a7e34472 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -11,6 +11,8 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" +# Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.9 +# 5.9.meta-qt5.1 SRC_URI += " \ file://0001-Allow-a-tools-only-build.patch \ " diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index c2c00e1b..e9ca8c19 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -12,6 +12,8 @@ DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" SRCREV = "eff82ac957e051f16f64c287f2dfaec9049bdfc1" +# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9 +# 5.9.meta-qt5.1 SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" do_install_append_class-nativesdk() { diff --git a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch new file mode 100644 index 00000000..ed25390b --- /dev/null +++ b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch @@ -0,0 +1,48 @@ +From e0387540876944a20461d60d2208191c734e00b1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Wed, 4 Jun 2014 11:28:16 +0200 +Subject: [PATCH] add noqtwebkit configuration +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropiate [configuration] + +Signed-off-by: Andreas Müller +Signed-off-by: Martin Jansa +--- + src/assistant/assistant/assistant.pro | 4 ++-- + src/designer/src/plugins/plugins.pro | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro +index 540c9689..2312b521 100644 +--- a/src/assistant/assistant/assistant.pro ++++ b/src/assistant/assistant/assistant.pro +@@ -1,4 +1,4 @@ +-false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { ++false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) { + # FIXME: currently broken + BROWSER = qtwebkit + } else { +@@ -76,7 +76,7 @@ SOURCES += aboutdialog.cpp \ + openpagesmanager.cpp \ + openpagesswitcher.cpp + +-equals(BROWSER, "qtwebkit") { ++equals(BROWSER, "qtwebkit"):!contains(CONFIG, noqtwebkit) { + DEFINES += BROWSER_QTWEBKIT + QT += webkitwidgets + SOURCES += helpviewer_qwv.cpp +diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro +index 500a1534..b60fa2d9 100644 +--- a/src/designer/src/plugins/plugins.pro ++++ b/src/designer/src/plugins/plugins.pro +@@ -1,6 +1,6 @@ + TEMPLATE = subdirs + + # qtHaveModule(opengl): SUBDIRS += tools/view3d +-qtHaveModule(webkitwidgets): SUBDIRS += qwebview ++qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit): SUBDIRS += qwebview + win32: qtHaveModule(axcontainer): SUBDIRS += activeqt + qtHaveModule(quickwidgets): SUBDIRS += qquickwidget diff --git a/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch new file mode 100644 index 00000000..b2e017eb --- /dev/null +++ b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch @@ -0,0 +1,60 @@ +From 779278a109450ae84d5deb2e1e1c0dd9b737f1a2 Mon Sep 17 00:00:00 2001 +From: Cody P Schafer +Date: Thu, 9 Jul 2015 11:28:19 -0400 +Subject: [PATCH] linguist-tools cmake: allow overriding the location for + lupdate and lrelease + +--- + src/linguist/Qt5LinguistToolsConfig.cmake.in | 15 +++------------ + 1 file changed, 3 insertions(+), 12 deletions(-) + +diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in +index 4318b16f..2e3b70fa 100644 +--- a/src/linguist/Qt5LinguistToolsConfig.cmake.in ++++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in +@@ -26,6 +26,9 @@ get_filename_component(_qt5_linguisttools_install_prefix \"${CMAKE_CURRENT_LIST_ + !!ELSE + set(_qt5_linguisttools_install_prefix \"$$[QT_INSTALL_PREFIX]\") + !!ENDIF ++if (OE_QMAKE_PATH_HOST_PREFIX) ++ set(_qt5_linguisttools_install_prefix \"${OE_QMAKE_PATH_HOST_PREFIX}\") ++endif() + + macro(_qt5_LinguistTools_check_file_exists file) + if(NOT EXISTS \"${file}\" ) +@@ -44,11 +47,7 @@ endmacro() + if (NOT TARGET Qt5::lrelease) + add_executable(Qt5::lrelease IMPORTED) + +-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") +-!!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") +-!!ENDIF + _qt5_LinguistTools_check_file_exists(${imported_location}) + + set_target_properties(Qt5::lrelease PROPERTIES +@@ -59,11 +58,7 @@ endif() + if (NOT TARGET Qt5::lupdate) + add_executable(Qt5::lupdate IMPORTED) + +-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") +-!!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") +-!!ENDIF + _qt5_LinguistTools_check_file_exists(${imported_location}) + + set_target_properties(Qt5::lupdate PROPERTIES +@@ -74,11 +69,7 @@ endif() + if (NOT TARGET Qt5::lconvert) + add_executable(Qt5::lconvert IMPORTED) + +-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") +-!!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") +-!!ENDIF + _qt5_LinguistTools_check_file_exists(${imported_location}) + + set_target_properties(Qt5::lconvert PROPERTIES diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch deleted file mode 100644 index 88c39c74..00000000 --- a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch +++ /dev/null @@ -1,48 +0,0 @@ -From a798e469e69e31248610a3b5f29c63c5d12cda26 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 4 Jun 2014 11:28:16 +0200 -Subject: [PATCH] add noqtwebkit configuration -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropiate [configuration] - -Signed-off-by: Andreas Müller -Signed-off-by: Martin Jansa ---- - src/assistant/assistant/assistant.pro | 4 ++-- - src/designer/src/plugins/plugins.pro | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro -index ef5c595..9c2dc1c 100644 ---- a/src/assistant/assistant/assistant.pro -+++ b/src/assistant/assistant/assistant.pro -@@ -1,4 +1,4 @@ --qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { -+qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) { - BROWSER = qtwebkit - } else { - BROWSER = qtextbrowser -@@ -75,7 +75,7 @@ SOURCES += aboutdialog.cpp \ - openpagesmanager.cpp \ - openpagesswitcher.cpp - --equals(BROWSER, "qtwebkit") { -+equals(BROWSER, "qtwebkit"):!contains(CONFIG, noqtwebkit) { - DEFINES += BROWSER_QTWEBKIT - QT += webkitwidgets - SOURCES += helpviewer_qwv.cpp -diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro -index 500a153..b60fa2d 100644 ---- a/src/designer/src/plugins/plugins.pro -+++ b/src/designer/src/plugins/plugins.pro -@@ -1,6 +1,6 @@ - TEMPLATE = subdirs - - # qtHaveModule(opengl): SUBDIRS += tools/view3d --qtHaveModule(webkitwidgets): SUBDIRS += qwebview -+qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit): SUBDIRS += qwebview - win32: qtHaveModule(axcontainer): SUBDIRS += activeqt - qtHaveModule(quickwidgets): SUBDIRS += qquickwidget diff --git a/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch b/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch deleted file mode 100644 index 1a201de9..00000000 --- a/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch +++ /dev/null @@ -1,60 +0,0 @@ -From f805a2bf4a0d35a01726d214279ba1caa81b278f Mon Sep 17 00:00:00 2001 -From: Cody P Schafer -Date: Thu, 9 Jul 2015 11:28:19 -0400 -Subject: [PATCH] linguist-tools cmake: allow overriding the location for - lupdate and lrelease - ---- - src/linguist/Qt5LinguistToolsConfig.cmake.in | 15 +++------------ - 1 file changed, 3 insertions(+), 12 deletions(-) - -diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in -index 4318b16..2e3b70f 100644 ---- a/src/linguist/Qt5LinguistToolsConfig.cmake.in -+++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in -@@ -26,6 +26,9 @@ get_filename_component(_qt5_linguisttools_install_prefix \"${CMAKE_CURRENT_LIST_ - !!ELSE - set(_qt5_linguisttools_install_prefix \"$$[QT_INSTALL_PREFIX]\") - !!ENDIF -+if (OE_QMAKE_PATH_HOST_PREFIX) -+ set(_qt5_linguisttools_install_prefix \"${OE_QMAKE_PATH_HOST_PREFIX}\") -+endif() - - macro(_qt5_LinguistTools_check_file_exists file) - if(NOT EXISTS \"${file}\" ) -@@ -44,11 +47,7 @@ endmacro() - if (NOT TARGET Qt5::lrelease) - add_executable(Qt5::lrelease IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") --!!ENDIF - _qt5_LinguistTools_check_file_exists(${imported_location}) - - set_target_properties(Qt5::lrelease PROPERTIES -@@ -59,11 +58,7 @@ endif() - if (NOT TARGET Qt5::lupdate) - add_executable(Qt5::lupdate IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") --!!ENDIF - _qt5_LinguistTools_check_file_exists(${imported_location}) - - set_target_properties(Qt5::lupdate PROPERTIES -@@ -74,11 +69,7 @@ endif() - if (NOT TARGET Qt5::lconvert) - add_executable(Qt5::lconvert IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") --!!ENDIF - _qt5_LinguistTools_check_file_exists(${imported_location}) - - set_target_properties(Qt5::lconvert PROPERTIES diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 9ca90a2c..871b0613 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -14,9 +14,12 @@ inherit ptest DEPENDS += "qtbase qtdeclarative qtxmlpatterns" +# Patches from https://github.com/meta-qt5/qttools/commits/b5.9 +# 5.9.meta-qt5.1 SRC_URI += " \ file://run-ptest \ - file://0004-linguist-tools-cmake-allow-overriding-the-location-f.patch \ + file://0001-add-noqtwebkit-configuration.patch \ + file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \ " FILES_${PN}-tools += "${datadir}${QT_DIR_NAME}/phrasebooks" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 2b865bbb..ec1dc42f 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -5,6 +5,9 @@ LICENSE = "GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ " + +# Patches from https://github.com/meta-qt5/qtvirtualkeyboard/commits/b5.9 +# 5.9.meta-qt5.1 SRC_URI += "file://0001-include-sys-time.h-for-timeval.patch" # To enabled Nuance T9 Write support, you need to provide the licensed components diff --git a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch index 555bb28f..a86868e9 100644 --- a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch +++ b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch @@ -1,4 +1,4 @@ -From 2b72ad7955fe19abb4a0b4ebb6bc7aa498e454bc Mon Sep 17 00:00:00 2001 +From 434be8d326adb02b7b0960481f045dc1a443cfce Mon Sep 17 00:00:00 2001 From: Raphael Freudiger Date: Tue, 10 Jan 2017 15:49:55 +0100 Subject: [PATCH] fix build without xkbcommon-evdev @@ -16,17 +16,17 @@ Signed-off-by: Gordan Markuš 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/client/client.pro b/src/client/client.pro -index 7482cfd..cb3578c 100644 +index eae7ad52..0bb7b188 100644 --- a/src/client/client.pro +++ b/src/client/client.pro -@@ -120,3 +120,5 @@ MODULE_PLUGIN_TYPES = \ +@@ -147,3 +147,5 @@ MODULE_PLUGIN_TYPES = \ wayland-decoration-client \ wayland-shell-integration load(qt_module) + +LIBS += -lxkbcommon diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro -index dc9000d..4eebfd6 100644 +index dc9000d9..4eebfd64 100644 --- a/src/compositor/compositor.pro +++ b/src/compositor/compositor.pro @@ -32,3 +32,5 @@ include ($$PWD/extensions/extensions.pri) @@ -36,10 +36,10 @@ index dc9000d..4eebfd6 100644 + +LIBS += -lxkbcommon diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp -index 55381b4..5c054c6 100644 +index c30f7b18..e6f1a0b3 100644 --- a/src/compositor/compositor_api/qwaylandkeyboard.cpp +++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp -@@ -338,12 +338,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap) +@@ -349,12 +349,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap) xkb_state = xkb_state_new(keymap); } @@ -52,7 +52,7 @@ index 55381b4..5c054c6 100644 void QWaylandKeyboardPrivate::createXKBKeymap() { -@@ -373,6 +367,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap() +@@ -384,6 +378,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap() } #endif @@ -66,6 +66,3 @@ index 55381b4..5c054c6 100644 void QWaylandKeyboardPrivate::sendRepeatInfo() { Q_FOREACH (Resource *resource, resourceMap()) { --- -2.9.3 - diff --git a/recipes-qt/qt5/qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch b/recipes-qt/qt5/qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch deleted file mode 100644 index 29c9180c..00000000 --- a/recipes-qt/qt5/qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3d30fd8df9b55449844207295ad3d51cc8bb44b1 Mon Sep 17 00:00:00 2001 -From: Robert Griebl -Date: Thu, 15 Dec 2016 17:43:00 +0100 -Subject: [PATCH 2/2] Fix initial window property values being propagated -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This was broken since the the shell-surface refactoring. - -Change-Id: I130b7396e85c570a9d11d609af6b3016e3f706f0 -Reviewed-by: Dominik Holland -Reviewed-by: Paul Olav Tvete -Signed-off-by: Gordan Markuš ---- - src/client/qwaylandwindow.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp -index c8be9c1..b6f16f0 100644 ---- a/src/client/qwaylandwindow.cpp -+++ b/src/client/qwaylandwindow.cpp -@@ -176,6 +176,9 @@ void QWaylandWindow::initWindow() - mShellSurface->setAppId(appId); - } - } -+ // the user may have already set some window properties, so make sure to send them out -+ for (auto it = m_properties.cbegin(); it != m_properties.cend(); ++it) -+ mShellSurface->sendProperty(it.key(), it.value()); - } - - // Enable high-dpi rendering. Scale() returns the screen scale factor and will --- -2.9.3 - diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 91c7230a..cece86ed 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -39,10 +39,11 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" SRCREV = "f1cf62fa8e9ffa2548c9968906848596f50dbc0b" +# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9 +# 5.9.meta-qt5.1 # From https://bugreports.qt.io/browse/QTBUG-57767 SRC_URI += " \ file://0001-fix-build-without-xkbcommon-evdev.patch \ - file://0002-Fix-initial-window-property-values-being-propagated.patch \ " BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 830e6402..98797493 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -130,6 +130,7 @@ RDEPENDS_${PN}-examples += " \ QT_MODULE_BRANCH_CHROMIUM = "56-based" # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 +# 5.9.meta-qt5.1 SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \ @@ -140,6 +141,7 @@ SRC_URI += " \ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based +# 56-based.meta-qt5.1 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 \ diff --git a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch index d96636e6..d393dc41 100644 --- a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +++ b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch @@ -1,4 +1,4 @@ -From 86bdd059606252b16c24432fbe4bba461406c1e4 Mon Sep 17 00:00:00 2001 +From f8bcac01fd5d95d0df8342809c53917aff1bf798 Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Fri, 7 Feb 2014 04:07:17 +0100 Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) @@ -14,7 +14,7 @@ Signed-off-by: Martin Jansa 1 file changed, 1 deletion(-) diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf -index fd66af6..ef754c3 100644 +index fd66af670..ef754c367 100644 --- a/Tools/qmake/mkspecs/features/unix/default_post.prf +++ b/Tools/qmake/mkspecs/features/unix/default_post.prf @@ -61,7 +61,6 @@ linux-*g++* { diff --git a/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch b/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch new file mode 100644 index 00000000..147a7baa --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch @@ -0,0 +1,35 @@ +From 5d4f3219be0b66d63765e077644a51e18b1f4502 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 5 Jun 2015 19:55:05 -0700 +Subject: [PATCH] Exclude backtrace() API for non-glibc libraries + +It was excluding musl with current checks, so lets make it such that it +considers only glibc when using backtrace API + +Signed-off-by: Khem Raj +--- + Source/WTF/wtf/Assertions.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp +index 1b2091f53..ba03a28ec 100644 +--- a/Source/WTF/wtf/Assertions.cpp ++++ b/Source/WTF/wtf/Assertions.cpp +@@ -61,7 +61,7 @@ + #include + #endif + +-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) ++#if (OS(DARWIN) || (OS(LINUX) && defined (__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) + #include + #include + #include +@@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f + + void WTFGetBacktrace(void** stack, int* size) + { +-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) ++#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) + *size = backtrace(stack, *size); + #elif OS(WINDOWS) && !OS(WINCE) + // The CaptureStackBackTrace function is available in XP, but it is not defined diff --git a/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch b/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch deleted file mode 100644 index a16801b5..00000000 --- a/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ed626df67e8287fadbfe2801c241c9717472dcf4 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 5 Jun 2015 19:55:05 -0700 -Subject: [PATCH] Exclude backtrace() API for non-glibc libraries - -It was excluding musl with current checks, so lets make it such that it -considers only glibc when using backtrace API - -Signed-off-by: Khem Raj ---- - Source/WTF/wtf/Assertions.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp -index 1b2091f..ba03a28 100644 ---- a/Source/WTF/wtf/Assertions.cpp -+++ b/Source/WTF/wtf/Assertions.cpp -@@ -61,7 +61,7 @@ - #include - #endif - --#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) -+#if (OS(DARWIN) || (OS(LINUX) && defined (__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) - #include - #include - #include -@@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f - - void WTFGetBacktrace(void** stack, int* size) - { --#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) -+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) - *size = backtrace(stack, *size); - #elif OS(WINDOWS) && !OS(WINCE) - // The CaptureStackBackTrace function is available in XP, but it is not defined diff --git a/recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch b/recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch new file mode 100644 index 00000000..debbda1e --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch @@ -0,0 +1,89 @@ +From 240bd33ba3e78fcc0e5e3299d9e0e53299ea07f8 Mon Sep 17 00:00:00 2001 +From: Konstantin Tokarev +Date: Thu, 4 May 2017 15:12:37 +0300 +Subject: [PATCH] Fix compilation with ICU 59 + +Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612 + +Task-number: QTBUG-60532 +Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843 +Reviewed-by: Allan Sandfeld Jensen +--- + Source/JavaScriptCore/API/JSStringRef.cpp | 6 +++--- + Source/JavaScriptCore/runtime/DateConversion.cpp | 3 ++- + Source/WTF/wtf/TypeTraits.h | 3 +++ + Source/WebKit2/Shared/API/c/WKString.cpp | 2 +- + 4 files changed, 9 insertions(+), 5 deletions(-) + +diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp +index 812f3d413..77a3fd0f4 100644 +--- a/Source/JavaScriptCore/API/JSStringRef.cpp ++++ b/Source/JavaScriptCore/API/JSStringRef.cpp +@@ -37,7 +37,7 @@ using namespace WTF::Unicode; + JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars) + { + initializeThreading(); +- return OpaqueJSString::create(chars, numChars).leakRef(); ++ return OpaqueJSString::create(reinterpret_cast(chars), numChars).leakRef(); + } + + JSStringRef JSStringCreateWithUTF8CString(const char* string) +@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string) + JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars) + { + initializeThreading(); +- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); ++ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); + } + + JSStringRef JSStringRetain(JSStringRef string) +@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string) + + const JSChar* JSStringGetCharactersPtr(JSStringRef string) + { +- return string->characters(); ++ return reinterpret_cast(string->characters()); + } + + size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string) +diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp +index 0b57f012d..05e27338b 100644 +--- a/Source/JavaScriptCore/runtime/DateConversion.cpp ++++ b/Source/JavaScriptCore/runtime/DateConversion.cpp +@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as + #if OS(WINDOWS) + TIME_ZONE_INFORMATION timeZoneInformation; + GetTimeZoneInformation(&timeZoneInformation); +- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++ String timeZoneName(reinterpret_cast(winTimeZoneName)); + #else + struct tm gtm = t; + char timeZoneName[70]; +diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h +index 9df2c95cf..f5d6121fd 100644 +--- a/Source/WTF/wtf/TypeTraits.h ++++ b/Source/WTF/wtf/TypeTraits.h +@@ -72,6 +72,9 @@ namespace WTF { + template<> struct IsInteger { static const bool value = true; }; + template<> struct IsInteger { static const bool value = true; }; + template<> struct IsInteger { static const bool value = true; }; ++#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_SUPPORT) ++ template<> struct IsInteger { static const bool value = true; }; ++#endif + #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) + template<> struct IsInteger { static const bool value = true; }; + #endif +diff --git a/Source/WebKit2/Shared/API/c/WKString.cpp b/Source/WebKit2/Shared/API/c/WKString.cpp +index cbac67dd8..23400a64e 100644 +--- a/Source/WebKit2/Shared/API/c/WKString.cpp ++++ b/Source/WebKit2/Shared/API/c/WKString.cpp +@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef) + size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength) + { + COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar); +- return (toImpl(stringRef)->getCharacters(static_cast(buffer), bufferLength)); ++ return (toImpl(stringRef)->getCharacters(reinterpret_cast(buffer), bufferLength)); + } + + size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef) diff --git a/recipes-qt/qt5/qtwebkit/0004-Fix-compilation-with-ICU-59.patch b/recipes-qt/qt5/qtwebkit/0004-Fix-compilation-with-ICU-59.patch deleted file mode 100644 index e4a108e8..00000000 --- a/recipes-qt/qt5/qtwebkit/0004-Fix-compilation-with-ICU-59.patch +++ /dev/null @@ -1,92 +0,0 @@ -From d8d9b1eb468f5e5d5d9f0b196fc0acb641998c8b Mon Sep 17 00:00:00 2001 -From: Konstantin Tokarev -Date: Thu, 4 May 2017 15:12:37 +0300 -Subject: [PATCH] Fix compilation with ICU 59 - -Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612 - -Task-number: QTBUG-60532 -Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843 -Reviewed-by: Allan Sandfeld Jensen ---- - Source/JavaScriptCore/API/JSStringRef.cpp | 6 +++--- - Source/JavaScriptCore/runtime/DateConversion.cpp | 3 ++- - Source/WTF/wtf/TypeTraits.h | 3 +++ - Source/WebKit2/Shared/API/c/WKString.cpp | 2 +- - 4 files changed, 9 insertions(+), 5 deletions(-) - -diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp -index 812f3d413..77a3fd0f4 100644 ---- a/Source/JavaScriptCore/API/JSStringRef.cpp -+++ b/Source/JavaScriptCore/API/JSStringRef.cpp -@@ -37,7 +37,7 @@ using namespace WTF::Unicode; - JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars) - { - initializeThreading(); -- return OpaqueJSString::create(chars, numChars).leakRef(); -+ return OpaqueJSString::create(reinterpret_cast(chars), numChars).leakRef(); - } - - JSStringRef JSStringCreateWithUTF8CString(const char* string) -@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string) - JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars) - { - initializeThreading(); -- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); -+ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); - } - - JSStringRef JSStringRetain(JSStringRef string) -@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string) - - const JSChar* JSStringGetCharactersPtr(JSStringRef string) - { -- return string->characters(); -+ return reinterpret_cast(string->characters()); - } - - size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string) -diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp -index 0b57f012d..05e27338b 100644 ---- a/Source/JavaScriptCore/runtime/DateConversion.cpp -+++ b/Source/JavaScriptCore/runtime/DateConversion.cpp -@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as - #if OS(WINDOWS) - TIME_ZONE_INFORMATION timeZoneInformation; - GetTimeZoneInformation(&timeZoneInformation); -- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; -+ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; -+ String timeZoneName(reinterpret_cast(winTimeZoneName)); - #else - struct tm gtm = t; - char timeZoneName[70]; -diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h -index 9df2c95cf..f5d6121fd 100644 ---- a/Source/WTF/wtf/TypeTraits.h -+++ b/Source/WTF/wtf/TypeTraits.h -@@ -72,6 +72,9 @@ namespace WTF { - template<> struct IsInteger { static const bool value = true; }; - template<> struct IsInteger { static const bool value = true; }; - template<> struct IsInteger { static const bool value = true; }; -+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_SUPPORT) -+ template<> struct IsInteger { static const bool value = true; }; -+#endif - #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) - template<> struct IsInteger { static const bool value = true; }; - #endif -diff --git a/Source/WebKit2/Shared/API/c/WKString.cpp b/Source/WebKit2/Shared/API/c/WKString.cpp -index cbac67dd8..23400a64e 100644 ---- a/Source/WebKit2/Shared/API/c/WKString.cpp -+++ b/Source/WebKit2/Shared/API/c/WKString.cpp -@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef) - size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength) - { - COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar); -- return (toImpl(stringRef)->getCharacters(static_cast(buffer), bufferLength)); -+ return (toImpl(stringRef)->getCharacters(reinterpret_cast(buffer), bufferLength)); - } - - size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef) --- -2.13.3 - diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 5c1ecfa8..0792c4ad 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -18,10 +18,12 @@ DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf- ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" +# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.9 +# 5.9.meta-qt5.1 SRC_URI += "\ file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \ - file://0003-Exclude-backtrace-API-for-non-glibc-libraries.patch \ - file://0004-Fix-compilation-with-ICU-59.patch \ + file://0002-Exclude-backtrace-API-for-non-glibc-libraries.patch \ + file://0003-Fix-compilation-with-ICU-59.patch \ " PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel \ diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index d48b6c42..8b79aa1c 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -9,6 +9,8 @@ LIC_FILES_CHKSUM = " \ require qt5.inc require qt5-git.inc +# Patches from https://github.com/meta-qt5/qtwebview/commits/b5.9 +# 5.9.meta-qt5.1 SRC_URI += "file://0001-Add-missing-include-for-qWarning.patch" DEPENDS += "qtbase qtwebengine" -- cgit v1.2.3 From 9c7507ef155d9c248b6d9b12349c52fa1410e482 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 19 Aug 2017 17:02:29 +0200 Subject: qt: upgrade to latest revision in 5.9 branch * 3 patches were included upstream Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 6 +- .../qt5/qt3d/0001-Allow-a-tools-only-build.patch | 2 +- ...2-Fix-BlenderDNA-for-clang-cross-compiler.patch | 2 +- recipes-qt/qt5/qt3d_git.bb | 4 +- recipes-qt/qt5/qt5-git.inc | 4 +- recipes-qt/qt5/qtbase-native_git.bb | 6 +- .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 6 +- ...make-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch | 2 +- ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 2 +- ...ump-path-length-from-256-to-512-character.patch | 4 +- ...-unknown-features-instead-of-erroring-out.patch | 6 +- ...-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch | 4 +- .../0007-Delete-qlonglong-and-qulonglong.patch | 2 +- ...08-Replace-pthread_yield-with-sched_yield.patch | 4 +- recipes-qt/qt5/qtbase/0009-Always-build-uic.patch | 2 +- recipes-qt/qt5/qtbase_git.bb | 4 +- recipes-qt/qt5/qtcanvas3d_git.bb | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtdatavis3d_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtenginio_git.bb | 1 - recipes-qt/qt5/qtgamepad_git.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 11 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- .../0001-Make-mapbox-gl-build-configurable.patch | 8 +- recipes-qt/qt5/qtlocation_git.bb | 6 +- recipes-qt/qt5/qtmultimedia_git.bb | 4 +- recipes-qt/qt5/qtnetworkauth_git.bb | 2 +- recipes-qt/qt5/qtquick1_git.bb | 5 +- ...fix-invalid-use-of-incomplete-type-class-.patch | 4 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 4 +- recipes-qt/qt5/qtremoteobjects_git.bb | 4 +- recipes-qt/qt5/qtscript_git.bb | 2 +- ...Use-external-host-bin-path-for-cmake-file.patch | 4 +- recipes-qt/qt5/qtscxml_git.bb | 4 +- recipes-qt/qt5/qtsensors_git.bb | 11 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- recipes-qt/qt5/qtsvg_git.bb | 2 +- recipes-qt/qt5/qtsystems_git.bb | 2 +- .../0001-add-noqtwebkit-configuration.patch | 12 +- ...ols-cmake-allow-overriding-the-location-f.patch | 2 +- recipes-qt/qt5/qttools_git.bb | 4 +- recipes-qt/qt5/qttranslations_git.bb | 9 +- .../0001-include-sys-time.h-for-timeval.patch | 5 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 4 +- .../0001-fix-build-without-xkbcommon-evdev.patch | 2 +- recipes-qt/qt5/qtwayland_git.bb | 4 +- recipes-qt/qt5/qtwebchannel_git.bb | 11 +- ...ange-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch | 2 +- ...s.prf-allow-build-for-linux-oe-g-platform.patch | 6 +- ...quickwebengineview_p_p.h-add-include-QCol.patch | 4 +- ...romium-Force-host-toolchain-configuration.patch | 2 +- ...-dependency-to-QCoreApplication-translate.patch | 2 +- ...sl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch | 2 +- .../0004-Force-host-toolchain-configuration.patch | 8 +- ...sl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | 2 +- .../0005-Always-compile-QWebEnginePage-print.patch | 241 --------------------- ...-chromium-musl-include-fcntl.h-for-loff_t.patch | 2 +- ...sl-use-off64_t-instead-of-the-internal-__.patch | 2 +- ...ium-musl-linux-glibc-make-the-distinction.patch | 2 +- ...sl-allocator-Do-not-include-glibc_weak_sy.patch | 2 +- ...sl-Use-correct-member-name-__si_fields-fr.patch | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 11 +- recipes-qt/qt5/qtwebkit-examples_git.bb | 2 +- .../0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | 2 +- ...ude-backtrace-API-for-non-glibc-libraries.patch | 2 +- .../0003-Fix-compilation-with-ICU-59.patch | 89 -------- recipes-qt/qt5/qtwebkit_git.bb | 5 +- recipes-qt/qt5/qtwebsockets_git.bb | 12 +- .../0001-Add-missing-include-for-qWarning.patch | 22 -- recipes-qt/qt5/qtwebview_git.bb | 6 +- recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 76 files changed, 134 insertions(+), 507 deletions(-) delete mode 100644 recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch delete mode 100644 recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch delete mode 100644 recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index d229c21d..87bd5019 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -26,7 +26,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared -# 5.9.meta-qt5-shared.1 +# 5.9.meta-qt5-shared.2 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -40,7 +40,7 @@ SRC_URI += "\ # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native -# 5.9.meta-qt5-native.1 +# 5.9.meta-qt5-native.2 SRC_URI += " \ file://0009-Always-build-uic.patch \ " @@ -197,4 +197,4 @@ fakeroot do_generate_qt_environment_file() { addtask generate_qt_environment_file after do_install before do_package -SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b" +SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1" diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch index 8cf1f501..5aba2bfc 100644 --- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch @@ -1,4 +1,4 @@ -From dd0f3fefeeefb31ec8cf2417bd3f447f7b9c25c6 Mon Sep 17 00:00:00 2001 +From 7cb46d20ad89f37828ff9f96363a112eadf11dbd Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 10 Feb 2016 09:02:09 +0200 Subject: [PATCH] Allow a tools-only build diff --git a/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch b/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch index eeb402f6..1f2f682f 100644 --- a/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch +++ b/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch @@ -1,4 +1,4 @@ -From ec40913bc563e3cb0abc1965ce457d3a2fe663b3 Mon Sep 17 00:00:00 2001 +From 99fb23c0258ed0dacb03dc2eb57792c42b33316f Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Mon, 7 Nov 2016 17:19:49 +0100 Subject: [PATCH] Fix BlenderDNA for clang cross compiler. diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 4226bac6..c354db4b 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -12,7 +12,7 @@ DEPENDS += "qtbase" DEPENDS_class-target += "qtdeclarative qt3d-native" # Patches from https://github.com/meta-qt5/qt3d/commits/b5.9 -# 5.9.meta-qt5.1 +# 5.9.meta-qt5.2 SRC_URI += " \ file://0001-Allow-a-tools-only-build.patch \ file://0002-Fix-BlenderDNA-for-clang-cross-compiler.patch \ @@ -37,6 +37,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "f39d0a0c32cc489849a0cd5c2880f6e824223485" +SRCREV = "9d8c9ada161ad97634992c444196add0abb4f9d1" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 927912fd..ffa70e53 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -1,5 +1,5 @@ # Copyright (C) 2012-2016 O.S. Systems Software LTDA. -# Copyright (C) 2013-2016 Martin Jansa +# Copyright (C) 2013-2017 Martin Jansa QT_MODULE ?= "${BPN}" QT_MODULE_BRANCH ?= "5.9" @@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" S = "${WORKDIR}/git" -PV = "5.9.0+git${SRCPV}" +PV = "5.9.2+git${SRCPV}" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 336df95b..54a0b785 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -21,7 +21,7 @@ require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared -# 5.9.meta-qt5-shared.1 +# 5.9.meta-qt5-shared.2 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -35,7 +35,7 @@ SRC_URI += "\ # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native -# 5.9.meta-qt5-native.1 +# 5.9.meta-qt5-native.2 SRC_URI += " \ file://0009-Always-build-uic.patch \ " @@ -114,4 +114,4 @@ do_install() { install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} } -SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b" +SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1" diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 28c26603..a8fe4338 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From e13425e6f1e784b0b016cf68a54dfbae32995b86 Mon Sep 17 00:00:00 2001 +From 85da054ff867fbf1a4c10e3f1cad782123ffdfe4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH] Add linux-oe-g++ platform @@ -30,10 +30,10 @@ Signed-off-by: Martin Jansa create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index 73679de621..5a0eebce50 100755 +index 08b49a8d12..5876721743 100755 --- a/configure +++ b/configure -@@ -709,7 +709,7 @@ fi +@@ -712,7 +712,7 @@ fi # is where the resulting variable is written to setBootstrapVariable() { diff --git a/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch index 5ee6e049..b67a7ef1 100644 --- a/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch +++ b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch @@ -1,4 +1,4 @@ -From 5ed152f8caa7ef00fb20d19a06ab5f7887e9aba6 Mon Sep 17 00:00:00 2001 +From b6d5179ad7c907bc3343bcf3586cef6226d0c8ed Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 Subject: [PATCH] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS diff --git a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 7ff1ff71..ae06ea6f 100644 --- a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,4 +1,4 @@ -From 77fab782e8a199f9ede83bc97cbce21a544961c2 Mon Sep 17 00:00:00 2001 +From 8cf43041691140faf5f56b42bebfa00d8ebc8da6 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the diff --git a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch index 5ab6a7b1..8ef4f61c 100644 --- a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch @@ -1,4 +1,4 @@ -From 4848804312f0045b53c85db113ac9e42fe1b7360 Mon Sep 17 00:00:00 2001 +From f02c4f742e90023e87d148bda48401b11815d8ba Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 25 Aug 2015 10:05:15 -0400 Subject: [PATCH] configure: bump path length from 256 to 512 characters @@ -15,7 +15,7 @@ Signed-off-by: Denys Dmytriyenko 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.pri b/configure.pri -index be1b166080..52f03bf3f2 100644 +index 76bb27e4ae..9ac81027c9 100644 --- a/configure.pri +++ b/configure.pri @@ -796,10 +796,10 @@ defineTest(qtConfOutput_preparePaths) { diff --git a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch index 8538901f..610299d2 100644 --- a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch +++ b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch @@ -1,4 +1,4 @@ -From 6ecb404346525a92f4c8926aa285662f3f5010b3 Mon Sep 17 00:00:00 2001 +From 3114a9cd19b15f6b5ca99c4ce961ae5b80bfb3ab Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 24 Oct 2016 09:45:18 +0300 Subject: [PATCH] Disable all unknown features instead of erroring out @@ -10,10 +10,10 @@ Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf -index 966c43108c..32f0dd0041 100644 +index afeb4f3d1d..aec5253c25 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf -@@ -1180,7 +1180,8 @@ defineReplace(qtConfEvaluateSingleExpression) { +@@ -1235,7 +1235,8 @@ defineReplace(qtConfEvaluateSingleExpression) { error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.") return($$result) } diff --git a/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch b/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch index 253815bd..eaa5da84 100644 --- a/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch +++ b/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch @@ -1,4 +1,4 @@ -From 3730ac03a1473a0e1fdfe1537b73818ab99961e9 Mon Sep 17 00:00:00 2001 +From 515acdcfe158982f31b31e410bbedb3db94bea1c Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 11 May 2016 15:20:41 +0200 Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS @@ -30,7 +30,7 @@ Signed-off-by: Pascal Bach 2 files changed, 10 insertions(+) diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 4f342d67d7..202b723882 100644 +index 55c74aad66..f9ec328c83 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -9,6 +9,11 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) diff --git a/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch index 68e4b201..4d3e4b6e 100644 --- a/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch +++ b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch @@ -1,4 +1,4 @@ -From 2fa6b447302abbaf1fd710e94b92692a300baaaf Mon Sep 17 00:00:00 2001 +From 6875848e2250ef439115ff2063713ce7bfb9597d Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Wed, 7 Jun 2017 21:00:49 +0900 Subject: [PATCH] Delete qlonglong and qulonglong diff --git a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch index 678de529..14074fb4 100644 --- a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch +++ b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch @@ -1,4 +1,4 @@ -From 41d7028d2239a98a76cc91939edb2cb728019d08 Mon Sep 17 00:00:00 2001 +From 66da19d96d9a6ea9142df8fcbc0c3b7d960ee6b9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 27 Jul 2017 08:02:51 -0700 Subject: [PATCH] Replace pthread_yield with sched_yield @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp -index b6106e8c9e..6d6ea0b739 100644 +index f9ddd59aaa..2f92db983d 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -34,7 +34,7 @@ diff --git a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch index 118a4f29..2a1d534b 100644 --- a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch @@ -1,4 +1,4 @@ -From 294e4c718407e66631ce36c37258217c9adb3f83 Mon Sep 17 00:00:00 2001 +From bf173918731c626b6c8b84eb826c921e5c6d44f5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 16 Nov 2013 00:32:30 +0100 Subject: [PATCH] Always build uic diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 1c18d0dc..aaa59f33 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = " \ # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared -# 5.9.meta-qt5-shared.1 +# 5.9.meta-qt5-shared.2 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -222,4 +222,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b" +SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index b2a07247..25cd72ba 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtdeclarative" -SRCREV = "116737dc8fa244282dda95a8f13624b66fdb5521" +SRCREV = "25447e889dc43c0831100bee1625a6f667d364cf" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 6b895aaa..d3447efc 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "de7f741c428febfe3c81a28f955996d2314953fc" +SRCREV = "1f47b1a7ae58702dccc57a9ccbaa905441f4fecb" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 0d13dc40..9e91a1d4 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "8dcbf68e4579e03ea6d2808ac0c670169b59d0df" +SRCREV = "94cc2b914a027fbcb7a1eb6cb34af45d0c07d2a4" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 0cbd04e6..471cfee5 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -SRCREV = "84490ff75be5acdaeb3fd93900e4ebf7ba8f539b" +SRCREV = "3f8ae713dfdbaeb34bdc52d905fe5ca16765cf7f" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index ecd64ee3..12e5f4eb 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -29,6 +29,6 @@ do_install_append_class-nativesdk() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" -SRCREV = "96f6ba5f562073f508cd8569ac354592fdd48f4a" +SRCREV = "7c45b035b97ce705d536932965673dca7cfa489e" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb index 8b4fb714..1fa8e826 100644 --- a/recipes-qt/qt5/qtenginio_git.bb +++ b/recipes-qt/qt5/qtenginio_git.bb @@ -14,4 +14,3 @@ DEPENDS += "qtbase qtdeclarative qtxmlpatterns" QT_MODULE_BRANCH = "dev" SRCREV = "0555cf73c8b5abd41d8a4ff02457315c9e7c667d" - diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 94f04a49..a771d9da 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "ef8850fee38e2552d535379a8477c9abebdf8bb4" +SRCREV = "1fc40deed6993265c436783cc367285bf9a2266a" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index edb150e3..6c6f3aef 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -3,16 +3,11 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ - file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ + file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " DEPENDS += "qtdeclarative" @@ -23,4 +18,4 @@ RDEPENDS_${PN}-dev = "" # http://errors.yoctoproject.org/Errors/Build/44912/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "db93af5b2bb49af74fbad6c9cd80bd7010434e78" +SRCREV = "b6ff12df5496f3d296bb438ae343d5f771e93fec" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 4dd64df2..1e022f4a 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "71ccf0dff82835ce7b5aed74c37829afdef44cde" +SRCREV = "144a3535db9f95e60972d3c3b6eaceb65a604577" diff --git a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch index 49fcff6b..7db1676d 100644 --- a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch +++ b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch @@ -1,4 +1,4 @@ -From f7c76b91e726a0e63e5226eb6e89b13e0c3509b7 Mon Sep 17 00:00:00 2001 +From dbc899b088817cf6529d7e5cb8be7a6a95556127 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 7 Jun 2017 13:29:29 +0300 Subject: [PATCH] Make mapbox-gl build configurable @@ -13,15 +13,15 @@ Change-Id: I5f26200f2735b363c3c322f9035b331b9159c47b 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro -index 0810d39..03fc119 100644 +index 459897a8..d97e05d0 100644 --- a/src/plugins/geoservices/geoservices.pro +++ b/src/plugins/geoservices/geoservices.pro @@ -6,7 +6,7 @@ qtConfig(concurrent) { SUBDIRS += osm } --qtConfig(c++14):!win32|mingw:!qnx { -+mapboxgl:qtConfig(c++14):!win32|mingw:!qnx { +-qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx { ++mapboxgl:qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx { !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) { warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.") } else { diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index c50a917a..19f895e9 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" # Patches from https://github.com/meta-qt5/qtlocation/commits/b5.9 -# 5.9.meta-qt5.1 +# 5.9.meta-qt5.2 SRC_URI += "file://0001-Make-mapbox-gl-build-configurable.patch" PACKAGECONFIG ??= "" @@ -34,7 +34,7 @@ SRC_URI += " \ ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ " -SRCREV_qtlocation = "888d351cb0c7fe6d05ab1efe8d4dbb4b6f06cd5f" -SRCREV_qtlocation-mapboxgl = "d45c177e8a23eefcc94930af9fa085e61136bb94" +SRCREV_qtlocation = "c832af789766fcebd8cfb15e53ce14f36278ca6d" +SRCREV_qtlocation-mapboxgl = "9ecbe3642fb4a53b558598239b59bf1d0224c25b" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 998f32f5..729b3ffd 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -26,7 +26,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}" # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.9 -# 5.9.meta-qt5.1 +# 5.9.meta-qt5.2 SRC_URI += "\ file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ " @@ -35,4 +35,4 @@ SRC_URI += "\ # http://errors.yoctoproject.org/Errors/Build/44914/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "559c305ded730e23505e8b29536a98dc59e2acfa" +SRCREV = "343e281f0e7cc7fd9e1558e4d92f5019fa565181" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index eb5e4f61..0655b425 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb @@ -9,4 +9,4 @@ require qt5-git.inc DEPENDS += "qtbase" -SRCREV = "86c5036848ad004208803d9d497cfcd08c9623d6" +SRCREV = "3d93f6436596e349e43c3798b675af66db71df8a" diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index 1f680e62..eaa36611 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb @@ -24,4 +24,7 @@ do_configure_prepend() { } QT_MODULE_BRANCH = "dev" -SRCREV = "695460401d9a89d2f156016d51601b2e59b64105" +# one commit behind: +# 8a7b80eb Use QRandomGenerator instead of q?rand +# because QRandomGenerator is only since Qt 5.10 +SRCREV = "9bf0edd9bd46ecb900bcdc3349d14869b87ab7de" diff --git a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch index 85fcc158..2e644803 100644 --- a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch +++ b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch @@ -1,4 +1,4 @@ -From fca6212d5ebc5851f28e820e4ff0ebe04a9d44d7 Mon Sep 17 00:00:00 2001 +From 3248edbde8859f62f453215876fbcb89dd788513 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Thu, 31 Mar 2016 19:57:01 -0400 Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class QDebug' @@ -11,7 +11,7 @@ Signed-off-by: Denys Dmytriyenko 1 file changed, 1 insertion(+) diff --git a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp -index bdecf5b..811a761 100644 +index 69da88f0..9039191e 100644 --- a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp +++ b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp @@ -54,6 +54,7 @@ diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index a84cfb32..e123f0d2 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative" -SRCREV = "ef6b8d3081f0bf93d6d59e67c8e3f82c63c511c3" +SRCREV = "63f2f55462f2f040cfe175ada8aa1e01168597fc" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 0ea314b8..50d6ba6c 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -23,9 +23,9 @@ FILES_${PN}-qmlplugins += " \ " # Patches from https://github.com/meta-qt5/qtquickcontrols/commits/b5.9 -# 5.9.meta-qt5.1 +# 5.9.meta-qt5.2 SRC_URI += " \ file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ " -SRCREV = "dacb91916b202208681471ba764504c7c7d086f0" +SRCREV = "a77494140324c3ede1f7c16086593c070d81e2b3" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index a7e34472..1e90323b 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -12,7 +12,7 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" # Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.9 -# 5.9.meta-qt5.1 +# 5.9.meta-qt5.2 SRC_URI += " \ file://0001-Allow-a-tools-only-build.patch \ " @@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "ae0b101884b05355e3a7bc06dbca722ad3d08d0f" +SRCREV = "6e0341bc878ff82d3c1039dcce09f92269546189" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index e7acafe5..9061c3c7 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -29,4 +29,4 @@ DEPENDS += "qtbase" # http://errors.yoctoproject.org/Errors/Build/44915/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "e00ca9b6bec2adf78fd14e02376ecf1b55a93b0c" +SRCREV = "86ee61734e0331459f9cfeb1ad56f773b7e994be" diff --git a/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch b/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch index 0b90a66b..dc988fa6 100644 --- a/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch +++ b/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch @@ -1,4 +1,4 @@ -From 210049f0e53f7fb8e5c44325b13947add9618f89 Mon Sep 17 00:00:00 2001 +From 89c9f60679b21629412503a17358426bf211a81b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 10 Jan 2017 15:28:26 +0200 Subject: [PATCH] Use external host bin path for cmake file @@ -14,7 +14,7 @@ Change-Id: Idb814be705e9cbaad7f1e68b5d7cdb79c4b65008 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scxml/Qt5ScxmlConfigExtras.cmake.in b/src/scxml/Qt5ScxmlConfigExtras.cmake.in -index edb320a..c2f8be8 100644 +index edb320a..ce7f2df 100644 --- a/src/scxml/Qt5ScxmlConfigExtras.cmake.in +++ b/src/scxml/Qt5ScxmlConfigExtras.cmake.in @@ -40,7 +40,7 @@ if (NOT TARGET Qt5::qscxmlc) diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index e9ca8c19..36ca665d 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,10 +10,10 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "eff82ac957e051f16f64c287f2dfaec9049bdfc1" +SRCREV = "a1dff1a11ad303a1f82f181e6386194de90ec08f" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9 -# 5.9.meta-qt5.1 +# 5.9.meta-qt5.2 SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" do_install_append_class-nativesdk() { diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 17d06394..6b2c28e3 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -3,14 +3,13 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ - file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ + file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ + file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " DEPENDS += "qtbase qtdeclarative" -SRCREV = "0c3c4d01ea34ed98a0d2928662f07b673f00535d" +SRCREV = "1673dbed00ba68209b6de95981f1e3b4a2a24682" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 93a826bd..d3a83a72 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "20811e3b004af817e3f02982c755e8b1560b8c3d" +SRCREV = "1d37c357c843a2622d2af7e1684576e19a8c7c30" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 957000c4..056e2377 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "687f5a9bd44a45a29d24925f29470c43d6729dee" +SRCREV = "93b539140c06da07d330c9ecad67ab5ed3f9b0c8" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index fb8d44e1..40854e0b 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "4fd787e90c70afbaa168abb3efdb8757ba77f3a4" +SRCREV = "0fcd0160662941a9ba800b36671e88d82790bd95" diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb index 7c155a28..911a7098 100644 --- a/recipes-qt/qt5/qtsystems_git.bb +++ b/recipes-qt/qt5/qtsystems_git.bb @@ -30,4 +30,4 @@ do_install_append() { QT_MODULE_BRANCH = "dev" -SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37" +SRCREV = "f364358a817ba57fa5aa9c67e731241249e704f8" diff --git a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch index ed25390b..7549ce9c 100644 --- a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch @@ -1,4 +1,4 @@ -From e0387540876944a20461d60d2208191c734e00b1 Mon Sep 17 00:00:00 2001 +From 0098107f710e363d41b4913758302b43adccf2bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 4 Jun 2014 11:28:16 +0200 Subject: [PATCH] add noqtwebkit configuration @@ -16,16 +16,16 @@ Signed-off-by: Martin Jansa 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro -index 540c9689..2312b521 100644 +index 82f55092..ef07ee03 100644 --- a/src/assistant/assistant/assistant.pro +++ b/src/assistant/assistant/assistant.pro @@ -1,4 +1,4 @@ --false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { -+false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) { - # FIXME: currently broken +-qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { ++qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) { BROWSER = qtwebkit } else { -@@ -76,7 +76,7 @@ SOURCES += aboutdialog.cpp \ + BROWSER = qtextbrowser +@@ -75,7 +75,7 @@ SOURCES += aboutdialog.cpp \ openpagesmanager.cpp \ openpagesswitcher.cpp diff --git a/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch index b2e017eb..80f2ae73 100644 --- a/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch +++ b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch @@ -1,4 +1,4 @@ -From 779278a109450ae84d5deb2e1e1c0dd9b737f1a2 Mon Sep 17 00:00:00 2001 +From 105277d4878ee1627bfb3be3d10833020e6923fc Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Thu, 9 Jul 2015 11:28:19 -0400 Subject: [PATCH] linguist-tools cmake: allow overriding the location for diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 871b0613..32d65d6a 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -15,7 +15,7 @@ inherit ptest DEPENDS += "qtbase qtdeclarative qtxmlpatterns" # Patches from https://github.com/meta-qt5/qttools/commits/b5.9 -# 5.9.meta-qt5.1 +# 5.9.meta-qt5.2 SRC_URI += " \ file://run-ptest \ file://0001-add-noqtwebkit-configuration.patch \ @@ -30,7 +30,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" -SRCREV = "88e02bb0a9b97d68a4b270e4ddfb6d0847c702a9" +SRCREV = "fdc5749b5603653c5d0c59db267f44fd1609457e" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 822517f6..0238ce91 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -1,12 +1,9 @@ require qt5.inc require qt5-git.inc -LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" +LICENSE = "GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ + file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ " DEPENDS += "qtbase qttools-native" @@ -114,4 +111,4 @@ FILES_${PN}-qt = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ " -SRCREV = "3e727a890f7856978469ee38ef0619b1b59a8ca7" +SRCREV = "325a90e07e9dce4e5c915549e6c31a86423dfdd3" diff --git a/recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch b/recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch index 8518ae96..c74854f3 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch +++ b/recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch @@ -1,4 +1,4 @@ -From 78106c5b939cc7d84710fe4c8e2a356ac1f110ef Mon Sep 17 00:00:00 2001 +From 2e76f24615766593ad6eb182627fa9d0bdba3c2d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 12 Jul 2017 23:59:52 -0700 Subject: [PATCH] include sys/time.h for timeval @@ -23,6 +23,3 @@ index 1b9673f..924be7b 100644 #ifdef _WIN32 #include // timeval #else --- -2.13.2 - diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index ec1dc42f..122d0681 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ " # Patches from https://github.com/meta-qt5/qtvirtualkeyboard/commits/b5.9 -# 5.9.meta-qt5.1 +# 5.9.meta-qt5.2 SRC_URI += "file://0001-include-sys-time.h-for-timeval.patch" # To enabled Nuance T9 Write support, you need to provide the licensed components @@ -53,4 +53,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" -SRCREV = "bdf61afe76e94ef03da1332c4540646f18f5852f" +SRCREV = "dd8c39ea9312ec1441b3fdd830f9d42fe3258b58" diff --git a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch index a86868e9..11acd5fd 100644 --- a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch +++ b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch @@ -1,4 +1,4 @@ -From 434be8d326adb02b7b0960481f045dc1a443cfce Mon Sep 17 00:00:00 2001 +From c4fae91b3d2b2b0f64e3fafac456a6a917c69e88 Mon Sep 17 00:00:00 2001 From: Raphael Freudiger Date: Tue, 10 Jan 2017 15:49:55 +0100 Subject: [PATCH] fix build without xkbcommon-evdev diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index cece86ed..9847f393 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,10 +37,10 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "f1cf62fa8e9ffa2548c9968906848596f50dbc0b" +SRCREV = "7f70da6a644bc5b690066f0ab4814e1358f57e81" # Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9 -# 5.9.meta-qt5.1 +# 5.9.meta-qt5.2 # From https://bugreports.qt.io/browse/QTBUG-57767 SRC_URI += " \ file://0001-fix-build-without-xkbcommon-evdev.patch \ diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index f1167a9e..7e12a337 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -3,18 +3,13 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ - file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ + file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "6383f0fc5eec4935697a6d2d2f87b511bbeb678e" +SRCREV = "b5229df6a08a902b11a2fc9529af6385f4d985d5" diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch index 44c3f0b2..0e9ea724 100644 --- a/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch +++ b/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch @@ -1,4 +1,4 @@ -From 1634633d27cea7369111c9ea6d08be8515c15ccd Mon Sep 17 00:00:00 2001 +From d559da6ab0834aeb7307008015b6232e586fea00 Mon Sep 17 00:00:00 2001 From: Cleiton Bueno Date: Thu, 24 Dec 2015 12:46:58 -0200 Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX diff --git a/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch index a91a2982..275ef9e8 100644 --- a/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From 491576d7e67d00b93106592140e5d7f0f34ea641 Mon Sep 17 00:00:00 2001 +From 96746f09947cc36f6c9fc8631bc6a6e7f59efe24 Mon Sep 17 00:00:00 2001 From: Frieder Schrempf Date: Mon, 1 Dec 2014 14:34:40 +0000 Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform @@ -12,10 +12,10 @@ Signed-off-by: Martin Jansa 1 file changed, 6 insertions(+) diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf -index eb421f8b..4513742d 100644 +index 56894e58..ef418a4c 100644 --- a/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf -@@ -33,6 +33,12 @@ defineTest(isPlatformSupported) { +@@ -21,6 +21,12 @@ defineTest(isPlatformSupported) { return(false) } gcc:!clang:!isGCCVersionSupported(): return(false) diff --git a/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch index d5567c35..6ada3f94 100644 --- a/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch +++ b/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch @@ -1,4 +1,4 @@ -From 6b48d76b5af38a49f8e438e45c387f01b263e483 Mon Sep 17 00:00:00 2001 +From 06e9e7844ffa2b6985e5fa7a1c475c8a54ca252a Mon Sep 17 00:00:00 2001 From: Cleiton Bueno Date: Fri, 25 Dec 2015 18:16:05 -0200 Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor @@ -9,7 +9,7 @@ Signed-off-by: Cleiton Bueno 1 file changed, 2 insertions(+) diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h -index 2ecd70d7..703d1a92 100644 +index 19ecf5e1..f6f638ee 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -59,6 +59,8 @@ diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch index 5f9eb3a7..4a1a975f 100644 --- a/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch @@ -1,4 +1,4 @@ -From b1a6f73d49a340e99145a4c4cf70dc796ed632ff Mon Sep 17 00:00:00 2001 +From a0b1a742813d0846472fab4aada2388bf2d42d80 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 15 Mar 2017 13:53:28 +0200 Subject: [PATCH] chromium: Force host toolchain configuration diff --git a/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch index 2fa1764d..8c0484bd 100644 --- a/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch +++ b/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch @@ -1,4 +1,4 @@ -From 95a6e3fd9e8498cb1f59120d402ec8ecfcd3ec59 Mon Sep 17 00:00:00 2001 +From bfd5e19fea1315d10b3217acaf92dfc32018ad03 Mon Sep 17 00:00:00 2001 From: Cleiton Bueno Date: Thu, 24 Dec 2015 15:59:51 -0200 Subject: [PATCH] Include dependency to QCoreApplication::translate() diff --git a/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch index 8785842a..d3c7a315 100644 --- a/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch +++ b/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch @@ -1,4 +1,4 @@ -From 8910e65fd777120261f16c4a35ace2b0dc6181b3 Mon Sep 17 00:00:00 2001 +From 6d4d1b4cd380c51a6709c97524fbce0e0f09ce39 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 14:01:12 -0700 Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not diff --git a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch index 142595a3..258afd53 100644 --- a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch @@ -1,4 +1,4 @@ -From e81f0a5139f8f1ea131438def3fe1aabe997aeff Mon Sep 17 00:00:00 2001 +From 5106be504b7edb7bc75309d581dfd33a89ed04fc Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 15 Mar 2017 13:53:28 +0200 Subject: [PATCH] Force host toolchain configuration @@ -13,10 +13,10 @@ Signed-off-by: Samuli Piippo 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro -index fd27643e..f9acb6ff 100644 +index f1b3d47b..521c507b 100644 --- a/src/buildtools/configure_host.pro +++ b/src/buildtools/configure_host.pro -@@ -28,9 +28,9 @@ GN_CONTENTS = \ +@@ -29,9 +29,9 @@ GN_CONTENTS = \ "import(\"//build/config/sysroot.gni\")" \ "import(\"//build/toolchain/gcc_toolchain.gni\")" \ "gcc_toolchain(\"host\") {" \ @@ -29,7 +29,7 @@ index fd27643e..f9acb6ff 100644 " ar = \"$$which(ar)\" " \ " nm = \"$$which(nm)\" " \ " toolchain_args = { " \ -@@ -41,9 +41,9 @@ GN_CONTENTS = \ +@@ -42,9 +42,9 @@ GN_CONTENTS = \ " } " \ "}" \ "gcc_toolchain(\"v8_snapshot\") {" \ diff --git a/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch index 05b813b2..71e36bbd 100644 --- a/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +++ b/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch @@ -1,4 +1,4 @@ -From 86f467724070e854c8c6b13269951c97c0832dae Mon Sep 17 00:00:00 2001 +From 6d92d4b6f7adf913da77b4aae837a5880e64aa21 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 14:09:06 -0700 Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux diff --git a/recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch b/recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted file mode 100644 index c63086d5..00000000 --- a/recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch +++ /dev/null @@ -1,241 +0,0 @@ -From a8c0deca850ca519b3f146c71492a8f42a33dd84 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=BCri=20Valdmann?= -Date: Tue, 20 Jun 2017 15:36:43 +0200 -Subject: [PATCH] Always compile QWebEnginePage::print - -- Remove two out of five layers of ifdefs around and inside this method. -- Now always compiled but will yield an error if printing is disabled. -- Remove printing-related ifdefs from demobrowser. - -Task-number: QTBUG-61510 -Change-Id: I79781189d3d3fb62db0a2216b2b989e3fa1d1f86 -Reviewed-by: Allan Sandfeld Jensen -Reviewed-by: Rolf Eike Beer ---- - examples/webenginewidgets/demobrowser/browsermainwindow.cpp | 12 ------------ - examples/webenginewidgets/demobrowser/browsermainwindow.h | 6 ------ - examples/webenginewidgets/demobrowser/printtopdfdialog.cpp | 7 ------- - src/webenginewidgets/api/qwebenginepage.cpp | 10 ++-------- - src/webenginewidgets/api/qwebenginepage.h | 8 -------- - 5 files changed, 2 insertions(+), 41 deletions(-) - -diff --git a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp -index 327d7a9d..14d49f7f 100644 ---- a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp -+++ b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp -@@ -109,9 +109,7 @@ BrowserMainWindow::BrowserMainWindow(QWidget *parent, Qt::WindowFlags flags) - , m_historyForward(0) - , m_stop(0) - , m_reload(0) --#ifndef QT_NO_PRINTER - , m_currentPrinter(nullptr) --#endif - { - setToolButtonStyle(Qt::ToolButtonFollowStyle); - setAttribute(Qt::WA_DeleteOnClose, true); -@@ -312,9 +310,7 @@ void BrowserMainWindow::setupMenu() - #if defined(QWEBENGINEPAGE_PRINT) - fileMenu->addAction(tr("P&rint Preview..."), this, SLOT(slotFilePrintPreview())); - #endif --#ifndef QT_NO_PRINTER - fileMenu->addAction(tr("&Print..."), this, SLOT(slotFilePrint()), QKeySequence::Print); --#endif - fileMenu->addAction(tr("&Print to PDF..."), this, SLOT(slotFilePrintToPDF())); - fileMenu->addSeparator(); - -@@ -702,23 +698,19 @@ void BrowserMainWindow::slotFileOpen() - - void BrowserMainWindow::slotFilePrintPreview() - { --#ifndef QT_NO_PRINTPREVIEWDIALOG - if (!currentTab()) - return; - QPrintPreviewDialog *dialog = new QPrintPreviewDialog(this); - connect(dialog, SIGNAL(paintRequested(QPrinter*)), - currentTab(), SLOT(print(QPrinter*))); - dialog->exec(); --#endif - } - - void BrowserMainWindow::slotFilePrint() - { --#ifndef QT_NO_PRINTER - if (!currentTab()) - return; - printRequested(currentTab()->page()); --#endif - } - - void BrowserMainWindow::slotHandlePdfPrinted(const QByteArray& result) -@@ -751,7 +743,6 @@ void BrowserMainWindow::slotFilePrintToPDF() - currentTab()->page()->printToPdf(invoke(this, &BrowserMainWindow::slotHandlePdfPrinted), dialog->pageLayout()); - } - --#ifndef QT_NO_PRINTER - void BrowserMainWindow::slotHandlePagePrinted(bool result) - { - Q_UNUSED(result); -@@ -763,7 +754,6 @@ void BrowserMainWindow::slotHandlePagePrinted(bool result) - - void BrowserMainWindow::printRequested(QWebEnginePage *page) - { --#ifndef QT_NO_PRINTDIALOG - if (m_currentPrinter) - return; - m_currentPrinter = new QPrinter(); -@@ -774,9 +764,7 @@ void BrowserMainWindow::printRequested(QWebEnginePage *page) - return; - } - page->print(m_currentPrinter, invoke(this, &BrowserMainWindow::slotHandlePagePrinted)); --#endif - } --#endif - - void BrowserMainWindow::slotPrivateBrowsing() - { -diff --git a/examples/webenginewidgets/demobrowser/browsermainwindow.h b/examples/webenginewidgets/demobrowser/browsermainwindow.h -index 91e1c1d2..5bbbb292 100644 ---- a/examples/webenginewidgets/demobrowser/browsermainwindow.h -+++ b/examples/webenginewidgets/demobrowser/browsermainwindow.h -@@ -56,9 +56,7 @@ - #include - - QT_BEGIN_NAMESPACE --#ifndef QT_NO_PRINTER - class QPrinter; --#endif - class QWebEnginePage; - QT_END_NAMESPACE - -@@ -142,10 +140,8 @@ private slots: - void slotSwapFocus(); - void slotHandlePdfPrinted(const QByteArray&); - --#ifndef QT_NO_PRINTER - void slotHandlePagePrinted(bool result); - void printRequested(QWebEnginePage *page); --#endif - void geometryChangeRequested(const QRect &geometry); - void updateToolbarActionText(bool visible); - void updateBookmarksToolbarActionText(bool visible); -@@ -180,9 +176,7 @@ private: - QAction *m_restoreLastSession; - QAction *m_addBookmark; - --#ifndef QT_NO_PRINTER - QPrinter *m_currentPrinter; --#endif - - QIcon m_reloadIcon; - QIcon m_stopIcon; -diff --git a/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp b/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp -index 0f3b1765..50a8bb91 100644 ---- a/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp -+++ b/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp -@@ -52,10 +52,8 @@ - #include "ui_printtopdfdialog.h" - - #include --#ifndef QT_NO_PRINTER - #include - #include --#endif // QT_NO_PRINTER - #include - - PrintToPdfDialog::PrintToPdfDialog(const QString &filePath, QWidget *parent) : -@@ -66,11 +64,8 @@ PrintToPdfDialog::PrintToPdfDialog(const QString &filePath, QWidget *parent) : - ui->setupUi(this); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - connect(ui->chooseFilePathButton, &QToolButton::clicked, this, &PrintToPdfDialog::onChooseFilePathButtonClicked); --#ifndef QT_NO_PRINTER - connect(ui->choosePageLayoutButton, &QToolButton::clicked, this, &PrintToPdfDialog::onChoosePageLayoutButtonClicked); --#else - ui->choosePageLayoutButton->hide(); --#endif // QT_NO_PRINTER - updatePageLayoutLabel(); - setFilePath(filePath); - } -@@ -82,7 +77,6 @@ PrintToPdfDialog::~PrintToPdfDialog() - - void PrintToPdfDialog::onChoosePageLayoutButtonClicked() - { --#ifndef QT_NO_PRINTER - QPrinter printer; - printer.setPageLayout(currentPageLayout); - -@@ -92,7 +86,6 @@ void PrintToPdfDialog::onChoosePageLayoutButtonClicked() - currentPageLayout.setPageSize(printer.pageLayout().pageSize()); - currentPageLayout.setOrientation(printer.pageLayout().orientation()); - updatePageLayoutLabel(); --#endif // QT_NO_PRINTER - } - - void PrintToPdfDialog::onChooseFilePathButtonClicked() -diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp -index 82720ae3..20d3268c 100644 ---- a/src/webenginewidgets/api/qwebenginepage.cpp -+++ b/src/webenginewidgets/api/qwebenginepage.cpp -@@ -80,11 +80,9 @@ - #include - #include - #include --#if defined(QT_PRINTSUPPORT_LIB) --#ifndef QT_NO_PRINTER -+#ifdef ENABLE_PRINTING - #include --#endif //QT_NO_PRINTER --#endif //QT_PRINTSUPPORT_LIB -+#endif - #include - #include - #include -@@ -2052,8 +2050,6 @@ void QWebEnginePage::printToPdf(const QWebEngineCallback &res - #endif // if defined(ENABLE_PDF) - } - --#if defined(QT_PRINTSUPPORT_LIB) --#ifndef QT_NO_PRINTER - /*! - \fn void QWebEnginePage::print(QPrinter *printer, FunctorOrLambda resultCallback) - Renders the current content of the page into a temporary PDF document, then prints it using \a printer. -@@ -2090,8 +2086,6 @@ void QWebEnginePage::print(QPrinter *printer, const QWebEngineCallback &re - d->m_callbacks.invokeDirectly(resultCallback, false); - #endif // if defined(ENABLE_PDF) - } --#endif // if defined(QT_NO_PRINTER) --#endif // if defined(QT_PRINTSUPPORT_LIB) - - /*! - \since 5.7 -diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h -index c7d5a19e..5619639c 100644 ---- a/src/webenginewidgets/api/qwebenginepage.h -+++ b/src/webenginewidgets/api/qwebenginepage.h -@@ -55,11 +55,7 @@ - - QT_BEGIN_NAMESPACE - class QMenu; --#if defined(QT_PRINTSUPPORT_LIB) --#ifndef QT_NO_PRINTER - class QPrinter; --#endif // QT_NO_PRINTER --#endif // QT_PRINTSUPPORT_LIB - - class QWebChannel; - class QWebEngineContextMenuData; -@@ -294,15 +290,11 @@ public: - void printToPdf(const QWebEngineCallback &resultCallback, const QPageLayout &layout = QPageLayout(QPageSize(QPageSize::A4), QPageLayout::Portrait, QMarginsF())); - #endif - --#if defined(QT_PRINTSUPPORT_LIB) --#ifndef QT_NO_PRINTER - #ifdef Q_QDOC - void print(QPrinter *printer, FunctorOrLambda resultCallback); - #else - void print(QPrinter *printer, const QWebEngineCallback &resultCallback); - #endif // QDOC --#endif // QT_NO_PRINTER --#endif // QT_PRINTSUPPORT_LIB - - const QWebEngineContextMenuData &contextMenuData() const; - diff --git a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch index 2d7bd02b..00c875b0 100644 --- a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch +++ b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch @@ -1,4 +1,4 @@ -From 0a409a773f2b2936a2f1868d983e7bd1c92110bd Mon Sep 17 00:00:00 2001 +From 8780db69819ba37c8e2364ba361b03badf3c3ee4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 14:37:49 -0700 Subject: [PATCH] chromium: musl: include fcntl.h for loff_t diff --git a/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch index f58de8f2..085cb012 100644 --- a/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch +++ b/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch @@ -1,4 +1,4 @@ -From 375b70a99760c156b45e60def9bafd04902fb5a4 Mon Sep 17 00:00:00 2001 +From b360b036bb1ad31a74c056ce5d19e0271d75ff57 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 14:38:37 -0700 Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t diff --git a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch index c3b1cbb2..e23cabe3 100644 --- a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch +++ b/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch @@ -1,4 +1,4 @@ -From 314cfb7b41be8fc4f962956e0acd34f110114c6e Mon Sep 17 00:00:00 2001 +From 455a6603a33a87dfb7ab85a09587f534d9f5d984 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 14:54:38 -0700 Subject: [PATCH] chromium: musl: linux != glibc, make the distinction diff --git a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch index 550fd79e..53e8a817 100644 --- a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch +++ b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch @@ -1,4 +1,4 @@ -From bc3745992889e3dc3b42c890b6a458038c6994e0 Mon Sep 17 00:00:00 2001 +From aa3bfc656b3c84aba04c8294ad17c630141f4b09 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 15:09:02 -0700 Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols diff --git a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch index 82a2ccc5..385e729d 100644 --- a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch +++ b/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch @@ -1,4 +1,4 @@ -From de4e672044de11c5927aeb42a554f5eced0abf6c Mon Sep 17 00:00:00 2001 +From 85b21493f19bd2046f84836e03f0a9c32862bce8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 15:12:39 -0700 Subject: [PATCH] chromium: musl: Use correct member name __si_fields from diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 98797493..2815cb9b 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 \ @@ -130,18 +130,17 @@ RDEPENDS_${PN}-examples += " \ QT_MODULE_BRANCH_CHROMIUM = "56-based" # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 -# 5.9.meta-qt5.1 +# 5.9.meta-qt5.2 SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ 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-Always-compile-QWebEnginePage-print.patch \ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based -# 56-based.meta-qt5.1 +# 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 \ @@ -163,8 +162,8 @@ SRC_URI_append_libc-musl = "\ file://0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "73f7be5b2a95eab3dce11caede538eeb7beb71f2" -SRCREV_chromium = "aa2fdd6be3d465280d2a0c3aacdc738bb4ffec05" +SRCREV_qtwebengine = "99f84ffd2c0c78014a24534a863aa1c755abd51c" +SRCREV_chromium = "21508b5b5421f10ba8627c3c66c5281efb39b2f9" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb index 286aecae..3e3e4a0b 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb @@ -17,4 +17,4 @@ DEPENDS += "qtwebkit qtxmlpatterns" RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" -SRCREV = "822426abc77a74752b0ee0da4d0a1c106c4dac22" +SRCREV = "a24c780b60d7d8bc00c4a48042cf7f32db777d55" diff --git a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch index d393dc41..764b0305 100644 --- a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +++ b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch @@ -1,4 +1,4 @@ -From f8bcac01fd5d95d0df8342809c53917aff1bf798 Mon Sep 17 00:00:00 2001 +From c4e691a8dd2037d9b359e0de9d4790da9078f74e Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Fri, 7 Feb 2014 04:07:17 +0100 Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) diff --git a/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch b/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch index 147a7baa..cec6376d 100644 --- a/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch +++ b/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch @@ -1,4 +1,4 @@ -From 5d4f3219be0b66d63765e077644a51e18b1f4502 Mon Sep 17 00:00:00 2001 +From fc2773961eaa536e6a617ded7c1a972d979fa2e4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 5 Jun 2015 19:55:05 -0700 Subject: [PATCH] Exclude backtrace() API for non-glibc libraries diff --git a/recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch b/recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted file mode 100644 index debbda1e..00000000 --- a/recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 240bd33ba3e78fcc0e5e3299d9e0e53299ea07f8 Mon Sep 17 00:00:00 2001 -From: Konstantin Tokarev -Date: Thu, 4 May 2017 15:12:37 +0300 -Subject: [PATCH] Fix compilation with ICU 59 - -Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612 - -Task-number: QTBUG-60532 -Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843 -Reviewed-by: Allan Sandfeld Jensen ---- - Source/JavaScriptCore/API/JSStringRef.cpp | 6 +++--- - Source/JavaScriptCore/runtime/DateConversion.cpp | 3 ++- - Source/WTF/wtf/TypeTraits.h | 3 +++ - Source/WebKit2/Shared/API/c/WKString.cpp | 2 +- - 4 files changed, 9 insertions(+), 5 deletions(-) - -diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp -index 812f3d413..77a3fd0f4 100644 ---- a/Source/JavaScriptCore/API/JSStringRef.cpp -+++ b/Source/JavaScriptCore/API/JSStringRef.cpp -@@ -37,7 +37,7 @@ using namespace WTF::Unicode; - JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars) - { - initializeThreading(); -- return OpaqueJSString::create(chars, numChars).leakRef(); -+ return OpaqueJSString::create(reinterpret_cast(chars), numChars).leakRef(); - } - - JSStringRef JSStringCreateWithUTF8CString(const char* string) -@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string) - JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars) - { - initializeThreading(); -- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); -+ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); - } - - JSStringRef JSStringRetain(JSStringRef string) -@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string) - - const JSChar* JSStringGetCharactersPtr(JSStringRef string) - { -- return string->characters(); -+ return reinterpret_cast(string->characters()); - } - - size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string) -diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp -index 0b57f012d..05e27338b 100644 ---- a/Source/JavaScriptCore/runtime/DateConversion.cpp -+++ b/Source/JavaScriptCore/runtime/DateConversion.cpp -@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as - #if OS(WINDOWS) - TIME_ZONE_INFORMATION timeZoneInformation; - GetTimeZoneInformation(&timeZoneInformation); -- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; -+ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; -+ String timeZoneName(reinterpret_cast(winTimeZoneName)); - #else - struct tm gtm = t; - char timeZoneName[70]; -diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h -index 9df2c95cf..f5d6121fd 100644 ---- a/Source/WTF/wtf/TypeTraits.h -+++ b/Source/WTF/wtf/TypeTraits.h -@@ -72,6 +72,9 @@ namespace WTF { - template<> struct IsInteger { static const bool value = true; }; - template<> struct IsInteger { static const bool value = true; }; - template<> struct IsInteger { static const bool value = true; }; -+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_SUPPORT) -+ template<> struct IsInteger { static const bool value = true; }; -+#endif - #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) - template<> struct IsInteger { static const bool value = true; }; - #endif -diff --git a/Source/WebKit2/Shared/API/c/WKString.cpp b/Source/WebKit2/Shared/API/c/WKString.cpp -index cbac67dd8..23400a64e 100644 ---- a/Source/WebKit2/Shared/API/c/WKString.cpp -+++ b/Source/WebKit2/Shared/API/c/WKString.cpp -@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef) - size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength) - { - COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar); -- return (toImpl(stringRef)->getCharacters(static_cast(buffer), bufferLength)); -+ return (toImpl(stringRef)->getCharacters(reinterpret_cast(buffer), bufferLength)); - } - - size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef) diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 0792c4ad..8b3c3f50 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -19,11 +19,10 @@ ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" # Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.9 -# 5.9.meta-qt5.1 +# 5.9.meta-qt5.2 SRC_URI += "\ file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \ file://0002-Exclude-backtrace-API-for-non-glibc-libraries.patch \ - file://0003-Fix-compilation-with-ICU-59.patch \ " PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel \ @@ -88,4 +87,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" -SRCREV = "f27089657a207ef8c5c9d27d661d3d12c3af8df2" +SRCREV = "97c4a80a1282c8c3eaa343011286b76fd4838c5f" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 41ec27f6..448ce5c4 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -1,14 +1,14 @@ require qt5.inc require qt5-git.inc -LICENSE = "GFDL-1.3 & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" +LICENSE = "GFDL-1.3 & (GPL-3 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \ + file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ + file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " DEPENDS += "qtbase qtdeclarative" -SRCREV = "1421c3e4ae4213ca18f2f51d5ddb38e223450222" +SRCREV = "fb71c823a7ae823345518ca33ccfe273fcf76494" diff --git a/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch b/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch deleted file mode 100644 index 82087b9a..00000000 --- a/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch +++ /dev/null @@ -1,22 +0,0 @@ -From b946b6ea4a2a30bd12ecd036e40c9ef671681ba8 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Fri, 2 Jun 2017 13:12:18 +0300 -Subject: [PATCH] Add missing include for qWarning - -Change-Id: I7c7699e7a2b7ce59e4f659d460ec835f59bba439 ---- - src/webview/qquickwebview.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/webview/qquickwebview.cpp b/src/webview/qquickwebview.cpp -index d760564..fbbbfd6 100644 ---- a/src/webview/qquickwebview.cpp -+++ b/src/webview/qquickwebview.cpp -@@ -39,6 +39,7 @@ - #include - #include - #include -+#include - - namespace { - diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 8b79aa1c..0bbb09ea 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -9,10 +9,6 @@ LIC_FILES_CHKSUM = " \ require qt5.inc require qt5-git.inc -# Patches from https://github.com/meta-qt5/qtwebview/commits/b5.9 -# 5.9.meta-qt5.1 -SRC_URI += "file://0001-Add-missing-include-for-qWarning.patch" - DEPENDS += "qtbase qtwebengine" COMPATIBLE_MACHINE = "(-)" @@ -23,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_armv7ve = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" -SRCREV = "6e55abf3b6a5f373cd4b649c2318a45c49b40589" +SRCREV = "e4016a67bbffefed71a407494e249e978d212b3d" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index bf03e9bb..ed1440c1 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "9e83ff8713c1a3f69ce514bf3e31335194668da7" +SRCREV = "f65d50eb063ad3c9a1d6f008f66e881d2e15f1d8" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 30e52629..7c18079a 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "c1c3af0ae456247c9bcd30161d51a94c9b38dc52" +SRCREV = "fcfa824402bb4edaf644fad786dac3560c743ebe" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3 From b7ae79a05430b4e2e6eecfef8aa2105c3b5e856d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 20 Aug 2017 22:42:07 +0200 Subject: qtwebengine: fix build with glibc-2.26 Signed-off-by: Martin Jansa --- ...qtbug-61521.cpp-use-free-instead-of-cfree.patch | 25 ++++++++++++++++++++++ recipes-qt/qt5/qtwebengine_git.bb | 3 ++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch diff --git a/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch b/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch new file mode 100644 index 00000000..7375ff72 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch @@ -0,0 +1,25 @@ +From b4eb5c926cf822ee5d5cf398d1bcdb0fdca6e47a Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 20 Aug 2017 20:37:38 +0200 +Subject: [PATCH] qtbug-61521.cpp: use free instead of cfree + +* as cfree man says: + This function should never be used. Use free(3) instead. + Starting with version 2.26, it has been removed from glibc. +--- + src/core/api/qtbug-61521.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp +index 86d5998e..1dcc4cfa 100644 +--- a/src/core/api/qtbug-61521.cpp ++++ b/src/core/api/qtbug-61521.cpp +@@ -100,7 +100,7 @@ SHIM_HIDDEN void* ShimCalloc(size_t n, size_t size) { + } + + SHIM_HIDDEN void ShimCFree(void* ptr) { +- cfree(ptr); ++ free(ptr); + } + + SHIM_HIDDEN void* ShimMemalign(size_t align, size_t s) { diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 2815cb9b..cdb4512f 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -130,13 +130,14 @@ RDEPENDS_${PN}-examples += " \ QT_MODULE_BRANCH_CHROMIUM = "56-based" # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 -# 5.9.meta-qt5.2 +# 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-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 -- cgit v1.2.3 From c4c70e76c1ead05c32b6089e32c75eb93b42ae55 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 21 Aug 2017 11:58:45 +0200 Subject: qtwebengine: update 0004-Force-host-toolchain-configuration.patch * refresh the patch from: http://code.qt.io/cgit/yocto/meta-qt5.git/diff/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch?id=5bac910f95453d0df6fe540778dd16a9707dcabf * might fix passing arm specific flags into host builds like: gcc: error: unrecognized command line option '-mflooat-abi=hard' strip: unable to recognise the format of the input file Signed-off-by: Martin Jansa --- .../0004-Force-host-toolchain-configuration.patch | 35 +++++++++++++++++++--- ...qtbug-61521.cpp-use-free-instead-of-cfree.patch | 2 +- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch index 258afd53..bda0ba1a 100644 --- a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch @@ -1,4 +1,4 @@ -From 5106be504b7edb7bc75309d581dfd33a89ed04fc Mon Sep 17 00:00:00 2001 +From 9bdd03ad0bbb221ad7bffe0e570605c21c28b1b5 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 15 Mar 2017 13:53:28 +0200 Subject: [PATCH] Force host toolchain configuration @@ -6,16 +6,30 @@ Subject: [PATCH] Force host toolchain configuration Force gcc/g++ to be used for parts using host toolchain, since the option(host_build) does not work in yocto builds. +Don't use QT_ARCH for the host architecture, since that's always +the target architecture in bitbake builds, instead ask specifically +for the qmakes's host architecture. + Upstream-Status: Inappropriate [OE specific] Signed-off-by: Samuli Piippo --- - src/buildtools/configure_host.pro | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) + src/buildtools/configure_host.pro | 14 +++++++------- + src/core/config/linux.pri | 2 +- + 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro -index f1b3d47b..521c507b 100644 +index f1b3d47b..12123729 100644 --- a/src/buildtools/configure_host.pro +++ b/src/buildtools/configure_host.pro +@@ -4,7 +4,7 @@ TEMPLATE = aux + # Pick up the host toolchain + option(host_build) + +-GN_HOST_CPU = $$gnArch($$QT_ARCH) ++GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch) + !isEmpty(QT_TARGET_ARCH): GN_TARGET_CPU = $$gnArch($$QT_TARGET_ARCH) + else: GN_TARGET_CPU = $$GN_HOST_CPU + GN_OS = $$gnOS() @@ -29,9 +29,9 @@ GN_CONTENTS = \ "import(\"//build/config/sysroot.gni\")" \ "import(\"//build/toolchain/gcc_toolchain.gni\")" \ @@ -42,3 +56,16 @@ index f1b3d47b..521c507b 100644 " ar = \"$$which(ar)\" " \ " nm = \"$$which(nm)\" " \ " toolchain_args = { " \ +diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri +index 714c864d..f66ca551 100644 +--- a/src/core/config/linux.pri ++++ b/src/core/config/linux.pri +@@ -98,7 +98,7 @@ contains(QT_ARCH, "mips"):!host_build { + + host_build { + gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" +- GN_HOST_CPU = $$gnArch($$QT_ARCH) ++ GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch) + gn_args += host_cpu=\"$$GN_HOST_CPU\" + # Don't bother trying to use system libraries in this case + gn_args += use_glib=false diff --git a/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch b/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch index 7375ff72..d8d89b8e 100644 --- a/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch +++ b/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch @@ -1,4 +1,4 @@ -From b4eb5c926cf822ee5d5cf398d1bcdb0fdca6e47a Mon Sep 17 00:00:00 2001 +From 331de4be615b8552e498ac2f3deff4b49b4b0fc0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 20 Aug 2017 20:37:38 +0200 Subject: [PATCH] qtbug-61521.cpp: use free instead of cfree -- cgit v1.2.3 From 268429962056a12e0e899612dafb433c257af5cf Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 22 Aug 2017 17:24:01 +0200 Subject: qtwebengine: add patch for long paths * imported from http://code.qt.io/cgit/yocto/meta-qt5.git/tree/recipes-qt/qt5/qtwebengine/0001-chromium-workaround-for-too-long-.rps-file-name.patch Signed-off-by: Martin Jansa --- ...sl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch | 33 --------- ...um-workaround-for-too-long-.rps-file-name.patch | 42 ++++++++++++ ...sl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | 45 ------------ ...sl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch | 33 +++++++++ ...sl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | 45 ++++++++++++ ...-chromium-musl-include-fcntl.h-for-loff_t.patch | 22 ------ ...-chromium-musl-include-fcntl.h-for-loff_t.patch | 22 ++++++ ...sl-use-off64_t-instead-of-the-internal-__.patch | 62 ----------------- ...ium-musl-linux-glibc-make-the-distinction.patch | 23 ------- ...sl-use-off64_t-instead-of-the-internal-__.patch | 62 +++++++++++++++++ ...sl-allocator-Do-not-include-glibc_weak_sy.patch | 24 ------- ...ium-musl-linux-glibc-make-the-distinction.patch | 23 +++++++ ...sl-Use-correct-member-name-__si_fields-fr.patch | 24 ------- ...sl-allocator-Do-not-include-glibc_weak_sy.patch | 24 +++++++ ...hromium-musl-Match-syscalls-to-match-musl.patch | 44 ------------ ...sl-Use-correct-member-name-__si_fields-fr.patch | 24 +++++++ ...sl-Define-res_ninit-and-res_nclose-for-no.patch | 79 ---------------------- ...hromium-musl-Match-syscalls-to-match-musl.patch | 44 ++++++++++++ ...sl-Define-res_ninit-and-res_nclose-for-no.patch | 79 ++++++++++++++++++++++ ...hromium-musl-Do-not-define-__sbrk-on-musl.patch | 26 ------- ...um-musl-Adjust-default-pthread-stack-size.patch | 47 ------------- ...hromium-musl-Do-not-define-__sbrk-on-musl.patch | 26 +++++++ ...um-musl-Adjust-default-pthread-stack-size.patch | 47 +++++++++++++ ...sl-include-asm-generic-ioctl.h-for-TCGETS.patch | 22 ------ ...sl-include-asm-generic-ioctl.h-for-TCGETS.patch | 22 ++++++ ...sl-tcmalloc-Use-off64_t-insread-of-__off6.patch | 23 ------- ...sl-tcmalloc-Use-off64_t-insread-of-__off6.patch | 23 +++++++ recipes-qt/qt5/qtwebengine_git.bb | 27 ++++---- 28 files changed, 530 insertions(+), 487 deletions(-) delete mode 100644 recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch create mode 100644 recipes-qt/qt5/qtwebengine/0003-chromium-workaround-for-too-long-.rps-file-name.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch create mode 100644 recipes-qt/qt5/qtwebengine/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch create mode 100644 recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch create mode 100644 recipes-qt/qt5/qtwebengine/0006-chromium-musl-include-fcntl.h-for-loff_t.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch create mode 100644 recipes-qt/qt5/qtwebengine/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch create mode 100644 recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch create mode 100644 recipes-qt/qt5/qtwebengine/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch create mode 100644 recipes-qt/qt5/qtwebengine/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch create mode 100644 recipes-qt/qt5/qtwebengine/0011-chromium-musl-Match-syscalls-to-match-musl.patch create mode 100644 recipes-qt/qt5/qtwebengine/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0013-chromium-musl-Adjust-default-pthread-stack-size.patch create mode 100644 recipes-qt/qt5/qtwebengine/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch create mode 100644 recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch create mode 100644 recipes-qt/qt5/qtwebengine/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch create mode 100644 recipes-qt/qt5/qtwebengine/0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch diff --git a/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch deleted file mode 100644 index d3c7a315..00000000 --- a/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6d4d1b4cd380c51a6709c97524fbce0e0f09ce39 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 14:01:12 -0700 -Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not - defined - -Musl does not define this Macro - -Signed-off-by: Khem Raj ---- - chromium/sandbox/linux/suid/sandbox.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/chromium/sandbox/linux/suid/sandbox.c b/chromium/sandbox/linux/suid/sandbox.c -index b655d1c79c..3de34e36f2 100644 ---- a/chromium/sandbox/linux/suid/sandbox.c -+++ b/chromium/sandbox/linux/suid/sandbox.c -@@ -44,6 +44,15 @@ static bool DropRoot(); - - #define HANDLE_EINTR(x) TEMP_FAILURE_RETRY(x) - -+#ifndef TEMP_FAILURE_RETRY -+# define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) -+#endif -+ - static void FatalError(const char* msg, ...) - __attribute__((noreturn, format(printf, 1, 2))); - diff --git a/recipes-qt/qt5/qtwebengine/0003-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/0003-chromium-workaround-for-too-long-.rps-file-name.patch new file mode 100644 index 00000000..ed897ea2 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0003-chromium-workaround-for-too-long-.rps-file-name.patch @@ -0,0 +1,42 @@ +From 5c31bc4a7ae6133fe4cb60fa71465c6706a071c8 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Thu, 30 Mar 2017 11:37:24 +0300 +Subject: [PATCH] chromium: workaround for too long .rps file name + +Ninja may fail when the build directory is too long: + +ninja: error: WriteFile(__third_party_WebKit_Source_bindings_modules_\ +interfaces_info_individual_modules__home_qt_work_build_build-nitrogen\ +6x_tmp_work_cortexa9hf-neon-mx6qdl-poky-linux-gnueabi_qtwebengine_5.9\ +.0_gitAUTOINC_29afdb0a34_049134677a-r0_build_src_toolchain_target__ru\ +le.rsp): Unable to create file. File name too long + +Task-number: QTBUG-59769 +Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1 +--- + chromium/tools/gn/ninja_action_target_writer.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/chromium/tools/gn/ninja_action_target_writer.cc b/chromium/tools/gn/ninja_action_target_writer.cc +index a5bc6cd526..5cefbfe77c 100644 +--- a/chromium/tools/gn/ninja_action_target_writer.cc ++++ b/chromium/tools/gn/ninja_action_target_writer.cc +@@ -115,9 +115,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() { + // strictly necessary for regular one-shot actions, but it's easier to + // just always define unique_name. + std::string rspfile = custom_rule_name; ++ ++ //quick workaround if filename length > 255 - ".rsp", just cut the dirs starting from the end ++ //please note ".$unique_name" is not used at the moment ++ int pos = 0; ++ std::string delimiter("_"); ++ while (rspfile.length() > 251 && (pos = rspfile.find_last_of(delimiter)) != std::string::npos) ++ rspfile = rspfile.substr(0,pos); ++ + if (!target_->sources().empty()) + rspfile += ".$unique_name"; + rspfile += ".rsp"; ++ + out_ << " rspfile = " << rspfile << std::endl; + + // Response file contents. diff --git a/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch deleted file mode 100644 index 71e36bbd..00000000 --- a/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 6d92d4b6f7adf913da77b4aae837a5880e64aa21 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 14:09:06 -0700 -Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux - -Signed-off-by: Khem Raj ---- - chromium/base/trace_event/malloc_dump_provider.cc | 3 ++- - chromium/content/child/content_child_helpers.cc | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc -index 7d0cb57931..10be59ebad 100644 ---- a/chromium/base/trace_event/malloc_dump_provider.cc -+++ b/chromium/base/trace_event/malloc_dump_provider.cc -@@ -210,6 +210,7 @@ MallocDumpProvider::~MallocDumpProvider() {} - // the current process. - bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, - ProcessMemoryDump* pmd) { -+#if defined(__GLIBC__) - size_t total_virtual_size = 0; - size_t resident_size = 0; - size_t allocated_objects_size = 0; -@@ -321,7 +322,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, - pmd->DumpHeapUsage(metrics_by_context, overhead, "malloc"); - } - tid_dumping_heap_ = kInvalidThreadId; -- -+#endif // __GLIBC__ - return true; - } - -diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc -index 7ddeb4d16a..b8c73b09c5 100644 ---- a/chromium/content/child/content_child_helpers.cc -+++ b/chromium/content/child/content_child_helpers.cc -@@ -25,7 +25,7 @@ namespace content { - // though, this provides only a partial and misleading value. - // Unfortunately some telemetry benchmark rely on it and these need to - // be refactored before getting rid of this. See crbug.com/581365 . --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(__GLIBC__) || defined(OS_ANDROID) - size_t GetMemoryUsageKB() { - struct mallinfo minfo = mallinfo(); - uint64_t mem_usage = diff --git a/recipes-qt/qt5/qtwebengine/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch new file mode 100644 index 00000000..68ffb6ce --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch @@ -0,0 +1,33 @@ +From 71b3c3d4160c5e98cc0a0797710bdd121a79e8b8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 14:01:12 -0700 +Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not + defined + +Musl does not define this Macro + +Signed-off-by: Khem Raj +--- + chromium/sandbox/linux/suid/sandbox.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/chromium/sandbox/linux/suid/sandbox.c b/chromium/sandbox/linux/suid/sandbox.c +index b655d1c79c..3de34e36f2 100644 +--- a/chromium/sandbox/linux/suid/sandbox.c ++++ b/chromium/sandbox/linux/suid/sandbox.c +@@ -44,6 +44,15 @@ static bool DropRoot(); + + #define HANDLE_EINTR(x) TEMP_FAILURE_RETRY(x) + ++#ifndef TEMP_FAILURE_RETRY ++# define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif ++ + static void FatalError(const char* msg, ...) + __attribute__((noreturn, format(printf, 1, 2))); + diff --git a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch new file mode 100644 index 00000000..bf1f1891 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch @@ -0,0 +1,45 @@ +From e695f37fc52defd1b96664b003444692e9b6cb65 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 14:09:06 -0700 +Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux + +Signed-off-by: Khem Raj +--- + chromium/base/trace_event/malloc_dump_provider.cc | 3 ++- + chromium/content/child/content_child_helpers.cc | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc +index 7d0cb57931..10be59ebad 100644 +--- a/chromium/base/trace_event/malloc_dump_provider.cc ++++ b/chromium/base/trace_event/malloc_dump_provider.cc +@@ -210,6 +210,7 @@ MallocDumpProvider::~MallocDumpProvider() {} + // the current process. + bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, + ProcessMemoryDump* pmd) { ++#if defined(__GLIBC__) + size_t total_virtual_size = 0; + size_t resident_size = 0; + size_t allocated_objects_size = 0; +@@ -321,7 +322,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, + pmd->DumpHeapUsage(metrics_by_context, overhead, "malloc"); + } + tid_dumping_heap_ = kInvalidThreadId; +- ++#endif // __GLIBC__ + return true; + } + +diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc +index 7ddeb4d16a..b8c73b09c5 100644 +--- a/chromium/content/child/content_child_helpers.cc ++++ b/chromium/content/child/content_child_helpers.cc +@@ -25,7 +25,7 @@ namespace content { + // though, this provides only a partial and misleading value. + // Unfortunately some telemetry benchmark rely on it and these need to + // be refactored before getting rid of this. See crbug.com/581365 . +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(__GLIBC__) || defined(OS_ANDROID) + size_t GetMemoryUsageKB() { + struct mallinfo minfo = mallinfo(); + uint64_t mem_usage = diff --git a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch deleted file mode 100644 index 00c875b0..00000000 --- a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 8780db69819ba37c8e2364ba361b03badf3c3ee4 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 14:37:49 -0700 -Subject: [PATCH] chromium: musl: include fcntl.h for loff_t - -Signed-off-by: Khem Raj ---- - chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -index b29ec2d29a..91f77dd88d 100644 ---- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -+++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -@@ -150,6 +150,7 @@ extern "C" { - #include - #include - #include -+#include - #include - #include - #include diff --git a/recipes-qt/qt5/qtwebengine/0006-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/0006-chromium-musl-include-fcntl.h-for-loff_t.patch new file mode 100644 index 00000000..b39ab2c5 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0006-chromium-musl-include-fcntl.h-for-loff_t.patch @@ -0,0 +1,22 @@ +From ee6aec4439a7ee320d7700d7f10cd3948a73f3e3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 14:37:49 -0700 +Subject: [PATCH] chromium: musl: include fcntl.h for loff_t + +Signed-off-by: Khem Raj +--- + chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +index b29ec2d29a..91f77dd88d 100644 +--- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h ++++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +@@ -150,6 +150,7 @@ extern "C" { + #include + #include + #include ++#include + #include + #include + #include diff --git a/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch deleted file mode 100644 index 085cb012..00000000 --- a/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch +++ /dev/null @@ -1,62 +0,0 @@ -From b360b036bb1ad31a74c056ce5d19e0271d75ff57 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 14:38:37 -0700 -Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t - -- only do the glibc 32-bit ABI check for mmap/mmap64 on gnu libc. musl - does not support the 32-bit ABI. - -Signed-off-by: Khem Raj ---- - .../third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h -index 715c045f66..edc8cf2db7 100644 ---- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h -+++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h -@@ -77,7 +77,7 @@ typedef off64_t __off64_t; - - static inline void* do_mmap64(void *start, size_t length, - int prot, int flags, -- int fd, __off64_t offset) __THROW { -+ int fd, off64_t offset) __THROW { - // The original gperftools uses sys_mmap() here. But, it is not allowed by - // Chromium's sandbox. - return (void *)syscall(SYS_mmap, start, length, prot, flags, fd, offset); -@@ -90,7 +90,7 @@ static inline void* do_mmap64(void *start, size_t length, - - static inline void* do_mmap64(void *start, size_t length, - int prot, int flags, -- int fd, __off64_t offset) __THROW { -+ int fd, off64_t offset) __THROW { - void *result; - - // Try mmap2() unless it's not supported -@@ -161,7 +161,7 @@ static inline void* do_mmap64(void *start, size_t length, - - extern "C" { - void* mmap64(void *start, size_t length, int prot, int flags, -- int fd, __off64_t offset ) __THROW -+ int fd, off64_t offset ) __THROW - ATTRIBUTE_SECTION(malloc_hook); - void* mmap(void *start, size_t length,int prot, int flags, - int fd, off_t offset) __THROW -@@ -178,7 +178,7 @@ extern "C" { - } - - extern "C" void* mmap64(void *start, size_t length, int prot, int flags, -- int fd, __off64_t offset) __THROW { -+ int fd, off64_t offset) __THROW { - MallocHook::InvokePreMmapHook(start, length, prot, flags, fd, offset); - void *result; - if (!MallocHook::InvokeMmapReplacement( -@@ -189,7 +189,7 @@ extern "C" void* mmap64(void *start, size_t length, int prot, int flags, - return result; - } - --# if !defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH) -+# if defined(__GLIBC__) && (!defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH)) - - extern "C" void* mmap(void *start, size_t length, int prot, int flags, - int fd, off_t offset) __THROW { diff --git a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch deleted file mode 100644 index e23cabe3..00000000 --- a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 455a6603a33a87dfb7ab85a09587f534d9f5d984 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 14:54:38 -0700 -Subject: [PATCH] chromium: musl: linux != glibc, make the distinction - -Signed-off-by: Khem Raj ---- - chromium/base/allocator/allocator_check.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc -index 5a0564d2f3..8c2dc6491d 100644 ---- a/chromium/base/allocator/allocator_check.cc -+++ b/chromium/base/allocator/allocator_check.cc -@@ -21,7 +21,7 @@ bool IsAllocatorInitialized() { - #if defined(OS_WIN) && defined(ALLOCATOR_SHIM) - // Set by allocator_shim_win.cc when the shimmed _set_new_mode() is called. - return g_is_win_shim_layer_initialized; --#elif defined(OS_LINUX) && defined(USE_TCMALLOC) && \ -+#elif defined(__GLIBC__) && defined(USE_TCMALLOC) && \ - !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) - // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h. - // TODO(primiano): replace with an include once base can depend on allocator. diff --git a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch new file mode 100644 index 00000000..65f709d5 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch @@ -0,0 +1,62 @@ +From 90ebe616e563ab1224234281ea7b1a478f42ca92 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 14:38:37 -0700 +Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t + +- only do the glibc 32-bit ABI check for mmap/mmap64 on gnu libc. musl + does not support the 32-bit ABI. + +Signed-off-by: Khem Raj +--- + .../third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h +index 715c045f66..edc8cf2db7 100644 +--- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h ++++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h +@@ -77,7 +77,7 @@ typedef off64_t __off64_t; + + static inline void* do_mmap64(void *start, size_t length, + int prot, int flags, +- int fd, __off64_t offset) __THROW { ++ int fd, off64_t offset) __THROW { + // The original gperftools uses sys_mmap() here. But, it is not allowed by + // Chromium's sandbox. + return (void *)syscall(SYS_mmap, start, length, prot, flags, fd, offset); +@@ -90,7 +90,7 @@ static inline void* do_mmap64(void *start, size_t length, + + static inline void* do_mmap64(void *start, size_t length, + int prot, int flags, +- int fd, __off64_t offset) __THROW { ++ int fd, off64_t offset) __THROW { + void *result; + + // Try mmap2() unless it's not supported +@@ -161,7 +161,7 @@ static inline void* do_mmap64(void *start, size_t length, + + extern "C" { + void* mmap64(void *start, size_t length, int prot, int flags, +- int fd, __off64_t offset ) __THROW ++ int fd, off64_t offset ) __THROW + ATTRIBUTE_SECTION(malloc_hook); + void* mmap(void *start, size_t length,int prot, int flags, + int fd, off_t offset) __THROW +@@ -178,7 +178,7 @@ extern "C" { + } + + extern "C" void* mmap64(void *start, size_t length, int prot, int flags, +- int fd, __off64_t offset) __THROW { ++ int fd, off64_t offset) __THROW { + MallocHook::InvokePreMmapHook(start, length, prot, flags, fd, offset); + void *result; + if (!MallocHook::InvokeMmapReplacement( +@@ -189,7 +189,7 @@ extern "C" void* mmap64(void *start, size_t length, int prot, int flags, + return result; + } + +-# if !defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH) ++# if defined(__GLIBC__) && (!defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH)) + + extern "C" void* mmap(void *start, size_t length, int prot, int flags, + int fd, off_t offset) __THROW { diff --git a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch deleted file mode 100644 index 53e8a817..00000000 --- a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch +++ /dev/null @@ -1,24 +0,0 @@ -From aa3bfc656b3c84aba04c8294ad17c630141f4b09 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 15:09:02 -0700 -Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols - for musl - -Signed-off-by: Khem Raj ---- - chromium/base/allocator/allocator_shim.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc -index 95480ea4b6..1de3d1a532 100644 ---- a/chromium/base/allocator/allocator_shim.cc -+++ b/chromium/base/allocator/allocator_shim.cc -@@ -266,7 +266,7 @@ void ShimFree(void* address) { - // In the case of tcmalloc we also want to plumb into the glibc hooks - // to avoid that allocations made in glibc itself (e.g., strdup()) get - // accidentally performed on the glibc heap instead of the tcmalloc one. --#if defined(USE_TCMALLOC) -+#if defined(USE_TCMALLOC) && defined(__GLIBC__) - #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h" - #endif - diff --git a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch new file mode 100644 index 00000000..7a778c22 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch @@ -0,0 +1,23 @@ +From d0621f9278ddd04c05b6ab3ef638be65f96f1bd6 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 14:54:38 -0700 +Subject: [PATCH] chromium: musl: linux != glibc, make the distinction + +Signed-off-by: Khem Raj +--- + chromium/base/allocator/allocator_check.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc +index 5a0564d2f3..8c2dc6491d 100644 +--- a/chromium/base/allocator/allocator_check.cc ++++ b/chromium/base/allocator/allocator_check.cc +@@ -21,7 +21,7 @@ bool IsAllocatorInitialized() { + #if defined(OS_WIN) && defined(ALLOCATOR_SHIM) + // Set by allocator_shim_win.cc when the shimmed _set_new_mode() is called. + return g_is_win_shim_layer_initialized; +-#elif defined(OS_LINUX) && defined(USE_TCMALLOC) && \ ++#elif defined(__GLIBC__) && defined(USE_TCMALLOC) && \ + !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) + // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h. + // TODO(primiano): replace with an include once base can depend on allocator. diff --git a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch deleted file mode 100644 index 385e729d..00000000 --- a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 85b21493f19bd2046f84836e03f0a9c32862bce8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 15:12:39 -0700 -Subject: [PATCH] chromium: musl: Use correct member name __si_fields from - LinuxSigInfo - -Signed-off-by: Khem Raj ---- - chromium/sandbox/linux/seccomp-bpf/trap.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc -index 003708d2c8..0fef3148f9 100644 ---- a/chromium/sandbox/linux/seccomp-bpf/trap.cc -+++ b/chromium/sandbox/linux/seccomp-bpf/trap.cc -@@ -168,7 +168,7 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) { - // most versions of glibc don't include this information in siginfo_t. So, - // we need to explicitly copy it into a arch_sigsys structure. - struct arch_sigsys sigsys; -- memcpy(&sigsys, &info->_sifields, sizeof(sigsys)); -+ memcpy(&sigsys, &info->__si_fields, sizeof(sigsys)); - - #if defined(__mips__) - // When indirect syscall (syscall(__NR_foo, ...)) is made on Mips, the diff --git a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch new file mode 100644 index 00000000..2bc79932 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch @@ -0,0 +1,24 @@ +From e8f8e7aa48e97b9b91858ef94f1940464a9178a3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 15:09:02 -0700 +Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols + for musl + +Signed-off-by: Khem Raj +--- + chromium/base/allocator/allocator_shim.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc +index 95480ea4b6..1de3d1a532 100644 +--- a/chromium/base/allocator/allocator_shim.cc ++++ b/chromium/base/allocator/allocator_shim.cc +@@ -266,7 +266,7 @@ void ShimFree(void* address) { + // In the case of tcmalloc we also want to plumb into the glibc hooks + // to avoid that allocations made in glibc itself (e.g., strdup()) get + // accidentally performed on the glibc heap instead of the tcmalloc one. +-#if defined(USE_TCMALLOC) ++#if defined(USE_TCMALLOC) && defined(__GLIBC__) + #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h" + #endif + diff --git a/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch b/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch deleted file mode 100644 index 235e2cc8..00000000 --- a/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e4d99e001315f1bb34e6ff6531c0a528640b76d8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 15:24:49 -0700 -Subject: [PATCH] chromium: musl: Match syscalls to match musl - -Signed-off-by: Khem Raj ---- - chromium/third_party/lss/linux_syscall_support.h | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h -index 9dbd2391b2..a715de177c 100644 ---- a/chromium/third_party/lss/linux_syscall_support.h -+++ b/chromium/third_party/lss/linux_syscall_support.h -@@ -793,6 +793,14 @@ struct kernel_statfs { - #endif - - -+#undef stat64 -+#undef fstat64 -+ -+#ifndef __NR_fstatat -+#define __NR_fstatat __NR_fstatat64 -+#endif -+ -+ - #if defined(__x86_64__) - #ifndef ARCH_SET_GS - #define ARCH_SET_GS 0x1001 -@@ -1210,6 +1218,14 @@ struct kernel_statfs { - #ifndef __NR_fallocate - #define __NR_fallocate 285 - #endif -+ -+#ifndef __NR_pread -+#define __NR_pread __NR_pread64 -+#endif -+#ifndef __NR_pwrite -+#define __NR_pwrite __NR_pwrite64 -+#endif -+ - /* End of x86-64 definitions */ - #elif defined(__mips__) - #if _MIPS_SIM == _MIPS_SIM_ABI32 diff --git a/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch new file mode 100644 index 00000000..82e85f94 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch @@ -0,0 +1,24 @@ +From ab272bfc9aef6d50c44e1c1bdfdb8a325aebaefc Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 15:12:39 -0700 +Subject: [PATCH] chromium: musl: Use correct member name __si_fields from + LinuxSigInfo + +Signed-off-by: Khem Raj +--- + chromium/sandbox/linux/seccomp-bpf/trap.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc +index 003708d2c8..0fef3148f9 100644 +--- a/chromium/sandbox/linux/seccomp-bpf/trap.cc ++++ b/chromium/sandbox/linux/seccomp-bpf/trap.cc +@@ -168,7 +168,7 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) { + // most versions of glibc don't include this information in siginfo_t. So, + // we need to explicitly copy it into a arch_sigsys structure. + struct arch_sigsys sigsys; +- memcpy(&sigsys, &info->_sifields, sizeof(sigsys)); ++ memcpy(&sigsys, &info->__si_fields, sizeof(sigsys)); + + #if defined(__mips__) + // When indirect syscall (syscall(__NR_foo, ...)) is made on Mips, the diff --git a/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch deleted file mode 100644 index da0858a3..00000000 --- a/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 80953719539b60ea6a908710d4bb7cb78acc6920 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 15:27:50 -0700 -Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc - platforms - -Signed-off-by: Khem Raj ---- - chromium/net/dns/dns_config_service_posix.cc | 4 ++++ - chromium/net/dns/dns_reloader.cc | 4 ++++ - chromium/net/dns/resolv_compat.h | 29 ++++++++++++++++++++++++++++ - 3 files changed, 37 insertions(+) - create mode 100644 chromium/net/dns/resolv_compat.h - -diff --git a/chromium/net/dns/dns_config_service_posix.cc b/chromium/net/dns/dns_config_service_posix.cc -index ba8a369133..e9b40d07fc 100644 ---- a/chromium/net/dns/dns_config_service_posix.cc -+++ b/chromium/net/dns/dns_config_service_posix.cc -@@ -25,6 +25,10 @@ - #include "net/dns/notify_watcher_mac.h" - #include "net/dns/serial_worker.h" - -+#if defined(OS_LINUX) && !defined(__GLIBC__) -+#include "net/dns/resolv_compat.h" -+#endif -+ - #if defined(OS_MACOSX) && !defined(OS_IOS) - #include "net/dns/dns_config_watcher_mac.h" - #endif -diff --git a/chromium/net/dns/dns_reloader.cc b/chromium/net/dns/dns_reloader.cc -index 74534e6b1b..2780a776e4 100644 ---- a/chromium/net/dns/dns_reloader.cc -+++ b/chromium/net/dns/dns_reloader.cc -@@ -9,6 +9,10 @@ - - #include - -+#if defined(OS_LINUX) && !defined(__GLIBC__) -+#include "net/dns/resolv_compat.h" -+#endif -+ - #include "base/lazy_instance.h" - #include "base/logging.h" - #include "base/macros.h" -diff --git a/chromium/net/dns/resolv_compat.h b/chromium/net/dns/resolv_compat.h -new file mode 100644 -index 0000000000..4f0e852a19 ---- /dev/null -+++ b/chromium/net/dns/resolv_compat.h -@@ -0,0 +1,29 @@ -+#if !defined(__GLIBC__) -+/*************************************************************************** -+ * resolv_compat.h -+ * -+ * Mimick GLIBC's res_ninit() and res_nclose() for musl libc -+ * Note: res_init() is actually deprecated according to -+ * http://docs.oracle.com/cd/E36784_01/html/E36875/res-nclose-3resolv.html -+ **************************************************************************/ -+#include -+ -+static inline int res_ninit(res_state statp) -+{ -+ int rc = res_init(); -+ if (statp != &_res) { -+ memcpy(statp, &_res, sizeof(*statp)); -+ } -+ return rc; -+} -+ -+static inline int res_nclose(res_state statp) -+{ -+ if (!statp) -+ return -1; -+ if (statp != &_res) { -+ memset(statp, 0, sizeof(*statp)); -+ } -+ return 0; -+} -+#endif diff --git a/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Match-syscalls-to-match-musl.patch b/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Match-syscalls-to-match-musl.patch new file mode 100644 index 00000000..e4e35efc --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Match-syscalls-to-match-musl.patch @@ -0,0 +1,44 @@ +From bd3d6bd46e792e312435897e925cca5ccedc1dda Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 15:24:49 -0700 +Subject: [PATCH] chromium: musl: Match syscalls to match musl + +Signed-off-by: Khem Raj +--- + chromium/third_party/lss/linux_syscall_support.h | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h +index 9dbd2391b2..a715de177c 100644 +--- a/chromium/third_party/lss/linux_syscall_support.h ++++ b/chromium/third_party/lss/linux_syscall_support.h +@@ -793,6 +793,14 @@ struct kernel_statfs { + #endif + + ++#undef stat64 ++#undef fstat64 ++ ++#ifndef __NR_fstatat ++#define __NR_fstatat __NR_fstatat64 ++#endif ++ ++ + #if defined(__x86_64__) + #ifndef ARCH_SET_GS + #define ARCH_SET_GS 0x1001 +@@ -1210,6 +1218,14 @@ struct kernel_statfs { + #ifndef __NR_fallocate + #define __NR_fallocate 285 + #endif ++ ++#ifndef __NR_pread ++#define __NR_pread __NR_pread64 ++#endif ++#ifndef __NR_pwrite ++#define __NR_pwrite __NR_pwrite64 ++#endif ++ + /* End of x86-64 definitions */ + #elif defined(__mips__) + #if _MIPS_SIM == _MIPS_SIM_ABI32 diff --git a/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch new file mode 100644 index 00000000..65adde3e --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch @@ -0,0 +1,79 @@ +From 505fcfa52c49c9975e63066f631244ace6061d3c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 15:27:50 -0700 +Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc + platforms + +Signed-off-by: Khem Raj +--- + chromium/net/dns/dns_config_service_posix.cc | 4 ++++ + chromium/net/dns/dns_reloader.cc | 4 ++++ + chromium/net/dns/resolv_compat.h | 29 ++++++++++++++++++++++++++++ + 3 files changed, 37 insertions(+) + create mode 100644 chromium/net/dns/resolv_compat.h + +diff --git a/chromium/net/dns/dns_config_service_posix.cc b/chromium/net/dns/dns_config_service_posix.cc +index ba8a369133..e9b40d07fc 100644 +--- a/chromium/net/dns/dns_config_service_posix.cc ++++ b/chromium/net/dns/dns_config_service_posix.cc +@@ -25,6 +25,10 @@ + #include "net/dns/notify_watcher_mac.h" + #include "net/dns/serial_worker.h" + ++#if defined(OS_LINUX) && !defined(__GLIBC__) ++#include "net/dns/resolv_compat.h" ++#endif ++ + #if defined(OS_MACOSX) && !defined(OS_IOS) + #include "net/dns/dns_config_watcher_mac.h" + #endif +diff --git a/chromium/net/dns/dns_reloader.cc b/chromium/net/dns/dns_reloader.cc +index 74534e6b1b..2780a776e4 100644 +--- a/chromium/net/dns/dns_reloader.cc ++++ b/chromium/net/dns/dns_reloader.cc +@@ -9,6 +9,10 @@ + + #include + ++#if defined(OS_LINUX) && !defined(__GLIBC__) ++#include "net/dns/resolv_compat.h" ++#endif ++ + #include "base/lazy_instance.h" + #include "base/logging.h" + #include "base/macros.h" +diff --git a/chromium/net/dns/resolv_compat.h b/chromium/net/dns/resolv_compat.h +new file mode 100644 +index 0000000000..4f0e852a19 +--- /dev/null ++++ b/chromium/net/dns/resolv_compat.h +@@ -0,0 +1,29 @@ ++#if !defined(__GLIBC__) ++/*************************************************************************** ++ * resolv_compat.h ++ * ++ * Mimick GLIBC's res_ninit() and res_nclose() for musl libc ++ * Note: res_init() is actually deprecated according to ++ * http://docs.oracle.com/cd/E36784_01/html/E36875/res-nclose-3resolv.html ++ **************************************************************************/ ++#include ++ ++static inline int res_ninit(res_state statp) ++{ ++ int rc = res_init(); ++ if (statp != &_res) { ++ memcpy(statp, &_res, sizeof(*statp)); ++ } ++ return rc; ++} ++ ++static inline int res_nclose(res_state statp) ++{ ++ if (!statp) ++ return -1; ++ if (statp != &_res) { ++ memset(statp, 0, sizeof(*statp)); ++ } ++ return 0; ++} ++#endif diff --git a/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch deleted file mode 100644 index 16705e52..00000000 --- a/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0b4922e1ed4b7f4e7ada7a840dec067f05c8e9f7 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 15:39:57 -0700 -Subject: [PATCH] chromium: musl: Do not define __sbrk on musl - -musl libc does not have sbrk. on musl libc will only work when called with 0 as -argument, so we just let it out for now - -Signed-off-by: Khem Raj ---- - chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h -index edc8cf2db7..a868b50d30 100644 ---- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h -+++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h -@@ -233,7 +233,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size, - } - - // Don't hook sbrk() in Android, since it doesn't expose __sbrk. --#if !defined(__ANDROID__) -+#if !defined(__ANDROID__) && defined(__GLIBC__) - // libc's version: - extern "C" void* __sbrk(ptrdiff_t increment); - diff --git a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Adjust-default-pthread-stack-size.patch deleted file mode 100644 index 82e49f6f..00000000 --- a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Adjust-default-pthread-stack-size.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 54cf1a5476fac8b7d5a18742a63abdec788989a7 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 16:41:23 -0700 -Subject: [PATCH] chromium: musl: Adjust default pthread stack size - -Signed-off-by: Khem Raj ---- - chromium/base/threading/platform_thread_linux.cc | 3 ++- - chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp | 4 ++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc -index 92fbda5ee1..c41579d4ed 100644 ---- a/chromium/base/threading/platform_thread_linux.cc -+++ b/chromium/base/threading/platform_thread_linux.cc -@@ -175,7 +175,8 @@ void TerminateOnThread() {} - - size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { - #if !defined(THREAD_SANITIZER) -- return 0; -+ // use 8mb like glibc to avoid running out of space -+ return (1 << 23); - #else - // ThreadSanitizer bloats the stack heavily. Evidence has been that the - // default stack size isn't enough for some browser tests. -diff --git a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp -index 1d164f510a..3358deb256 100644 ---- a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp -+++ b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp -@@ -68,7 +68,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() { - // FIXME: On Mac OSX and Linux, this method cannot estimate stack size - // correctly for the main thread. - --#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) -+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) - // pthread_getattr_np() can fail if the thread is not invoked by - // pthread_create() (e.g., the main thread of webkit_unit_tests). - // If so, a conservative size estimate is returned. -@@ -135,7 +135,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() { - } - - void* StackFrameDepth::getStackStart() { --#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) -+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) - pthread_attr_t attr; - int error; - #if OS(FREEBSD) diff --git a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch new file mode 100644 index 00000000..6c864285 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch @@ -0,0 +1,26 @@ +From e4d5b6ccd77506edb7d52f3857c4a5f22bea2437 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 15:39:57 -0700 +Subject: [PATCH] chromium: musl: Do not define __sbrk on musl + +musl libc does not have sbrk. on musl libc will only work when called with 0 as +argument, so we just let it out for now + +Signed-off-by: Khem Raj +--- + chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h +index edc8cf2db7..a868b50d30 100644 +--- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h ++++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h +@@ -233,7 +233,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size, + } + + // Don't hook sbrk() in Android, since it doesn't expose __sbrk. +-#if !defined(__ANDROID__) ++#if !defined(__ANDROID__) && defined(__GLIBC__) + // libc's version: + extern "C" void* __sbrk(ptrdiff_t increment); + diff --git a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch new file mode 100644 index 00000000..f1cc205b --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch @@ -0,0 +1,47 @@ +From 72a77c994434ecb708b2790ba9efaf1decc02503 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 16:41:23 -0700 +Subject: [PATCH] chromium: musl: Adjust default pthread stack size + +Signed-off-by: Khem Raj +--- + chromium/base/threading/platform_thread_linux.cc | 3 ++- + chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp | 4 ++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc +index 92fbda5ee1..c41579d4ed 100644 +--- a/chromium/base/threading/platform_thread_linux.cc ++++ b/chromium/base/threading/platform_thread_linux.cc +@@ -175,7 +175,8 @@ void TerminateOnThread() {} + + size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { + #if !defined(THREAD_SANITIZER) +- return 0; ++ // use 8mb like glibc to avoid running out of space ++ return (1 << 23); + #else + // ThreadSanitizer bloats the stack heavily. Evidence has been that the + // default stack size isn't enough for some browser tests. +diff --git a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp +index 1d164f510a..3358deb256 100644 +--- a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp ++++ b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp +@@ -68,7 +68,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() { + // FIXME: On Mac OSX and Linux, this method cannot estimate stack size + // correctly for the main thread. + +-#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + // pthread_getattr_np() can fail if the thread is not invoked by + // pthread_create() (e.g., the main thread of webkit_unit_tests). + // If so, a conservative size estimate is returned. +@@ -135,7 +135,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() { + } + + void* StackFrameDepth::getStackStart() { +-#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + pthread_attr_t attr; + int error; + #if OS(FREEBSD) diff --git a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch deleted file mode 100644 index ac3afbf7..00000000 --- a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 77bac704279103e74d8d7d35c933517dcfb9b7fc Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 17:15:34 -0700 -Subject: [PATCH] chromium: musl: include asm-generic/ioctl.h for TCGETS2 - -Signed-off-by: Khem Raj ---- - chromium/device/serial/serial_io_handler_posix.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/chromium/device/serial/serial_io_handler_posix.cc b/chromium/device/serial/serial_io_handler_posix.cc -index a2ca2e2309..e139cdf9e9 100644 ---- a/chromium/device/serial/serial_io_handler_posix.cc -+++ b/chromium/device/serial/serial_io_handler_posix.cc -@@ -6,6 +6,7 @@ - - #include - #include -+#include - - #include "base/files/file_util.h" - #include "base/posix/eintr_wrapper.h" diff --git a/recipes-qt/qt5/qtwebengine/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch b/recipes-qt/qt5/qtwebengine/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch new file mode 100644 index 00000000..58cd0a76 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch @@ -0,0 +1,22 @@ +From f2e66acda4934e4c0f56a58ba107cc208f09b7ef Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 17:15:34 -0700 +Subject: [PATCH] chromium: musl: include asm-generic/ioctl.h for TCGETS2 + +Signed-off-by: Khem Raj +--- + chromium/device/serial/serial_io_handler_posix.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/chromium/device/serial/serial_io_handler_posix.cc b/chromium/device/serial/serial_io_handler_posix.cc +index a2ca2e2309..e139cdf9e9 100644 +--- a/chromium/device/serial/serial_io_handler_posix.cc ++++ b/chromium/device/serial/serial_io_handler_posix.cc +@@ -6,6 +6,7 @@ + + #include + #include ++#include + + #include "base/files/file_util.h" + #include "base/posix/eintr_wrapper.h" diff --git a/recipes-qt/qt5/qtwebengine/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch b/recipes-qt/qt5/qtwebengine/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch deleted file mode 100644 index 668697cb..00000000 --- a/recipes-qt/qt5/qtwebengine/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 27690efdf920cafeab96f70eec0c66803c908cd4 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 8 Jul 2017 09:08:23 -0700 -Subject: [PATCH] chromium: musl: tcmalloc: Use off64_t insread of __off64_t - -Signed-off-by: Khem Raj ---- - chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -index 91f77dd88d..bb84a0b305 100644 ---- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -+++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -@@ -1929,7 +1929,7 @@ typedef unsigned long int ulong; - #if defined(__x86_64__) - /* Need to make sure __off64_t isn't truncated to 32-bits under x32. */ - LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d, -- __off64_t o) { -+ off64_t o) { - LSS_BODY(6, void*, mmap, LSS_SYSCALL_ARG(s), LSS_SYSCALL_ARG(l), - LSS_SYSCALL_ARG(p), LSS_SYSCALL_ARG(f), - LSS_SYSCALL_ARG(d), (uint64_t)(o)); diff --git a/recipes-qt/qt5/qtwebengine/0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch b/recipes-qt/qt5/qtwebengine/0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch new file mode 100644 index 00000000..acc2c78a --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch @@ -0,0 +1,23 @@ +From 2141914268b26507d52cc7541cf268478ddc0bdf Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 8 Jul 2017 09:08:23 -0700 +Subject: [PATCH] chromium: musl: tcmalloc: Use off64_t insread of __off64_t + +Signed-off-by: Khem Raj +--- + chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +index 91f77dd88d..bb84a0b305 100644 +--- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h ++++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +@@ -1929,7 +1929,7 @@ typedef unsigned long int ulong; + #if defined(__x86_64__) + /* Need to make sure __off64_t isn't truncated to 32-bits under x32. */ + LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d, +- __off64_t o) { ++ off64_t o) { + LSS_BODY(6, void*, mmap, LSS_SYSCALL_ARG(s), LSS_SYSCALL_ARG(l), + LSS_SYSCALL_ARG(p), LSS_SYSCALL_ARG(f), + LSS_SYSCALL_ARG(d), (uint64_t)(o)); diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index cdb4512f..7a9c6148 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -145,22 +145,23 @@ SRC_URI += " \ 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://0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ - file://0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ - file://0005-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ - file://0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ - file://0007-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ - file://0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ - file://0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \ - file://0010-chromium-musl-Match-syscalls-to-match-musl.patch;patchdir=src/3rdparty \ - file://0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ - file://0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ - file://0013-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ - file://0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \ - file://0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ + 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 = "99f84ffd2c0c78014a24534a863aa1c755abd51c" -- cgit v1.2.3