From f69baf2a72b224fafad89a1422b692fb95ec439b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 21 Mar 2018 16:48:54 +0000 Subject: maliit-framework-qt5: refresh patches WARNING: maliit-framework-qt5-0.99.0+gitAUTOINC+62bd54bcde-r0 do_patch: Some of the context lines in patches were ignored. This can lead to incorrectly applied patches. The context lines in the patches can be updated with devtool: devtool modify devtool finish --force-patch-refresh Then the updated patches and the source tree (in devtool's workspace) should be reviewed to make sure the patches apply in the correct place and don't introduce duplicate lines (which can, and does happen when some of the context is ignored). Further information: http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450 Details: Applying patch 0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch patching file config.pri Hunk #1 succeeded at 144 with fuzz 1 (offset -17 lines). Now at patch 0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch Signed-off-by: Martin Jansa --- ...-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch | 14 ++++++-------- ...001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch | 10 ++++------ 2 files changed, 10 insertions(+), 14 deletions(-) (limited to 'recipes-qt') diff --git a/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch b/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch index acd9a57a..a4103f25 100644 --- a/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch +++ b/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch @@ -1,4 +1,4 @@ -From 33554f9b3fd493c7e28617fd01466ffa87251f27 Mon Sep 17 00:00:00 2001 +From be5c73c72d1efa90ba440957d6f5ff3278c25545 Mon Sep 17 00:00:00 2001 From: Samuel Stirtzel Date: Wed, 1 Aug 2012 13:21:51 +0200 Subject: [PATCH] Fix MALIIT_INSTALL_PRF to allow the build with openembedded @@ -6,16 +6,17 @@ Subject: [PATCH] Fix MALIIT_INSTALL_PRF to allow the build with openembedded Upstream-Status: Inappropriate [configuration] Signed-off-by: Samuel Stirtzel + --- - config.pri | 8 +++++--- + config.pri | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/config.pri b/config.pri -index b037b8c..43409f3 100644 +index 8f24864..94d595a 100644 --- a/config.pri +++ b/config.pri -@@ -161,9 +161,11 @@ contains(QT_MAJOR_VERSION, 4) { - QT_WIDGETS = gui widgets +@@ -144,9 +144,11 @@ noxcb { + DEFINES += NOXCB } -MALIIT_INSTALL_PRF = $$[QT_INSTALL_DATA]/mkspecs/features @@ -29,6 +30,3 @@ index b037b8c..43409f3 100644 } defineTest(outputFile) { --- -1.7.9.5 - 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 index 73560340..2310e637 100644 --- 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 @@ -1,4 +1,4 @@ -From cb38c078fa34a3d0cff6bc195edd9f507477d2e1 Mon Sep 17 00:00:00 2001 +From fb4316ca6e44a6b34e7d109360fc716c372e1293 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 @@ -10,15 +10,16 @@ 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 +index 94d595a..d7b221f 100644 --- a/config.pri +++ b/config.pri -@@ -13,8 +13,8 @@ include(defines.pri) +@@ -15,8 +15,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 @@ -29,6 +30,3 @@ index 1505f9d..7cc196a 100644 OBJECTS_DIR = .obj MOC_DIR = .moc --- -2.13.2 - -- cgit v1.2.3-54-g00ecf From 9ed1897bf7520db9fa93e8aa3508994472804569 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 22 Feb 2018 14:50:03 +0000 Subject: qt5-git.inc: drop nobranch=1 * sneaked in with: commit 333949a8239dfa7788b35f1059614733e11a6a25 Author: Samuli Piippo Date: Thu Jan 26 16:54:50 2017 +0200 Upgrade to Qt 5.8 * use 5.10.1 branch by defaut and fix QT_MODULE_BRANCH in qtknx, qtmqtt, qtwebkit-examples, qtwebkit which don't have 5.10.1 branch at all Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-git.inc | 6 +++--- recipes-qt/qt5/qtknx_git.bb | 2 ++ recipes-qt/qt5/qtmqtt_git.bb | 2 ++ recipes-qt/qt5/qtwebkit-examples_git.bb | 2 ++ recipes-qt/qt5/qtwebkit_git.bb | 2 ++ 5 files changed, 11 insertions(+), 3 deletions(-) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 7ee06438..beba9135 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -1,9 +1,9 @@ # Copyright (C) 2012-2016 O.S. Systems Software LTDA. -# Copyright (C) 2013-2017 Martin Jansa +# Copyright (C) 2013-2018 Martin Jansa QT_MODULE ?= "${BPN}" -QT_MODULE_BRANCH ?= "5.10" -QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" +QT_MODULE_BRANCH ?= "5.10.1" +QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" # each module needs to define valid SRCREV SRC_URI = " \ diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index 5e01e3c9..fa981abb 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb @@ -9,4 +9,6 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" +QT_MODULE_BRANCH = "5.10" + SRCREV = "29c34e8f072afd01002ed3847d752b4e065f977e" diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index b705f7c4..90c255d7 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb @@ -9,4 +9,6 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" +QT_MODULE_BRANCH = "5.10" + SRCREV = "2c3c2a41c55a179332ec2a076856990f36dd5ef9" diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb index 3e3e4a0b..114fab7a 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb @@ -17,4 +17,6 @@ DEPENDS += "qtwebkit qtxmlpatterns" RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" +QT_MODULE_BRANCH = "5.9" + SRCREV = "a24c780b60d7d8bc00c4a48042cf7f32db777d55" diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 5dee6a42..b23d4d6f 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -87,4 +87,6 @@ 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}" +QT_MODULE_BRANCH = "5.9" + SRCREV = "97c4a80a1282c8c3eaa343011286b76fd4838c5f" -- cgit v1.2.3-54-g00ecf From d5f472661eded1aa26b19e1e8d10149cb7ace59f Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Fri, 2 Mar 2018 12:45:24 +0200 Subject: Change default SRC_URI from github.com to code.qt.io There have been issues in the past with github qt mirror being out of sync with code.qt.io for certain module repos. Right now there's been a several days long break in update cycle for seemingly all the qt modules where content has not been pushed to the github mirror. Change the default SRC_URI to the more reliable code.qt.io. Change-Id: Ic7d3b9a82ef0ae502e99a8516ef78ca09250fd1e Signed-off-by: Mikko Gronoff Reviewed-by: Samuli Piippo Signed-off-by: Martin Jansa --- conf/layer.conf | 4 ++-- recipes-qt/examples/qt5everywheredemo_1.0.bb | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'recipes-qt') diff --git a/conf/layer.conf b/conf/layer.conf index 98000c65..df696c76 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -35,7 +35,7 @@ LICENSE_PATH += "${LAYERDIR}/licenses" IMAGE_FEATURES[validitems] += "qtcreator-debug" -QT_GIT ?= "git://github.com/qt" -QT_LABS_GIT ?= "git://github.com/qt-labs" +QT_GIT_PROJECT ?= "qt" +QT_GIT ?= "git://code.qt.io/${QT_GIT_PROJECT}" QT_GIT_PROTOCOL ?= "git" QT_EDITION ?= "opensource" diff --git a/recipes-qt/examples/qt5everywheredemo_1.0.bb b/recipes-qt/examples/qt5everywheredemo_1.0.bb index ee947991..493344f7 100644 --- a/recipes-qt/examples/qt5everywheredemo_1.0.bb +++ b/recipes-qt/examples/qt5everywheredemo_1.0.bb @@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://qml/QtDemo/main.qml;endline=39;md5=7d80863906a4bc8ffc DEPENDS = "qtdeclarative qtgraphicaleffects qtsvg qtmultimedia" SRCREV = "35d72a2eba7456a2efc5eb8b77afbc00f69ba0ac" -SRC_URI = "${QT_LABS_GIT}/qt-labs-qt5-everywhere-demo" +QT_GIT_PROJECT = "qt-labs" +SRC_URI = "${QT_GIT}/qt5-everywhere-demo" S = "${WORKDIR}/git/QtDemo" -- cgit v1.2.3-54-g00ecf From 8124b3c768f8e539d6cbe670d6caca132415f435 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 17 Apr 2018 20:50:36 +0800 Subject: packagegroup-qt5-toolchain-target/qttranslations: fix nothing provides qttranslations-qtconfig It failed to build meta-toolchain-qt5: ... Error: Problem: conflicting requests - nothing provides qttranslations-qtconfig needed by packagegroup-qt5-toolchain-target-1.0-r0.noarch ... The upstream removed qtconfig translations: ... commit a6b3446cb023e7b3a5f8aa12ea0d650d2b804334 Author: Alexander Volkov Date: Thu Sep 14 19:33:25 2017 +0300 Remove qtconfig translations ... Signed-off-by: Hongxu Jia --- recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | 1 - recipes-qt/qt5/qttranslations_git.bb | 5 ----- 2 files changed, 6 deletions(-) (limited to 'recipes-qt') diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb index f5446afd..d899ff94 100755 --- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb @@ -45,7 +45,6 @@ RDEPENDS_${PN} += " \ qtbase-staticdev \ qttranslations-qt \ qttranslations-qtbase \ - qttranslations-qtconfig \ qttranslations-qthelp \ qtcharts-dev \ qtcharts-mkspecs \ diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 95357374..a8c71668 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -22,7 +22,6 @@ PACKAGES =. " \ ${PN}-qtwebsockets \ ${PN}-qtwebengine \ ${PN}-qtxmlpatterns \ - ${PN}-qtconfig \ ${PN}-qtquick1 \ ${PN}-qtscript \ ${PN}-qtserialport \ @@ -83,10 +82,6 @@ FILES_${PN}-qtxmlpatterns = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qtxmlpatterns_*.qm \ " -FILES_${PN}-qtconfig = " \ - ${OE_QMAKE_PATH_TRANSLATIONS}/qtconfig_*.qm \ -" - FILES_${PN}-qtquick1 = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qtquick1_*.qm \ " -- cgit v1.2.3-54-g00ecf From d9001fc53d340544356b2bfb5c7c5f3c7f831319 Mon Sep 17 00:00:00 2001 From: Dennis Menschel Date: Sun, 15 Apr 2018 09:44:33 +0200 Subject: qtbase: fix umask for do_generate_qt_environment_file The custom task "do_generate_qt_environment_file" generates the directory "environment-setup.d" with permission 775 instead of 755. When other recipes populate the same directory with different permissions, a package manager like RPM will report this as an error. The solution is to either set the installation permissions explicitly with "install -d [-m 755]", or specify the umask for the custom task. This commit uses the latter approach and fixes errors like the following when trying to generate an SDK: $ bitbake -c populate_sdk [...] Error: Transaction check error: file /opt/poky/2.4.2/sysroots/x86_64-pokysdk-linux/environment-setup.d conflicts between attempted installs of nativesdk-cmake-3.8.2-r0.x86_64_nativesdk and nativesdk-qtbase-tools-5.9.4+git0+0d9208cecb-r0.x86_64_nativesdk A detailed discussion about this problem can also be found here [1]. [1] https://stackoverflow.com/a/49003464 Signed-off-by: Dennis Menschel Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index efcb82c3..87da66e4 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -209,6 +209,7 @@ fakeroot do_generate_qt_environment_file() { sed -i -e 's:${SDKPATHNATIVE}:$OECORE_NATIVE_SYSROOT:g' $script } +do_generate_qt_environment_file[umask] = "022" addtask generate_qt_environment_file after do_install before do_package SRCREV = "6c6ace9d23f90845fd424e474d38fe30f070775e" -- cgit v1.2.3-54-g00ecf From 4d0975195e211f10a77ee603abb1b55426f31e25 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 4 Apr 2018 12:10:13 -0700 Subject: qtwebkit: Fix build on armv7ve (rpi) Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebkit_git.bb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index b23d4d6f..be7951f5 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -18,6 +18,14 @@ DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf- ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" +# https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 +# https://bugs.webkit.org/show_bug.cgi?id=159880 +# JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. +# Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb). +ARM_INSTRUCTION_SET_armv7a = "thumb" +ARM_INSTRUCTION_SET_armv7r = "thumb" +ARM_INSTRUCTION_SET_armv7ve = "thumb" + # Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.10 # 5.10.meta-qt5.1 SRC_URI += "\ -- cgit v1.2.3-54-g00ecf From 1ce10cfcbab8d91112d952d6e5df4c0f73bfb367 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 4 Apr 2018 12:10:12 -0700 Subject: qtwebkit: Update to latest on 5.9 branch Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebkit_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index be7951f5..c8e83281 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -97,4 +97,4 @@ export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby QT_MODULE_BRANCH = "5.9" -SRCREV = "97c4a80a1282c8c3eaa343011286b76fd4838c5f" +SRCREV = "bd0657f98aff85b9f06d85a8cf4da6a27f61a56e" -- cgit v1.2.3-54-g00ecf From 59c9742cba7fd2933a0c3d8586a0b0128a28504d Mon Sep 17 00:00:00 2001 From: Timo Jyrinki Date: Tue, 27 Feb 2018 14:38:14 +0200 Subject: qtlocation: Add licenses used under mapboxgl. These licenses are in use in the fetched mapboxgl submodule but not currently listed in the recipe: Apache-2.0, MIT, openssl and BSL-1.0. Signed-off-by: Timo Jyrinki Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtlocation_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 13667b24..03f3aca0 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -1,7 +1,7 @@ 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 = "Apache-2.0 & MIT & openssl & BSL-1.0 & 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.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ + file://src/3rdparty/mapbox-gl-native/LICENSE.md;md5=0ab9025299bcee16858021d557f09449 \ " DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" -- cgit v1.2.3-54-g00ecf From 6563f37931d347c321468f6c17f7dc910b58a068 Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Thu, 1 Mar 2018 14:52:15 -0300 Subject: cinematicexperience: Add liberation-fonts to RDEPENDS Install liberation-fonts package to show cinematicexperience fonts. Signed-off-by: Fabio Berton Signed-off-by: Martin Jansa --- recipes-qt/examples/cinematicexperience_1.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt') diff --git a/recipes-qt/examples/cinematicexperience_1.0.bb b/recipes-qt/examples/cinematicexperience_1.0.bb index 0c535730..7f921d85 100644 --- a/recipes-qt/examples/cinematicexperience_1.0.bb +++ b/recipes-qt/examples/cinematicexperience_1.0.bb @@ -19,7 +19,7 @@ S = "${WORKDIR}/Qt5_CinematicExperience_rpi_${PV}/" #S = "${WORKDIR}/Qt5_CinematicExperience_${PV}/" DEPENDS = "qtdeclarative qtgraphicaleffects" -RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" +RDEPENDS_${PN} = "liberation-fonts qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" require recipes-qt/qt5/qt5.inc -- cgit v1.2.3-54-g00ecf From 41666ddba78ff1f094310589489e0a070e0094d8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 8 Mar 2018 09:43:16 -0800 Subject: qtmultimedia: Pass -DMESA_EGL_NO_X11_HEADERS=1 when x is disabled Some graphics drives e.g. mali/mesa depend on this define to use proper guards in eglplatform.h Fixes | In file included from /mnt/a/zonit/build/tmp/work/aarch64-bec-linux/qtmultimedia/5.10.1+gitAUTOINC+038716bb1f-r0/recipe-sysroot/usr/include/EGL/egl.h:36:0, | from .moc/../../../../../../git/src/plugins/videonode/egl/qsgvideonode_egl.h:48, | from .moc/moc_qsgvideonode_egl.cpp:9: | /mnt/a/zonit/build/tmp/work/aarch64-bec-linux/qtmultimedia/5.10.1+gitAUTOINC+038716bb1f-r0/recipe-sysroot/usr/include/EGL/eglplatform.h:125:10: fatal error: X11/Xlib.h: No such file or directory | #include | ^~~~~~~~~~~~ | compilation terminated. | make[4]: *** [Makefile:461: .obj/moc_qsgvideonode_egl.o] Error 1 Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtmultimedia_git.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 2cb1bd57..efe848f0 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -25,6 +25,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" # Disable GStreamer if completely disabled EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}" +CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}" # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.10 # 5.10.meta-qt5.2 SRC_URI += "\ -- cgit v1.2.3-54-g00ecf From c7549747b6e83e9630ae37c7e2595e41e4f1ebac Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 18 Apr 2018 13:04:54 +0300 Subject: qtbase: use mysql_config from correct path mysql_config from host sysroot is found first which gives wrong paths for cross-compilation. Use it from crosscompile path instead. Change-Id: Ia1e7d8e0c582016130f595b1be279255e9d0b055 Signed-off-by: Samuli Piippo Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 6532dde2..0078c801 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -121,7 +121,7 @@ PACKAGECONFIG[cups] = "-cups,-no-cups,cups" PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus" PACKAGECONFIG[xcb] = "-xcb -xcb-xlib -system-xcb,-no-xcb,libxcb xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-renderutil" PACKAGECONFIG[sql-ibase] = "-sql-ibase,-no-sql-ibase" -PACKAGECONFIG[sql-mysql] = "-sql-mysql,-no-sql-mysql,mysql5" +PACKAGECONFIG[sql-mysql] = "-sql-mysql -mysql_config ${STAGING_BINDIR_CROSS}/mysql_config,-no-sql-mysql,mysql5" PACKAGECONFIG[sql-psql] = "-sql-psql,-no-sql-psql,postgresql" PACKAGECONFIG[sql-odbc] = "-sql-odbc,-no-sql-odbc" PACKAGECONFIG[sql-oci] = "-sql-oci,-no-sql-oci" -- cgit v1.2.3-54-g00ecf From f33be06035faaa59cee17e5a97e82d079b4ab444 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 22 Feb 2018 14:51:05 +0000 Subject: qt5: upgrade to 5.11 Alpha * use qtwebkit and qtwebkit-examples from dev branch, because there is no 5.11 branch (there isn't 5.10 as well, but because nobranch=1 in qt5-git.inc nobody noticed). * qtbase: drop qml-debug options removed from qtbase in: commit 525f8516c2580018f910cfb99ab5e0e36bd55ab1 Author: Ulf Hermann Date: Fri Oct 6 16:27:09 2017 +0200 Subject: Remove qml-debug configure flag and feature * qtgraphicaleffects, qtquickcontrols2, qtquickcontrols, qtvirtualkeyboard: add qtdeclarative-native dependency needed for qmlcachegen binary * qtwebkit: update LIC_FILES_CHKSUM and remove PACKAGECONFIGs referenced files disappered in: commit 6882a04fb36642862b11efe514251d32070c3d65 Author: Konstantin Tokarev Date: Thu Aug 25 19:20:41 2016 +0300 Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443) Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 11 ++- .../qt5/qt3d/0001-Allow-a-tools-only-build.patch | 8 +-- ...2-Fix-BlenderDNA-for-clang-cross-compiler.patch | 2 +- recipes-qt/qt5/qt3d_git.bb | 6 +- recipes-qt/qt5/qt5-git.inc | 4 +- recipes-qt/qt5/qtbase-native_git.bb | 9 ++- .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 4 +- ...make-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch | 2 +- ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 4 +- ...ump-path-length-from-256-to-512-character.patch | 6 +- ...-unknown-features-instead-of-erroring-out.patch | 2 +- ...-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch | 2 +- .../0007-Delete-qlonglong-and-qulonglong.patch | 2 +- ...08-Replace-pthread_yield-with-sched_yield.patch | 8 +-- ...-Add-OE-specific-specs-for-clang-compiler.patch | 2 +- ...-Invert-conditional-for-defining-QT_SOCKL.patch | 6 +- ..._qlocale-Enable-QT_USE_FENV-only-on-glibc.patch | 4 +- ...mon-gcc-base.conf-Use-I-instead-of-isyste.patch | 2 +- .../qtbase/0013-Always-build-uic-and-qvkgen.patch | 6 +- .../0014-Bootstrap-without-linkat-feature.patch | 6 +- recipes-qt/qt5/qtbase_git.bb | 7 +- 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/qtgamepad_git.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 4 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtknx_git.bb | 4 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtmqtt_git.bb | 4 +- ...tmultimedia-fix-a-conflicting-declaration.patch | 2 +- recipes-qt/qt5/qtmultimedia_git.bb | 7 +- recipes-qt/qt5/qtnetworkauth_git.bb | 2 +- recipes-qt/qt5/qtpurchasing_git.bb | 2 +- recipes-qt/qt5/qtquick1_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 4 +- recipes-qt/qt5/qtquickcontrols_git.bb | 4 +- .../0001-Allow-a-tools-only-build.patch | 2 +- recipes-qt/qt5/qtremoteobjects_git.bb | 6 +- recipes-qt/qt5/qtscript_git.bb | 2 +- ...Use-external-host-bin-path-for-cmake-file.patch | 2 +- recipes-qt/qt5/qtscxml_git.bb | 6 +- 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 +- .../0001-add-noqtwebkit-configuration.patch | 2 +- ...ols-cmake-allow-overriding-the-location-f.patch | 2 +- recipes-qt/qt5/qttools_git.bb | 6 +- recipes-qt/qt5/qttranslations_git.bb | 2 +- .../0001-include-sys-time.h-for-timeval.patch | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 8 +-- .../0001-fix-build-without-xkbcommon-evdev.patch | 12 ++-- recipes-qt/qt5/qtwayland_git.bb | 6 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- ...quickwebengineview_p_p.h-add-include-QCol.patch | 6 +- ...romium-Force-host-toolchain-configuration.patch | 6 +- ...-dependency-to-QCoreApplication-translate.patch | 2 +- ...um-workaround-for-too-long-.rps-file-name.patch | 2 +- .../0003-Force-host-toolchain-configuration.patch | 6 +- ...sl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch | 2 +- ...sl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | 6 +- ...use-pvalloc-as-it-s-not-available-on-musl.patch | 2 +- ...-chromium-musl-include-fcntl.h-for-loff_t.patch | 2 +- .../0005-musl-link-against-libexecinfo.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 +- ...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 | 25 ++++--- recipes-qt/qt5/qtwebkit-examples_git.bb | 4 +- .../0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | 27 -------- ...ude-backtrace-API-for-non-glibc-libraries.patch | 35 ---------- recipes-qt/qt5/qtwebkit_git.bb | 42 +----------- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- recipes-qt/qt5/qtwebview_git.bb | 2 +- recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 91 files changed, 348 insertions(+), 497 deletions(-) create mode 100644 recipes-qt/qt5/qtwebengine/0010-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.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-Do-not-define-__sbrk-on-musl.patch create mode 100644 recipes-qt/qt5/qtwebengine/0012-chromium-musl-Adjust-default-pthread-stack-size.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-include-asm-generic-ioctl.h-for-TCGETS.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/0014-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch delete mode 100644 recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch delete mode 100644 recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 87da66e4..da0adbe3 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -25,8 +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.10-shared -# 5.10.meta-qt5-shared.2 +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared +# 5.11.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 \ @@ -43,8 +43,8 @@ SRC_URI += "\ " # common for qtbase-native and nativesdk-qtbase -# Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native -# 5.10.meta-qt5-native.2 +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native +# 5.11.meta-qt5-native.1 SRC_URI += " \ file://0013-Always-build-uic-and-qvkgen.patch \ " @@ -123,7 +123,6 @@ do_configure() { -no-accessibility \ -no-cups \ -no-gui \ - -no-qml-debug \ -no-sql-mysql \ -no-sql-sqlite \ -no-opengl \ @@ -212,4 +211,4 @@ fakeroot do_generate_qt_environment_file() { do_generate_qt_environment_file[umask] = "022" addtask generate_qt_environment_file after do_install before do_package -SRCREV = "6c6ace9d23f90845fd424e474d38fe30f070775e" +SRCREV = "17b73b0d2b8e0d643bdf13b543cc23d657a4b330" 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 66c80173..37093983 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 05562960b7a3ed7753c9a39a7032fea873fc4098 Mon Sep 17 00:00:00 2001 +From cab5a0bcf52370fede85ee02896ce1a2979d6631 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 @@ -40,12 +40,12 @@ index 8ba2d9a..e973d93 100644 } else { include(assimp.pri) diff --git a/tools/tools.pro b/tools/tools.pro -index 8e973ae..ad51db5 100644 +index 64f2b9f..d108e7f 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): \ +-qtConfig(assimp):qtConfig(commandlineparser): \ ++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 3357fa3e..68b0f332 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 fc23039612ab9aed4f994b4390016e71ceee8165 Mon Sep 17 00:00:00 2001 +From d6e714f9c2b1e5ed238084e254268d70d2093ae1 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 dbd1b279..3cbdfa57 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" DEPENDS_class-target += "qtdeclarative qt3d-native" -# Patches from https://github.com/meta-qt5/qt3d/commits/b5.10 -# 5.10.meta-qt5.2 +# Patches from https://github.com/meta-qt5/qt3d/commits/b5.11 +# 5.11.meta-qt5.1 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 = "31f424bb81cd2583920d3d521e1e01f01c2d28e2" +SRCREV = "e813fb36e782c5e0ab7c25b9c069cee709692506" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index beba9135..9698b314 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -2,7 +2,7 @@ # Copyright (C) 2013-2018 Martin Jansa QT_MODULE ?= "${BPN}" -QT_MODULE_BRANCH ?= "5.10.1" +QT_MODULE_BRANCH ?= "5.11" QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" # each module needs to define valid SRCREV @@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" S = "${WORKDIR}/git" -PV = "5.10.1+git${SRCPV}" +PV = "5.10.1+5.11-alpha+git${SRCPV}" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 36eeae89..52b01481 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -20,8 +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.10-shared -# 5.10.meta-qt5-shared.2 +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared +# 5.11.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 \ @@ -39,7 +39,7 @@ SRC_URI += "\ # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native -# 5.10.meta-qt5-native.2 +# 5.11.meta-qt5-native.1 SRC_URI += " \ file://0013-Always-build-uic-and-qvkgen.patch \ " @@ -65,7 +65,6 @@ PACKAGECONFIG_CONFARGS = " \ -no-accessibility \ -no-cups \ -no-gui \ - -no-qml-debug \ -no-sql-mysql \ -no-sql-sqlite \ -no-opengl \ @@ -137,4 +136,4 @@ do_install() { echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -SRCREV = "6c6ace9d23f90845fd424e474d38fe30f070775e" +SRCREV = "17b73b0d2b8e0d643bdf13b543cc23d657a4b330" 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 07fc2f77..bef60369 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 1ed7a2e9a883fe1240d89b7b70fb0f296bb2b54f Mon Sep 17 00:00:00 2001 +From 27bee79f05319c35a0538b5c876841563ecd42f6 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,7 +30,7 @@ Signed-off-by: Martin Jansa create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index 08b49a8..5876721 100755 +index 9757254..add3e56 100755 --- a/configure +++ b/configure @@ -712,7 +712,7 @@ fi 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 fa598834..58098451 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 c7dd4e5de1fac8c35df79a86418b6cd552024bd0 Mon Sep 17 00:00:00 2001 +From 6918a52c286a7c174f048643038bac84bfd4ad76 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 cc0a3305..d29d07d5 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 f1d359e60e76867cee1df636c5c834fe829f5316 Mon Sep 17 00:00:00 2001 +From e6ab481548fa56b388c6a18a11baf112bb3189dd 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 b4ba0b5..11d4c00 100644 +index 422d08f..a59df4f 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -172,7 +172,10 @@ void QLibrarySettings::load() 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 5a3dfea2..9de8772e 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 cb813ec552f965208ecfc9750a0fbf10841322fb Mon Sep 17 00:00:00 2001 +From 91a51709be1af7b1b5444ea5725ad0dbcf7b2bbe 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,10 +15,10 @@ Signed-off-by: Denys Dmytriyenko 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.pri b/configure.pri -index ea48255..0699701 100644 +index a67860f..30c4a63 100644 --- a/configure.pri +++ b/configure.pri -@@ -796,10 +796,10 @@ defineTest(qtConfOutput_preparePaths) { +@@ -819,10 +819,10 @@ defineTest(qtConfOutput_preparePaths) { "static const char qt_configure_installation [12+11] = \"qt_instdate=2012-12-20\";" \ "" \ "/* Installation Info */" \ 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 2e261b81..0b31a069 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 6cd8e808e0eb8fa26976da66dd3dfdd58c1d026a Mon Sep 17 00:00:00 2001 +From bdd3fc615f2ea39dbf2c6d32e6f321582a49508d 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 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 cf1a716f..93404eaf 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 e3fe48be51aa67227ac1b34c01e4c913d82866c2 Mon Sep 17 00:00:00 2001 +From abaf5cde503901aae1dc1cb1ede28a17ff51cee8 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 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 fd9a9e5a..37914ad4 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 efaae3535a1ac006ec1b3003258b83d905265fd3 Mon Sep 17 00:00:00 2001 +From 6360a89c28bf5d48914ba2f947b55270c071f1b0 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 81269d2e..5f9c818d 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 d79fecb4e8d2040efdc295d06c5e24bdf3cf6b60 Mon Sep 17 00:00:00 2001 +From 48fb6a724a72ee28987124e238051234b8c95431 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 076610a..cb8431f 100644 +index cc628ee..6b6aecc 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -34,7 +34,7 @@ @@ -26,7 +26,7 @@ index 076610a..cb8431f 100644 #endif #include -@@ -199,7 +199,7 @@ protected: +@@ -193,7 +193,7 @@ protected: const char *nm = name.constData(); int tp = qRegisterMetaType(nm); #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) @@ -36,7 +36,7 @@ index 076610a..cb8431f 100644 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 e45eda2..e64f329 100644 +index fc92ed6..e59b858 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -78,6 +78,7 @@ diff --git a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch index c210d644..b5e1fab3 100644 --- a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch +++ b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch @@ -1,4 +1,4 @@ -From aaeadb4326f1f9df7bbafa0b9fa6937504a1c035 Mon Sep 17 00:00:00 2001 +From 1b03528718e7665804c9e0443d45d43a6559034f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 3 Sep 2017 09:11:44 -0700 Subject: [PATCH] Add OE specific specs for clang compiler diff --git a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch index 5fed2ff8..994d6ab8 100644 --- a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch +++ b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch @@ -1,4 +1,4 @@ -From 7c7545fc64e78b2a4a411aa392df6f424ee27c5a Mon Sep 17 00:00:00 2001 +From 05b42800ee62d3a25667d12dc5af3c7df860edc1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 3 Sep 2017 09:44:48 -0700 Subject: [PATCH] linux-clang: Invert conditional for defining QT_SOCKLEN_T @@ -13,10 +13,10 @@ Signed-off-by: Khem Raj 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mkspecs/linux-clang/qplatformdefs.h b/mkspecs/linux-clang/qplatformdefs.h -index d29225f..a0cdb57 100644 +index a818d97..959a508 100644 --- a/mkspecs/linux-clang/qplatformdefs.h +++ b/mkspecs/linux-clang/qplatformdefs.h -@@ -84,10 +84,10 @@ +@@ -81,10 +81,10 @@ #undef QT_SOCKLEN_T diff --git a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch index a0aaa520..84f0ccb9 100644 --- a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch +++ b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch @@ -1,4 +1,4 @@ -From ba70f3ca46d921c20bebb5cb9d4b41e64bd02d8b Mon Sep 17 00:00:00 2001 +From c042f0e9d25b1f4fe53c88f0c897b89cf2f8ab9f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 3 Sep 2017 10:11:50 -0700 Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc @@ -11,7 +11,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp -index d424e60..3eae828 100644 +index fc1ac7c..5bb715a 100644 --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp @@ -46,7 +46,7 @@ diff --git a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch index fe1fcf57..52151305 100644 --- a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch +++ b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch @@ -1,4 +1,4 @@ -From 81fc64f7f3a8b0554fd8d1b96b113bc04b5f0b5c Mon Sep 17 00:00:00 2001 +From aa45912a7543d1648cde7c3a8915ba5811294ef0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 14 Feb 2018 17:08:43 -0800 Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem diff --git a/recipes-qt/qt5/qtbase/0013-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0013-Always-build-uic-and-qvkgen.patch index 3d40515f..07bbd76b 100644 --- a/recipes-qt/qt5/qtbase/0013-Always-build-uic-and-qvkgen.patch +++ b/recipes-qt/qt5/qtbase/0013-Always-build-uic-and-qvkgen.patch @@ -1,4 +1,4 @@ -From 2ea3a1612452f1dc9c2febb4ae610194f67e39d6 Mon Sep 17 00:00:00 2001 +From cfa510d03aad4e637d8956b6dc8923f80e3db36f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 16 Nov 2013 00:32:30 +0100 Subject: [PATCH] Always build uic and qvkgen @@ -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 a73729a..c7668b5 100644 +index 1f7c5d9..6b39379 100644 --- a/src/src.pro +++ b/src/src.pro -@@ -213,7 +213,7 @@ qtConfig(gui) { +@@ -222,7 +222,7 @@ qtConfig(gui) { } } } diff --git a/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch index c733c156..58bc6d83 100644 --- a/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch +++ b/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch @@ -1,4 +1,4 @@ -From 77365eda4dd1c4c26803b3f0d1f411b7416ad531 Mon Sep 17 00:00:00 2001 +From 58e3b74b86f64f67c07fedc2e3dc3b8e025ca411 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 24 Nov 2017 15:16:31 +0200 Subject: [PATCH] Bootstrap without linkat feature @@ -13,10 +13,10 @@ Upstream-Status: Inappropriate [OE specific] 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h -index dabb715..5b4ff86 100644 +index 86ef1a2..52dc6ec 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h -@@ -88,7 +88,7 @@ +@@ -89,7 +89,7 @@ #define QT_FEATURE_futimes -1 #define QT_FEATURE_library -1 #ifdef __linux__ diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 0078c801..a3b9d8e1 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -16,8 +16,8 @@ LIC_FILES_CHKSUM = " \ " # common for qtbase-native, qtbase-nativesdk and qtbase -# Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-shared -# 5.10.meta-qt5-shared.2 +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared +# 5.11.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 \ @@ -90,7 +90,6 @@ PACKAGECONFIG ?= " \ PACKAGECONFIG[release] = "-release,-debug" PACKAGECONFIG[debug] = "" PACKAGECONFIG[developer] = "-developer-build" -PACKAGECONFIG[qml-debug] = "-qml-debug,-no-qml-debug" PACKAGECONFIG[optimize-size] = "-optimize-size" PACKAGECONFIG[sm] = "-sm,-no-sm" PACKAGECONFIG[tests] = "-make tests,-nomake tests" @@ -244,4 +243,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "6c6ace9d23f90845fd424e474d38fe30f070775e" +SRCREV = "17b73b0d2b8e0d643bdf13b543cc23d657a4b330" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index af0b1186..4fed367d 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 = "0eecd96a7b83e8b1fc2811ec366b4ca1980296e0" +SRCREV = "80d7f92b9628076b681e509ddf8eae43cac550d5" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index a2d4ced2..da0f8527 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "9a4f99f518a49716cc9cc300eb456c6b13f9e8d1" +SRCREV = "1f78a69f4f6c33393a0b43a9151c698aa3d05bbb" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 32ccdced..89f92546 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 = "2331b915d207fe794a07b834ec2bf8578965bc4d" +SRCREV = "d70fe2ac47dbf034991f0b2a4b0a3e1f16d171b9" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index ea0ba59d..f4240169 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 = "397e50147407c16a16b6505558992ca3180f9aff" +SRCREV = "be7e45ca259d70d5f2ef0d11460261146fc1df95" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index d6f468fc..e8042afb 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -30,6 +30,6 @@ do_install_append_class-nativesdk() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" -SRCREV = "3e91062877c0853aff693799bc5e33cdf7aaad42" +SRCREV = "0975a9c892f1cb30b9e11e6becc469a3101cc2db" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index e91754cd..485a6d95 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 = "e6f366618dc9a3d232446197d6fea7c814e53828" +SRCREV = "313f221381507eee36c8e3bd0069b3e7962da140" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 658420b5..f80ff56a 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " -DEPENDS += "qtdeclarative" +DEPENDS += "qtdeclarative qtdeclarative-native" RDEPENDS_${PN}-dev = "" @@ -18,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 = "a38c4da7b598f5a185d7c9f824482d418353e6bf" +SRCREV = "3e28d47cea038ca64c2e14ff449cc183c51643ce" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index d804b019..5e699261 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 = "892d4a0df7dccc6e70586835bb1211cf1b79bc69" +SRCREV = "f878323a82fa69fcaeb37b42e10ba28759157f47" diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index fa981abb..24d3527b 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb @@ -9,6 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -QT_MODULE_BRANCH = "5.10" - -SRCREV = "29c34e8f072afd01002ed3847d752b4e065f977e" +SRCREV = "4d5a04a0793ef05ade54a09cd469c9934f102753" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 03f3aca0..3e9edd46 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -31,7 +31,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 = "ec00ff89bee900a1b8925e227a892bc57839cd60" +SRCREV_qtlocation = "d458bd47106dd849e6cf72b97a27f871735e4eed" SRCREV_qtlocation-mapboxgl = "8c1be4ec01ef46bf453856531ebf53b48ce3dbe7" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index 90c255d7..a3e6da49 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb @@ -9,6 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -QT_MODULE_BRANCH = "5.10" - -SRCREV = "2c3c2a41c55a179332ec2a076856990f36dd5ef9" +SRCREV = "b61e7bd3182addd8675ae907fc681db402fb138f" diff --git a/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch b/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch index 4fb0f724..a9572c5e 100644 --- a/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch +++ b/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch @@ -1,4 +1,4 @@ -From ec1740a7bce48435e65ede530e0b96593ac619ea Mon Sep 17 00:00:00 2001 +From 4d020a4b5922c5c97bec661f39d978188d503c9c Mon Sep 17 00:00:00 2001 From: Wenlin Kang Date: Thu, 8 Sep 2016 12:18:13 +0800 Subject: [PATCH] qtmultimedia: fix a conflicting declaration diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index efe848f0..519e76bb 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -26,8 +26,9 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}" CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}" -# Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.10 -# 5.10.meta-qt5.2 + +# Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.11 +# 5.11.meta-qt5.1 SRC_URI += "\ file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ " @@ -36,4 +37,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 = "038716bb1f2d9b95f2d638e2d61d297563343af9" +SRCREV = "0354fdda8b430f7749082ca55ad6c1dc781f3918" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 0180376e..689d85c3 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 = "8f4f2e0cae642ff5eb0b87ae1d4e9c5e6ccf2bd8" +SRCREV = "e8552ddaf17dad91df3a03ccfc0d708ab13d6d0e" diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index adda211c..c39ec3da 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "d925245573a76b23b231a93fa4674fb340f226a7" +SRCREV = "51b83b74bb3d0ed406e28f89cbde1441782b82b2" diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index 85b84629..fd440b74 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb @@ -26,4 +26,4 @@ do_configure_prepend() { QT_MODULE_BRANCH = "dev" -SRCREV = "b2476dcd53f0dea1e9eb38df5add3a771d64c4a1" +SRCREV = "fa02271a18837f20e82006de23c2af1899294aa1" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index d922cd68..ba6afa84 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -8,6 +8,6 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPLv3;md5=dce746aa5261707df6d6999ab9958d8b \ " -DEPENDS += "qtdeclarative" +DEPENDS += "qtdeclarative qtdeclarative-native" -SRCREV = "e693ad2c4ae22f8813befd5fe825c855537497ed" +SRCREV = "e80d273e6f19ba0a6a0f4e830724a36785ef19f6" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 17dd0fc1..a8c2870f 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -10,11 +10,11 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " -DEPENDS += "qtdeclarative" +DEPENDS += "qtdeclarative qtdeclarative-native" FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ " -SRCREV = "09ebb25aa686fc3f47f860905c2abb32a95c75d1" +SRCREV = "6c9f0bfcc4bc6511686559dd87c29cfaa3e88b33" 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 index 19b526c9..977652e3 100644 --- a/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch @@ -1,4 +1,4 @@ -From 6235a3fdd0807205c818d70582033970ee008013 Mon Sep 17 00:00:00 2001 +From 2bf23e29ff3ec25e394fe1f633479013185a57d7 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 diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index e70579ab..5d0dee15 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -11,8 +11,8 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" -# Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.10 -# 5.10.meta-qt5.2 +# Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.11 +# 5.11.meta-qt5.1 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 = "61d2de26db7b90ad0ed3923b5deecd1c5b3be46a" +SRCREV = "db6d07b4a51813e72eee474a6ee2e91438841fa7" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index d73eb44e..f4b2faf8 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -30,4 +30,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 = "76bcf9b526f96edb35469e9de4b032a112a2b1c0" +SRCREV = "781c745277f9b4faa87d341b10ec0ca46eb45a73" 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 e734cf32..e4c72145 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 f83817b29477f33ee3b4abf8468a7b01bb347d2b Mon Sep 17 00:00:00 2001 +From 550a56d5cea4ff0b332c2c4d53a0cb33ccf6102e 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 diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index feb333fe..2fd89730 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 = "d9b2f8c56d162c108d5427769a8e496dd7a3b62e" +SRCREV = "544f8c4ef7b77c5194605cba612fdde6fa02b06b" -# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.10 -# 5.10.meta-qt5.2 +# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.11 +# 5.11.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/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 09e8e8b9..addfe149 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "d5a94c5595170fed9a0f7d3d42ef4b0216909d0d" +SRCREV = "e8588efb2fbd4a31aa1e4349f03b2bc18e3c0e2b" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 85c4669f..fca80af8 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 = "d5d35d64d06729322c80327de40badaf553df87e" +SRCREV = "7c6e9d8f29148793dc619a743a0b5d3a601ec34b" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index ddc6957a..b05c93d4 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 = "fa688ac5c36a16aa3b44d4ca1509f9386e670a89" +SRCREV = "aee027f581839caf44de1b176099ef2b22d2fc84" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 12fcff1f..2f0e98aa 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "af35137016f082c3fa15e61414f3c78c73ac322f" +SRCREV = "f4554e29a44af2cdd9e518f5931e28cf349883c6" diff --git a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch index 7a081a1c..45be54f2 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 9557b7b0100c335b42503c3f3b6a9a193c3bf9cf Mon Sep 17 00:00:00 2001 +From 1a20dc06de52a88691dc8270d449506aa0b9d457 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 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 a4909f75..5472ef55 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 a260d3a5b1664027e09c7de368ee5e94d22ff8bf Mon Sep 17 00:00:00 2001 +From 1a7ca3de9880a10cf4f4eb51fd3cf51e64eb5548 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 df15d88b..a8728a23 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -14,8 +14,8 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtxmlpatterns" -# Patches from https://github.com/meta-qt5/qttools/commits/b5.10 -# 5.10.meta-qt5.2 +# Patches from https://github.com/meta-qt5/qttools/commits/b5.11 +# 5.11.meta-qt5.1 SRC_URI += " \ file://0001-add-noqtwebkit-configuration.patch \ file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \ @@ -29,7 +29,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" -SRCREV = "03ebf1c3d6ceae715c696a171920a0204c58dd0a" +SRCREV = "c29a1b03fd0fe6cc3496a6a14c56f6ef3390b713" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index a8c71668..00ffa7cb 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -106,4 +106,4 @@ FILES_${PN}-qt = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ " -SRCREV = "c3486e072ebc704f9c82c005044143b07bb88f12" +SRCREV = "f1c17f060d09ea3d225803afa9f82fa22117cd3b" 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 1e50d5ad..6f5bc45f 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 d479fe395566ed84cde2579011e2ca2358f22c41 Mon Sep 17 00:00:00 2001 +From c437e90e3bcf8457d300c49041f7e35fae37ebea 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 diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 0029170f..b89aae9b 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ " -# Patches from https://github.com/meta-qt5/qtvirtualkeyboard/commits/b5.10 -# 5.10.meta-qt5.2 +# Patches from https://github.com/meta-qt5/qtvirtualkeyboard/commits/b5.11 +# 5.11.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 @@ -51,6 +51,6 @@ RRECOMMENDS_${PN} += "${PN}-dictionaries" FILES_${PN}-dictionaries = "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/*/*.dat" FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" -DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" +DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" -SRCREV = "85d35bb12235dd6b92c898ddb6d6e84703d25d48" +SRCREV = "9055bd56653d2e488b52c66d884109fcccd23c2d" 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 04ae7e0e..cfb2ee3e 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 e41bc392aa79073926aba917796e836f5b0d9f32 Mon Sep 17 00:00:00 2001 +From 4e1945bd0867c018d06b5fa9c2dcb60619f260b2 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 @@ -26,17 +26,17 @@ index eae7ad5..0bb7b18 100644 + +LIBS += -lxkbcommon diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro -index dc9000d..4eebfd6 100644 +index 47be591..805c81e 100644 --- a/src/compositor/compositor.pro +++ b/src/compositor/compositor.pro -@@ -32,3 +32,5 @@ include ($$PWD/extensions/extensions.pri) - MODULE_PLUGIN_TYPES = \ - wayland-graphics-integration-server +@@ -34,3 +34,5 @@ MODULE_PLUGIN_TYPES = \ + wayland-hardware-layer-integration \ + load(qt_module) + +LIBS += -lxkbcommon diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp -index c30f7b1..e6f1a0b 100644 +index e35c0f3..45e82ca 100644 --- a/src/compositor/compositor_api/qwaylandkeyboard.cpp +++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp @@ -349,12 +349,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap) diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 91ffcd77..272bed1d 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 = "db36bc0d9ccae21e84cd54be3e18ae539542eadc" +SRCREV = "ec495c98189f1d849e793108b09b5af0ce2c8984" -# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.10 -# 5.10.meta-qt5.2 +# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.11 +# 5.11.meta-qt5.1 # 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 2b4a4875..0bcbf564 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "7540a85c82cd940b7da3ea75eccad7e733bd0ae6" +SRCREV = "01241eb3704af785e8d98fb2f6e223ca62a64175" diff --git a/recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch index a324dc64..f7cbad51 100644 --- a/recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch +++ b/recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch @@ -1,4 +1,4 @@ -From a70b6d2183934e4d9a3ad00167acfaf0a78a90a9 Mon Sep 17 00:00:00 2001 +From ded0b78fe690b5c6ddfca08a098e824ed23ae80d 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 1b8edc8..03d6558 100644 +index 1b718a3..8c1de74 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h -@@ -59,6 +59,8 @@ +@@ -61,6 +61,8 @@ #include #include #include diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch index 69e05660..3d5d286d 100644 --- a/recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch @@ -1,4 +1,4 @@ -From d760fcdd764985f05a480ba475855f92844a6f0d Mon Sep 17 00:00:00 2001 +From 3e08f22dbe2ca570bf853b6dfad8831f21ddbe14 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 @@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py -index b1ff7e7..bccabbb 100755 +index 43392ef..9ef521f 100755 --- a/chromium/tools/gn/bootstrap/bootstrap.py +++ b/chromium/tools/gn/bootstrap/bootstrap.py -@@ -318,10 +318,10 @@ def write_gn_ninja(path, root_gen_dir, options): +@@ -326,10 +326,10 @@ def write_gn_ninja(path, root_gen_dir, options): ld = os.environ.get('LD', cxx) ar = os.environ.get('AR', 'ar -X64') else: diff --git a/recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch index e41636a3..061df820 100644 --- a/recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch +++ b/recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch @@ -1,4 +1,4 @@ -From 838bb0afe93321ae3d225988728a5736cd4844fc Mon Sep 17 00:00:00 2001 +From 695e80ba773eae1d6239828b8b3218ac6584e1e1 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/0002-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-workaround-for-too-long-.rps-file-name.patch index 592a30f3..3e30ac5c 100644 --- a/recipes-qt/qt5/qtwebengine/0002-chromium-workaround-for-too-long-.rps-file-name.patch +++ b/recipes-qt/qt5/qtwebengine/0002-chromium-workaround-for-too-long-.rps-file-name.patch @@ -1,4 +1,4 @@ -From d76853bd469881625bedc85afabc69d36ecb05ed Mon Sep 17 00:00:00 2001 +From 51313e2d2739c9a9ca5e86979e868e9bd80e9bfd 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 diff --git a/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch index 84e430b7..8cdab4b7 100644 --- a/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch @@ -1,4 +1,4 @@ -From 36657d556e4f97d06aa44d874d7256c970cdad3c Mon Sep 17 00:00:00 2001 +From afbaa51b52482f71e683389e7565aceb6c59e8a6 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 @@ -57,10 +57,10 @@ index dd0d3e3..70161c8 100644 " nm = \"$$which(nm)\" " \ " toolchain_args = { " \ diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri -index 1ce3ea8..23d0793 100644 +index daac6fa..d858021 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri -@@ -91,7 +91,7 @@ contains(QT_ARCH, "mips") { +@@ -90,7 +90,7 @@ contains(QT_ARCH, "mips") { host_build { gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" 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 1fb85fb3..e808eb70 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 c6e7171bf8f5ecb8b82d911581a45defe93854e1 Mon Sep 17 00:00:00 2001 +From 5d7080bf2001a022223c4089a199605b5f9a5cce 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-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 5dbd07f1..359ee26e 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 104d93f24a44dc4a1939d6e2c99f346526a5a7d9 Mon Sep 17 00:00:00 2001 +From f3478cde99da29faebbdb3d13a479b50af9804fd 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 @@ -32,7 +32,7 @@ index 0eb5c1f..8af7799 100644 return 0; #endif diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc -index 14ba0a2..e5d9581 100644 +index f1cc52a..256138d 100644 --- a/chromium/base/trace_event/malloc_dump_provider.cc +++ b/chromium/base/trace_event/malloc_dump_provider.cc @@ -197,6 +197,7 @@ MallocDumpProvider::~MallocDumpProvider() {} @@ -43,7 +43,7 @@ index 14ba0a2..e5d9581 100644 size_t total_virtual_size = 0; size_t resident_size = 0; size_t allocated_objects_size = 0; -@@ -317,7 +318,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, +@@ -316,7 +317,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, pmd->DumpHeapUsage(metrics_by_context, overhead, "malloc"); } tid_dumping_heap_ = kInvalidThreadId; diff --git a/recipes-qt/qt5/qtwebengine/0004-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0004-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch index 76160d16..e4d44f39 100644 --- a/recipes-qt/qt5/qtwebengine/0004-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/0004-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch @@ -1,4 +1,4 @@ -From 1a23cb4027692535aeace4c6070864af672de70d Mon Sep 17 00:00:00 2001 +From ac6d09a3bb56dee9fc377f4042b23b209fd0726d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 12 Dec 2017 16:06:14 +0200 Subject: [PATCH] musl: don't use pvalloc as it's not available on musl 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 e0a3f804..2af1f3cb 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 1e51c5e3a299213b632dd2d448c86dabf45b2258 Mon Sep 17 00:00:00 2001 +From 660cc2ad6e2c92e0a86948c80f356b754ecd43f5 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/0005-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0005-musl-link-against-libexecinfo.patch index 45a45f9b..84c1cec3 100644 --- a/recipes-qt/qt5/qtwebengine/0005-musl-link-against-libexecinfo.patch +++ b/recipes-qt/qt5/qtwebengine/0005-musl-link-against-libexecinfo.patch @@ -1,4 +1,4 @@ -From e735b0adfa9b1dcaa93e3ce65d9cc01255ab340b Mon Sep 17 00:00:00 2001 +From 52ef357f629a2c210b3b0fe13cba90fe379afee9 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 14 Dec 2017 11:28:10 +0200 Subject: [PATCH] musl: link against libexecinfo 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 f8c4150a..c07ffa44 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 f0fba131a285144c5d71dad8b98ff0f15ce454ad Mon Sep 17 00:00:00 2001 +From 80e2b20ed6aa48b692b7de585c8ea92263c99d72 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 fbff2883..6f578a06 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 42a0586aa7040caef931db8657b2ac8d345e4dd3 Mon Sep 17 00:00:00 2001 +From 671dc6a1d7d507a81d5a53a106d72d6c14f50e13 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 d040057a..1ef7e40a 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 ff7af7ff21d259cfc580541b931d478e3d604f01 Mon Sep 17 00:00:00 2001 +From f1c0433093b5511dceb0cf80287d281fd24ac941 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 c2a9c8a0..aba7c05c 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 74171f47edb76dc89edcc7116cd33d234e0e0490 Mon Sep 17 00:00:00 2001 +From 3789c3d611ee4fd258f85eac9d575af09791585e 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/0010-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch new file mode 100644 index 00000000..032ff303 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch @@ -0,0 +1,79 @@ +From b4cc182b9cc6b6362cf4039883e4e1953357843a 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 8898f85..28530d5 100644 +--- a/chromium/net/dns/dns_config_service_posix.cc ++++ b/chromium/net/dns/dns_config_service_posix.cc +@@ -28,6 +28,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 322c8a5..72ff40d 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 0000000..4f0e852 +--- /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/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 7be83c55..00000000 --- a/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch +++ /dev/null @@ -1,44 +0,0 @@ -From ce23b6a6e5a5ebae15dedeebf7044ac9a0249a80 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 80a3e56..1e57b1a 100644 ---- a/chromium/third_party/lss/linux_syscall_support.h -+++ b/chromium/third_party/lss/linux_syscall_support.h -@@ -794,6 +794,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 -@@ -1211,6 +1219,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/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 9b274913..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 1781911655bddf8a8352f9bd0a7ce4867df6981b 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 088fb9b..98d0a35 100644 ---- a/chromium/net/dns/dns_config_service_posix.cc -+++ b/chromium/net/dns/dns_config_service_posix.cc -@@ -26,6 +26,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 322c8a5..72ff40d 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 0000000..4f0e852 ---- /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-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Do-not-define-__sbrk-on-musl.patch new file mode 100644 index 00000000..6223ee5b --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Do-not-define-__sbrk-on-musl.patch @@ -0,0 +1,26 @@ +From e8172c5252dec386fbd95a18f2c59f08307f65c0 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 edc8cf2..a868b50 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-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Adjust-default-pthread-stack-size.patch new file mode 100644 index 00000000..cacd623e --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Adjust-default-pthread-stack-size.patch @@ -0,0 +1,47 @@ +From 6c3233f1eec1a80bc771848af062cc92445b143b 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/wtf/StackUtil.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 9917a7b..cb40665 100644 +--- a/chromium/base/threading/platform_thread_linux.cc ++++ b/chromium/base/threading/platform_thread_linux.cc +@@ -173,7 +173,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/wtf/StackUtil.cpp b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp +index 13c3f90..07308e0 100644 +--- a/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp ++++ b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp +@@ -28,7 +28,7 @@ size_t GetUnderestimatedStackSize() { + // FIXME: On Mac OSX and Linux, this method cannot estimate stack size + // correctly for the main thread. + +-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ + defined(OS_FUCHSIA) + // pthread_getattr_np() can fail if the thread is not invoked by + // pthread_create() (e.g., the main thread of webkit_unit_tests). +@@ -96,7 +96,7 @@ size_t GetUnderestimatedStackSize() { + } + + void* GetStackStart() { +-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ + defined(OS_FUCHSIA) + pthread_attr_t attr; + int error; 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 e6863251..00000000 --- a/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a968ea31e3ac6a007fd157c61faf9f6f632d8230 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 edc8cf2..a868b50 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 c1d6ec32..00000000 --- a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Adjust-default-pthread-stack-size.patch +++ /dev/null @@ -1,47 +0,0 @@ -From a56debd9f26bacf76f0d734e98191485deba03fa 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/wtf/StackUtil.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 8d411ed..4b56cf3 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/wtf/StackUtil.cpp b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp -index 13c3f90..07308e0 100644 ---- a/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp -+++ b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp -@@ -28,7 +28,7 @@ size_t GetUnderestimatedStackSize() { - // FIXME: On Mac OSX and Linux, this method cannot estimate stack size - // correctly for the main thread. - --#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ - defined(OS_FUCHSIA) - // pthread_getattr_np() can fail if the thread is not invoked by - // pthread_create() (e.g., the main thread of webkit_unit_tests). -@@ -96,7 +96,7 @@ size_t GetUnderestimatedStackSize() { - } - - void* GetStackStart() { --#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ - defined(OS_FUCHSIA) - pthread_attr_t attr; - int error; diff --git a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch b/recipes-qt/qt5/qtwebengine/0013-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch new file mode 100644 index 00000000..d9c76017 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0013-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch @@ -0,0 +1,22 @@ +From 9624b45166cd5e7976a6ecf99f2545c9cc883986 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 eca131f..80a6cec 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/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 81e71e7d..00000000 --- a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 5809e73146cdf43d13aa1b3789bfc7ff2ff723af 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 8ffba12..82fb09f 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/0014-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch new file mode 100644 index 00000000..f7880f81 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch @@ -0,0 +1,23 @@ +From d723d506ff8b5e0dd1bb3f2c11805a2ec1f0b712 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 91f77dd..bb84a0b 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/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 03aa77a0..00000000 --- a/recipes-qt/qt5/qtwebengine/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0aca8610a03cc100464d0d52a2c5425c52ab1e66 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 91f77dd..bb84a0b 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 db089c14..1d1763d0 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -121,10 +121,10 @@ RDEPENDS_${PN}-examples += " \ qtdeclarative-qmlplugins \ " -QT_MODULE_BRANCH_CHROMIUM = "61-based" +QT_MODULE_BRANCH_CHROMIUM = "63-based" -# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.10 -# 5.10.meta-qt5.2 +# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.11 +# 5.11.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-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ @@ -136,8 +136,8 @@ SRC_URI_append_libc-musl = "\ file://0005-musl-link-against-libexecinfo.patch \ " -# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/61-based -# 61-based.meta-qt5.2 +# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/63-based +# 63-based.meta-qt5.1 SRC_URI += " \ file://0001-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ file://0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ @@ -151,16 +151,15 @@ SRC_URI_append_libc-musl = "\ 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://0010-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ + file://0011-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ + file://0012-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ + file://0013-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \ + file://0014-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "9dc8dff7a8f4d58f71d816375d49f8829f06aae5" -SRCREV_chromium = "c858cc76099db0af82a264b3c6f921a287cfcb42" +SRCREV_qtwebengine = "732d09331c1e4efa51501aae9bcd6924eecdd5c3" +SRCREV_chromium = "3fa04d22883e42bd987e4f83d394a1040b410024" 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 114fab7a..c19fecdb 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb @@ -17,6 +17,6 @@ DEPENDS += "qtwebkit qtxmlpatterns" RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" -QT_MODULE_BRANCH = "5.9" +QT_MODULE_BRANCH = "dev" -SRCREV = "a24c780b60d7d8bc00c4a48042cf7f32db777d55" +SRCREV = "2d68492004bf4ba49cf58c9bd72706cb282cf59b" 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 deleted file mode 100644 index f35c5d47..00000000 --- a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +++ /dev/null @@ -1,27 +0,0 @@ -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) - -Building qtwebkit causes a QA issue such that QtWebPluginProcess and -QtWebProcess contain bad RPATHs which point into the build location. This fix -adds a patch to not include the rpath.prf which causes this problem. - -Signed-off-by: Trevor Woerner -Signed-off-by: Martin Jansa ---- - Tools/qmake/mkspecs/features/unix/default_post.prf | 1 - - 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 ---- a/Tools/qmake/mkspecs/features/unix/default_post.prf -+++ b/Tools/qmake/mkspecs/features/unix/default_post.prf -@@ -61,7 +61,6 @@ linux-*g++* { - } - } - --contains(TEMPLATE, app): CONFIG += rpath - - CONFIG(debug, debug|release)|force_debug_info { - # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. 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 deleted file mode 100644 index 6affd2e6..00000000 --- a/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 - -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_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index c8e83281..36c967f4 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -3,9 +3,7 @@ require qt5-git.inc LICENSE = "BSD & LGPLv2+ | GPL-2.0" LIC_FILES_CHKSUM = " \ - file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ - file://Source/WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \ - file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ + file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee \ " @@ -26,13 +24,6 @@ ARM_INSTRUCTION_SET_armv7a = "thumb" ARM_INSTRUCTION_SET_armv7r = "thumb" ARM_INSTRUCTION_SET_armv7ve = "thumb" -# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.10 -# 5.10.meta-qt5.1 -SRC_URI += "\ - file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \ - file://0002-Exclude-backtrace-API-for-non-glibc-libraries.patch \ -" - PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxrender', '', d)} \ fontconfig \ @@ -50,27 +41,6 @@ PACKAGECONFIG[fontconfig] = "OE_FONTCONFIG_ENABLED,,fontconfig" do_configure_prepend() { export QMAKE_CACHE_EVAL="CONFIG+=${PACKAGECONFIG_CONFARGS}" - # disable gstreamer-1.0 test if it isn't enabled by PACKAGECONFIG - sed -e 's/\s\(packagesExist(".*\.*")\)/ OE_GSTREAMER_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf - # disable gstreamer-0.10 test if it isn't enabled by PACKAGECONFIG - sed -e 's/\s\(packagesExist(".*\.*")\)/ OE_GSTREAMER010_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf - # disable qtlocation test if it isn't enabled by PACKAGECONFIG - sed -e 's/\s\(qtHaveModule(positioning)\)/ OE_QTLOCATION_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf - # disable qtmultimedia test if it isn't enabled by PACKAGECONFIG - sed -e 's/(video):\(qtHaveModule(multimediawidgets)\)/(video):OE_QTMULTIMEDIA_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf - # disable qtsensors test if it isn't enabled by PACKAGECONFIG - sed -e 's/\s\(qtHaveModule(sensors)\)/ OE_QTSENSORS_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf - # disable qtwebchannel test if it isn't enabled by PACKAGECONFIG - sed -e 's/\s\(qtHaveModule(webchannel)\)/ OE_QTWEBCHANNEL_ENABLED:\1/' -i ${S}/Source/WebKit2/Target.pri - sed -e 's/\s\(qtHaveModule(webchannel)\)/ OE_QTWEBCHANNEL_ENABLED:\1/' -i ${S}/Source/WebKit2/WebKit2.pri - # disable libwebp test if it isn't enabled by PACKAGECONFIG - sed -e 's/\s\(config_libwebp: \)/ OE_LIBWEBP_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf - # disable libxcomposite test if it isn't enabled by PACKAGECONFIG - sed -e 's/\s\(config_libXcomposite: \)/ OE_LIBXCOMPOSITE_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf - # disable libxrender test if it isn't enabled by PACKAGECONFIG - sed -e 's/\s\(config_libXrender: \)/ OE_LIBXRENDER_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf - # disable fontconfig test if it isn't enabled by PACKAGECONFIG - sed -e 's/\s\(config_fontconfig: \)/ OE_FONTCONFIG_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf } # Forcibly enable ICU, so qtbase doesn't need it. @@ -80,12 +50,6 @@ EXTRA_QMAKEVARS_PRE += "QT_CONFIG+=icu" QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0" EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" -do_install_append() { - # Remove paths to workdir, qtwebkit is dead now, so I won't spend extra time trying to prevent this - # from some .prl or .prf file like for other modules - sed -i 's@-Wl,-no-whole-archive -L${B}[^ ]* @ @g' ${D}${libdir}/pkgconfig/Qt5WebKit.pc -} - # remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples" @@ -95,6 +59,6 @@ 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}" -QT_MODULE_BRANCH = "5.9" +QT_MODULE_BRANCH = "dev" -SRCREV = "bd0657f98aff85b9f06d85a8cf4da6a27f61a56e" +SRCREV = "beaeeb99881184fd368c121fcbb1a31c78b794a3" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 5d429ca0..1e8719a7 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 = "2160c268ec80012f86be3eef20e05c267cdd2926" +SRCREV = "8a549aca7b371722cbf012d85216e4560ef1cf33" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index f164c6af..ceecfb0b 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_armv7ve = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" -SRCREV = "7445cd28616e68af3cf5e074a5576cbe6c5bf491" +SRCREV = "cf23a402b97b459309ec32fe49c82a845a3636af" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 443e9d50..8a98f548 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 = "a751298bc381b0fd0c6867e43d2613b98c2cb71f" +SRCREV = "78a10dad08d1c354f7afb539bd89f0d75a9fe3b1" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 77d7fe20..2325eb03 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "7c4113d6e6215b26b866ed2a0da0fa5e0c12b8ea" +SRCREV = "c892ceec1c301f12d5c276e12be0bee8fd7d4cbf" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3-54-g00ecf From 5bbfbca70586922b9b3f62878f46bc7260f42135 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 26 Feb 2018 18:08:14 +0000 Subject: packagegroup-qt5-toolchain-target: drop both qtwebkit packages * qtwebkit builds needs to be fixed first Signed-off-by: Martin Jansa --- recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | 2 -- 1 file changed, 2 deletions(-) (limited to 'recipes-qt') diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb index d899ff94..f8662ecb 100755 --- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb @@ -15,8 +15,6 @@ USE_RUBY = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtquick1-qmlplugins', '', d)} \ qttranslations-qtquick1 \ qtwebkit-dev \ - qtwebkit-mkspecs \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtwebkit-qmlplugins', '', d)} \ " # Requires Wayland to work -- cgit v1.2.3-54-g00ecf From 35f8981b11b4fcc7789f86fe2beed3f8841ee88d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 18 Apr 2018 12:17:24 +0000 Subject: qt5: upgrade to 5.11 beta3+ Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 11 +++--- .../qt5/qt3d/0001-Allow-a-tools-only-build.patch | 2 +- ...2-Fix-BlenderDNA-for-clang-cross-compiler.patch | 44 ---------------------- recipes-qt/qt5/qt3d_git.bb | 5 +-- recipes-qt/qt5/qt5-git.inc | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 11 +++--- .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 4 +- ...make-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch | 4 +- ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 2 +- ...ump-path-length-from-256-to-512-character.patch | 6 +-- ...-unknown-features-instead-of-erroring-out.patch | 6 +-- ...-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch | 14 +++---- .../0007-Delete-qlonglong-and-qulonglong.patch | 2 +- ...08-Replace-pthread_yield-with-sched_yield.patch | 6 +-- ...-Add-OE-specific-specs-for-clang-compiler.patch | 2 +- ...-Invert-conditional-for-defining-QT_SOCKL.patch | 2 +- ..._qlocale-Enable-QT_USE_FENV-only-on-glibc.patch | 4 +- ...mon-gcc-base.conf-Use-I-instead-of-isyste.patch | 2 +- .../qtbase/0013-Always-build-uic-and-qvkgen.patch | 2 +- .../0014-Bootstrap-without-linkat-feature.patch | 8 ++-- recipes-qt/qt5/qtbase_git.bb | 11 ++---- 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/qtgraphicaleffects_git.bb | 2 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtknx_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtmqtt_git.bb | 2 +- ...tmultimedia-fix-a-conflicting-declaration.patch | 2 +- recipes-qt/qt5/qtmultimedia_git.bb | 4 +- recipes-qt/qt5/qtnetworkauth_git.bb | 2 +- recipes-qt/qt5/qtpurchasing_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- .../0001-Allow-a-tools-only-build.patch | 2 +- recipes-qt/qt5/qtremoteobjects_git.bb | 4 +- recipes-qt/qt5/qtscript_git.bb | 2 +- ...Use-external-host-bin-path-for-cmake-file.patch | 2 +- recipes-qt/qt5/qtscxml_git.bb | 4 +- 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 +- .../0001-add-noqtwebkit-configuration.patch | 2 +- ...ols-cmake-allow-overriding-the-location-f.patch | 2 +- recipes-qt/qt5/qttools_git.bb | 4 +- recipes-qt/qt5/qttranslations_git.bb | 2 +- .../0001-include-sys-time.h-for-timeval.patch | 25 ------------ recipes-qt/qt5/qtvirtualkeyboard_git.bb | 6 +-- .../0001-fix-build-without-xkbcommon-evdev.patch | 8 ++-- recipes-qt/qt5/qtwayland_git.bb | 10 ++--- ...quickwebengineview_p_p.h-add-include-QCol.patch | 4 +- ...romium-Force-host-toolchain-configuration.patch | 6 +-- ...-dependency-to-QCoreApplication-translate.patch | 2 +- ...um-workaround-for-too-long-.rps-file-name.patch | 6 +-- .../0003-Force-host-toolchain-configuration.patch | 6 +-- ...sl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch | 2 +- ...sl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | 16 ++++---- ...use-pvalloc-as-it-s-not-available-on-musl.patch | 2 +- ...-chromium-musl-include-fcntl.h-for-loff_t.patch | 2 +- .../0005-musl-link-against-libexecinfo.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 | 6 +-- ...sl-Use-correct-member-name-__si_fields-fr.patch | 2 +- ...sl-Define-res_ninit-and-res_nclose-for-no.patch | 6 +-- ...hromium-musl-Do-not-define-__sbrk-on-musl.patch | 2 +- ...um-musl-Adjust-default-pthread-stack-size.patch | 2 +- ...sl-include-asm-generic-ioctl.h-for-TCGETS.patch | 4 +- ...sl-tcmalloc-Use-off64_t-insread-of-__off6.patch | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 12 +++--- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- recipes-qt/qt5/qtwebview_git.bb | 2 +- recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 78 files changed, 141 insertions(+), 220 deletions(-) delete mode 100644 recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch delete mode 100644 recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index da0adbe3..4189603a 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -6,14 +6,13 @@ HOMEPAGE = "http://qt-project.org" 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.LGPLv3;md5=86d02ed8764e77c1c0b194fde895a51b \ 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 \ + file://LICENSE.PREVIEW.COMMERCIAL;md5=8ee24b8d305ef7779e07647a7b70e1bc \ " QT_MODULE = "qtbase" @@ -26,7 +25,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared -# 5.11.meta-qt5-shared.1 +# 5.11.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 \ @@ -44,7 +43,7 @@ SRC_URI += "\ # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native -# 5.11.meta-qt5-native.1 +# 5.11.meta-qt5-native.2 SRC_URI += " \ file://0013-Always-build-uic-and-qvkgen.patch \ " @@ -211,4 +210,4 @@ fakeroot do_generate_qt_environment_file() { do_generate_qt_environment_file[umask] = "022" addtask generate_qt_environment_file after do_install before do_package -SRCREV = "17b73b0d2b8e0d643bdf13b543cc23d657a4b330" +SRCREV = "2b5587d901a0cc23749bf27a923d50bf0e5860d3" 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 37093983..30d32b44 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 cab5a0bcf52370fede85ee02896ce1a2979d6631 Mon Sep 17 00:00:00 2001 +From 0fc2916634a213f38b81ae74160136cf384f6166 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 deleted file mode 100644 index 68b0f332..00000000 --- a/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch +++ /dev/null @@ -1,44 +0,0 @@ -From d6e714f9c2b1e5ed238084e254268d70d2093ae1 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 18ec9f2..5b0b209 100644 ---- a/src/3rdparty/assimp/code/BlenderDNA.cpp -+++ b/src/3rdparty/assimp/code/BlenderDNA.cpp -@@ -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]); - } -@@ -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); - diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 3cbdfa57..6b5ddeb9 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -12,10 +12,9 @@ DEPENDS += "qtbase" DEPENDS_class-target += "qtdeclarative qt3d-native" # Patches from https://github.com/meta-qt5/qt3d/commits/b5.11 -# 5.11.meta-qt5.1 +# 5.11.meta-qt5.2 SRC_URI += " \ file://0001-Allow-a-tools-only-build.patch \ - file://0002-Fix-BlenderDNA-for-clang-cross-compiler.patch \ " PACKAGECONFIG ??= "" @@ -37,6 +36,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "e813fb36e782c5e0ab7c25b9c069cee709692506" +SRCREV = "6d73c51d44d10925a05804cd8e70978f155643df" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 9698b314..ae7394c2 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" S = "${WORKDIR}/git" -PV = "5.10.1+5.11-alpha+git${SRCPV}" +PV = "5.10.1+5.11-beta3+git${SRCPV}" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 52b01481..d6c53ad7 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -6,14 +6,13 @@ HOMEPAGE = "http://qt-project.org" 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.LGPLv3;md5=86d02ed8764e77c1c0b194fde895a51b \ 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 \ + file://LICENSE.PREVIEW.COMMERCIAL;md5=8ee24b8d305ef7779e07647a7b70e1bc \ " require qt5-native.inc @@ -21,7 +20,7 @@ require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared -# 5.11.meta-qt5-shared.1 +# 5.11.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 \ @@ -39,7 +38,7 @@ SRC_URI += "\ # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native -# 5.11.meta-qt5-native.1 +# 5.11.meta-qt5-native.2 SRC_URI += " \ file://0013-Always-build-uic-and-qvkgen.patch \ " @@ -136,4 +135,4 @@ do_install() { echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -SRCREV = "17b73b0d2b8e0d643bdf13b543cc23d657a4b330" +SRCREV = "2b5587d901a0cc23749bf27a923d50bf0e5860d3" 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 bef60369..dbb0b9dc 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 27bee79f05319c35a0538b5c876841563ecd42f6 Mon Sep 17 00:00:00 2001 +From 6a84c4a36742716b5db715c2538901f37ff8b1c5 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,7 +30,7 @@ Signed-off-by: Martin Jansa create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index 9757254..add3e56 100755 +index 2830a1b..6445dc2 100755 --- a/configure +++ b/configure @@ -712,7 +712,7 @@ fi 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 58098451..5c23052b 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 6918a52c286a7c174f048643038bac84bfd4ad76 Mon Sep 17 00:00:00 2001 +From 7c0c897d0d534bfc9183f9da1d9b280e709b0917 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 @@ -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 545b9a3..c991a9b 100644 +index e0652fd..215f435 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) 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 d29d07d5..d0d5390d 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 e6ab481548fa56b388c6a18a11baf112bb3189dd Mon Sep 17 00:00:00 2001 +From d52e2787db887056eed59b9020f1ca625cffa2e4 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 9de8772e..e806fabb 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 91a51709be1af7b1b5444ea5725ad0dbcf7b2bbe Mon Sep 17 00:00:00 2001 +From eb7df134dff6991cf9d84ea0c8313dfa1f2cc4dc 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,10 +15,10 @@ Signed-off-by: Denys Dmytriyenko 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.pri b/configure.pri -index a67860f..30c4a63 100644 +index 0512ef0..8a53223 100644 --- a/configure.pri +++ b/configure.pri -@@ -819,10 +819,10 @@ defineTest(qtConfOutput_preparePaths) { +@@ -817,10 +817,10 @@ defineTest(qtConfOutput_preparePaths) { "static const char qt_configure_installation [12+11] = \"qt_instdate=2012-12-20\";" \ "" \ "/* Installation Info */" \ 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 0b31a069..88967e78 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 bdd3fc615f2ea39dbf2c6d32e6f321582a49508d Mon Sep 17 00:00:00 2001 +From a1799db5d1b2e2e7d47c37872e887dfab4b4974a 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 d5dcda2..501151d 100644 +index 6e29eaa..de8c8d2 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf -@@ -1251,7 +1251,8 @@ defineReplace(qtConfEvaluateSingleExpression) { +@@ -1265,7 +1265,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 93404eaf..3d5a7323 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 abaf5cde503901aae1dc1cb1ede28a17ff51cee8 Mon Sep 17 00:00:00 2001 +From 2df6d12cfef0769f7801410cad012dd20d0497e2 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,12 +30,12 @@ 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 55c74aa..f9ec328 100644 +index 27f4c27..01f68a5 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) +@@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) + message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.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") @@ -46,11 +46,11 @@ index 55c74aa..f9ec328 100644 !!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 75b5348..ed31888 100644 +index 6b6544f..d317912 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\") +@@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) + message(FATAL_ERROR \"Qt5 requires at least CMake version 3.1.0\") endif() +if(NOT DEFINED OE_QMAKE_PATH_EXTERNAL_HOST_BINS) 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 37914ad4..57ad3f87 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 6360a89c28bf5d48914ba2f947b55270c071f1b0 Mon Sep 17 00:00:00 2001 +From 6407bc53339920c16bf384145e4dd95ed0c325d0 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 5f9c818d..1262ffe4 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 48fb6a724a72ee28987124e238051234b8c95431 Mon Sep 17 00:00:00 2001 +From 9f9eac8d12531fe6ec3aa77f719c0b8ca7cfdd75 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 cc628ee..6b6aecc 100644 +index c6fd5d1..7bf6bfd 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -34,7 +34,7 @@ @@ -26,7 +26,7 @@ index cc628ee..6b6aecc 100644 #endif #include -@@ -193,7 +193,7 @@ protected: +@@ -205,7 +205,7 @@ protected: const char *nm = name.constData(); int tp = qRegisterMetaType(nm); #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) diff --git a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch index b5e1fab3..7eb78fac 100644 --- a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch +++ b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch @@ -1,4 +1,4 @@ -From 1b03528718e7665804c9e0443d45d43a6559034f Mon Sep 17 00:00:00 2001 +From ef4ff7241ee33819f11357d5a6ceee58146d63b4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 3 Sep 2017 09:11:44 -0700 Subject: [PATCH] Add OE specific specs for clang compiler diff --git a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch index 994d6ab8..e98b9b2e 100644 --- a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch +++ b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch @@ -1,4 +1,4 @@ -From 05b42800ee62d3a25667d12dc5af3c7df860edc1 Mon Sep 17 00:00:00 2001 +From a3358cf43c523af046638337960686e942798d2c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 3 Sep 2017 09:44:48 -0700 Subject: [PATCH] linux-clang: Invert conditional for defining QT_SOCKLEN_T diff --git a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch index 84f0ccb9..94d2ea16 100644 --- a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch +++ b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch @@ -1,4 +1,4 @@ -From c042f0e9d25b1f4fe53c88f0c897b89cf2f8ab9f Mon Sep 17 00:00:00 2001 +From 8bf717e2ecda234f626f96ae08e0be3a6eca26d8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 3 Sep 2017 10:11:50 -0700 Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc @@ -11,7 +11,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp -index fc1ac7c..5bb715a 100644 +index 375cecd..46ca9b1 100644 --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp @@ -46,7 +46,7 @@ diff --git a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch index 52151305..89252dea 100644 --- a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch +++ b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch @@ -1,4 +1,4 @@ -From aa45912a7543d1648cde7c3a8915ba5811294ef0 Mon Sep 17 00:00:00 2001 +From f09d998036af014a42c464eea72368c8f2920f6a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 14 Feb 2018 17:08:43 -0800 Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem diff --git a/recipes-qt/qt5/qtbase/0013-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0013-Always-build-uic-and-qvkgen.patch index 07bbd76b..ea23cce7 100644 --- a/recipes-qt/qt5/qtbase/0013-Always-build-uic-and-qvkgen.patch +++ b/recipes-qt/qt5/qtbase/0013-Always-build-uic-and-qvkgen.patch @@ -1,4 +1,4 @@ -From cfa510d03aad4e637d8956b6dc8923f80e3db36f Mon Sep 17 00:00:00 2001 +From 10f419678fe4f7087c973a8d8dd96bb0d781487b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 16 Nov 2013 00:32:30 +0100 Subject: [PATCH] Always build uic and qvkgen diff --git a/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch index 58bc6d83..57cfe368 100644 --- a/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch +++ b/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch @@ -1,4 +1,4 @@ -From 58e3b74b86f64f67c07fedc2e3dc3b8e025ca411 Mon Sep 17 00:00:00 2001 +From 7691598a164737591068f8670f02a904ffce5dd2 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 24 Nov 2017 15:16:31 +0200 Subject: [PATCH] Bootstrap without linkat feature @@ -13,11 +13,11 @@ Upstream-Status: Inappropriate [OE specific] 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h -index 86ef1a2..52dc6ec 100644 +index 3469ebe..cb889f2 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h -@@ -89,7 +89,7 @@ - #define QT_FEATURE_futimes -1 +@@ -90,7 +90,7 @@ + #define QT_FEATURE_itemmodel -1 #define QT_FEATURE_library -1 #ifdef __linux__ -# define QT_FEATURE_linkat 1 diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index a3b9d8e1..a599fc98 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -5,19 +5,18 @@ 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=fb91571854638f10b2e5f36562661a5a \ - file://LICENSE.LGPLv3;md5=a909b94c1c9674b2aa15ff03a86f518a \ + file://LICENSE.LGPLv3;md5=86d02ed8764e77c1c0b194fde895a51b \ 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 \ + file://LICENSE.PREVIEW.COMMERCIAL;md5=8ee24b8d305ef7779e07647a7b70e1bc \ " # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared -# 5.11.meta-qt5-shared.1 +# 5.11.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 \ @@ -33,8 +32,6 @@ SRC_URI += "\ file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ " -# LGPL-3.0 is used only in src/plugins/platforms/android/extract.cpp - # for syncqt RDEPENDS_${PN}-tools += "perl" @@ -243,4 +240,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "17b73b0d2b8e0d643bdf13b543cc23d657a4b330" +SRCREV = "2b5587d901a0cc23749bf27a923d50bf0e5860d3" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 4fed367d..57e79bea 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 = "80d7f92b9628076b681e509ddf8eae43cac550d5" +SRCREV = "ff771b7d57eb3654f6321eb105129a594ec2841e" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index da0f8527..8ef68263 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "1f78a69f4f6c33393a0b43a9151c698aa3d05bbb" +SRCREV = "d3f9275cbaa6a6059298ec248dd28dd6ef065e51" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 89f92546..6f1f7d31 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 = "d70fe2ac47dbf034991f0b2a4b0a3e1f16d171b9" +SRCREV = "e68b5e17b071ca11974474546be04c7d564eae3a" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index f4240169..b170b965 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 = "be7e45ca259d70d5f2ef0d11460261146fc1df95" +SRCREV = "6c253768e2fb6c0892215f3d93f36be7cece637e" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index e8042afb..33f15dd3 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -30,6 +30,6 @@ do_install_append_class-nativesdk() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" -SRCREV = "0975a9c892f1cb30b9e11e6becc469a3101cc2db" +SRCREV = "6069cc1cd1a6309cdffeb8bdd9c4035f33742228" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index f80ff56a..5f820a5d 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -18,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 = "3e28d47cea038ca64c2e14ff449cc183c51643ce" +SRCREV = "df80153bf07b08e5d2ae8ba18f85a9ec15dbaef8" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 5e699261..05384b1a 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 = "f878323a82fa69fcaeb37b42e10ba28759157f47" +SRCREV = "b83a0a9460432abb82218da247710a1aaf321336" diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index 24d3527b..9f15a57e 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "4d5a04a0793ef05ade54a09cd469c9934f102753" +SRCREV = "8a8a343446146f51056b6f530ce341f34199c811" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 3e9edd46..e197dfb0 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -31,7 +31,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 = "d458bd47106dd849e6cf72b97a27f871735e4eed" +SRCREV_qtlocation = "3d2281ccf7400a782f69b7b74cb45d0889708bcc" SRCREV_qtlocation-mapboxgl = "8c1be4ec01ef46bf453856531ebf53b48ce3dbe7" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index a3e6da49..ca7886c3 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "b61e7bd3182addd8675ae907fc681db402fb138f" +SRCREV = "21aefc65d56d97284bf8122fb1b91726c1ae9768" diff --git a/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch b/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch index a9572c5e..ddcc7f5a 100644 --- a/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch +++ b/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch @@ -1,4 +1,4 @@ -From 4d020a4b5922c5c97bec661f39d978188d503c9c Mon Sep 17 00:00:00 2001 +From 556f69870fb3b5788ebae2baa9b832cb4d6fd996 Mon Sep 17 00:00:00 2001 From: Wenlin Kang Date: Thu, 8 Sep 2016 12:18:13 +0800 Subject: [PATCH] qtmultimedia: fix a conflicting declaration diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 519e76bb..7ae9a242 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -28,7 +28,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstream CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}" # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.11 -# 5.11.meta-qt5.1 +# 5.11.meta-qt5.2 SRC_URI += "\ file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ " @@ -37,4 +37,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 = "0354fdda8b430f7749082ca55ad6c1dc781f3918" +SRCREV = "bb7ffc4d847bb2b558693a4ca5d7f3a45c9b9231" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 689d85c3..96c78eaa 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 = "e8552ddaf17dad91df3a03ccfc0d708ab13d6d0e" +SRCREV = "0d845e00a000f376101165ec9a5c9096030db25c" diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index c39ec3da..df4a6e05 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "51b83b74bb3d0ed406e28f89cbde1441782b82b2" +SRCREV = "02246cd68ca14345d95cbd8893fd24ff60faa73f" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index ba6afa84..a8fc2c2b 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtdeclarative-native" -SRCREV = "e80d273e6f19ba0a6a0f4e830724a36785ef19f6" +SRCREV = "c0232099a9fac03ef0f5287b6a26dbbd46669c06" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index a8c2870f..372ed0c7 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ " -SRCREV = "6c9f0bfcc4bc6511686559dd87c29cfaa3e88b33" +SRCREV = "0689a8256c0a21087c01fff3998fd3b606a5ac4c" 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 index 977652e3..3d3599da 100644 --- a/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch @@ -1,4 +1,4 @@ -From 2bf23e29ff3ec25e394fe1f633479013185a57d7 Mon Sep 17 00:00:00 2001 +From 51cfd34b85738194616c7a9354d707cc96062450 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 diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 5d0dee15..1efac5cd 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.11 -# 5.11.meta-qt5.1 +# 5.11.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 = "db6d07b4a51813e72eee474a6ee2e91438841fa7" +SRCREV = "556539365ab1eeaab339fc527c4c2130c2f804ff" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index f4b2faf8..9982877a 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -30,4 +30,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 = "781c745277f9b4faa87d341b10ec0ca46eb45a73" +SRCREV = "c2657d346455a5a7821fbfbe3b1107d7cf9b0949" 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 e4c72145..348693da 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 550a56d5cea4ff0b332c2c4d53a0cb33ccf6102e Mon Sep 17 00:00:00 2001 +From 602abde351bcb2ac475253cf547e15f10620b6e7 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 diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 2fd89730..1a81beb1 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 = "544f8c4ef7b77c5194605cba612fdde6fa02b06b" +SRCREV = "67d48807b44735a2385b88db7ada01f7cd7eacfd" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.11 -# 5.11.meta-qt5.1 +# 5.11.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 addfe149..5c6a83d8 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "e8588efb2fbd4a31aa1e4349f03b2bc18e3c0e2b" +SRCREV = "29f2041f4da53815491affbf19ec008820c76e29" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index fca80af8..5c196ec0 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 = "7c6e9d8f29148793dc619a743a0b5d3a601ec34b" +SRCREV = "fb561e9aa52d24b0156dc2c3987216954ad52107" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index b05c93d4..9bac24e2 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 = "aee027f581839caf44de1b176099ef2b22d2fc84" +SRCREV = "b5f0519e8e6f8f125f711d61832072649d841dfe" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 2f0e98aa..c15a9e37 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "f4554e29a44af2cdd9e518f5931e28cf349883c6" +SRCREV = "1fd6226d52b8d3d201b117902ff1ecd84cc1a1e5" diff --git a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch index 45be54f2..5d3f9843 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 1a20dc06de52a88691dc8270d449506aa0b9d457 Mon Sep 17 00:00:00 2001 +From 2a61817d5eac01b1dbc445a65d14573294b7ed71 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 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 5472ef55..790657b3 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 1a7ca3de9880a10cf4f4eb51fd3cf51e64eb5548 Mon Sep 17 00:00:00 2001 +From db6995482d1bd290ea8f09a02ff31f8e769f87c4 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 a8728a23..7fbf4ee8 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtxmlpatterns" # Patches from https://github.com/meta-qt5/qttools/commits/b5.11 -# 5.11.meta-qt5.1 +# 5.11.meta-qt5.2 SRC_URI += " \ file://0001-add-noqtwebkit-configuration.patch \ file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \ @@ -29,7 +29,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" -SRCREV = "c29a1b03fd0fe6cc3496a6a14c56f6ef3390b713" +SRCREV = "38b62511970b048b4a0edc5c8bcdea8c37fa76c7" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 00ffa7cb..8c4e04a1 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -106,4 +106,4 @@ FILES_${PN}-qt = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ " -SRCREV = "f1c17f060d09ea3d225803afa9f82fa22117cd3b" +SRCREV = "0bf644a075634ca49ee28c0f42566f1012506f31" 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 deleted file mode 100644 index 6f5bc45f..00000000 --- a/recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c437e90e3bcf8457d300c49041f7e35fae37ebea 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 diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index b89aae9b..f8759f1e 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -6,10 +6,6 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ " -# Patches from https://github.com/meta-qt5/qtvirtualkeyboard/commits/b5.11 -# 5.11.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 # and enable "t9write" in PACKAGECONFIG. This can be done in a separate .bbappend file. # for example: @@ -53,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" -SRCREV = "9055bd56653d2e488b52c66d884109fcccd23c2d" +SRCREV = "14f4ea59491e40e7f95df9d7307433ef2c249ab5" 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 cfb2ee3e..28428079 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 4e1945bd0867c018d06b5fa9c2dcb60619f260b2 Mon Sep 17 00:00:00 2001 +From ca13ad2d1a5c119fb3f45c805d2f3caaede95a7d 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 @@ -36,10 +36,10 @@ index 47be591..805c81e 100644 + +LIBS += -lxkbcommon diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp -index e35c0f3..45e82ca 100644 +index 7ab8bff..8c36774 100644 --- a/src/compositor/compositor_api/qwaylandkeyboard.cpp +++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp -@@ -349,12 +349,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap) +@@ -334,12 +334,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap) xkb_state = xkb_state_new(keymap); } @@ -52,7 +52,7 @@ index e35c0f3..45e82ca 100644 void QWaylandKeyboardPrivate::createXKBKeymap() { -@@ -384,6 +378,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap() +@@ -369,6 +363,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap() } #endif diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 272bed1d..762e6127 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,14 +37,14 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "ec495c98189f1d849e793108b09b5af0ce2c8984" +SRCREV = "434f3e9a952b5858abc1f0ed1179ea5d2fca6a19" # Patches from https://github.com/meta-qt5/qtwayland/commits/b5.11 -# 5.11.meta-qt5.1 +# 5.11.meta-qt5.2 # From https://bugreports.qt.io/browse/QTBUG-57767 -SRC_URI += " \ - file://0001-fix-build-without-xkbcommon-evdev.patch \ -" +#SRC_URI += " \ +# file://0001-fix-build-without-xkbcommon-evdev.patch \ +#" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch index f7cbad51..17f34052 100644 --- a/recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch +++ b/recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch @@ -1,4 +1,4 @@ -From ded0b78fe690b5c6ddfca08a098e824ed23ae80d Mon Sep 17 00:00:00 2001 +From 882d9b41fd538c3dd4170bdcdb3938f8989d7700 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 1b718a3..8c1de74 100644 +index 73607aa..151d261 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -61,6 +61,8 @@ diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch index 3d5d286d..c5e9ea57 100644 --- a/recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch @@ -1,4 +1,4 @@ -From 3e08f22dbe2ca570bf853b6dfad8831f21ddbe14 Mon Sep 17 00:00:00 2001 +From 42ad6935a99271f9b481423162d9ead15ffa9ec9 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 @@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py -index 43392ef..9ef521f 100755 +index 93c6446..0fe7e67 100755 --- a/chromium/tools/gn/bootstrap/bootstrap.py +++ b/chromium/tools/gn/bootstrap/bootstrap.py -@@ -326,10 +326,10 @@ def write_gn_ninja(path, root_gen_dir, options): +@@ -352,10 +352,10 @@ def write_gn_ninja(path, root_gen_dir, options): ld = os.environ.get('LD', cxx) ar = os.environ.get('AR', 'ar -X64') else: diff --git a/recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch index 061df820..e8cd395f 100644 --- a/recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch +++ b/recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch @@ -1,4 +1,4 @@ -From 695e80ba773eae1d6239828b8b3218ac6584e1e1 Mon Sep 17 00:00:00 2001 +From 1095ff439340980b297eb988f23fceb5d198b18e 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/0002-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-workaround-for-too-long-.rps-file-name.patch index 3e30ac5c..bc066645 100644 --- a/recipes-qt/qt5/qtwebengine/0002-chromium-workaround-for-too-long-.rps-file-name.patch +++ b/recipes-qt/qt5/qtwebengine/0002-chromium-workaround-for-too-long-.rps-file-name.patch @@ -1,4 +1,4 @@ -From 51313e2d2739c9a9ca5e86979e868e9bd80e9bfd Mon Sep 17 00:00:00 2001 +From 95c0c42ca5103adef307fc29b53d8f95b4755baa 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 @@ -18,10 +18,10 @@ Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1 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 eaf1b3d..ddf456e 100644 +index bab07c5..8f889ae 100644 --- a/chromium/tools/gn/ninja_action_target_writer.cc +++ b/chromium/tools/gn/ninja_action_target_writer.cc -@@ -118,9 +118,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() { +@@ -117,9 +117,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; diff --git a/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch index 8cdab4b7..13e0dc9b 100644 --- a/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch @@ -1,4 +1,4 @@ -From afbaa51b52482f71e683389e7565aceb6c59e8a6 Mon Sep 17 00:00:00 2001 +From e0d8fe57a8bbd1c24ae35d93c54ab0c6e58eff20 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 @@ -57,10 +57,10 @@ index dd0d3e3..70161c8 100644 " nm = \"$$which(nm)\" " \ " toolchain_args = { " \ diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri -index daac6fa..d858021 100644 +index 68d64fd..9ab43df 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri -@@ -90,7 +90,7 @@ contains(QT_ARCH, "mips") { +@@ -91,7 +91,7 @@ contains(QT_ARCH, "mips") { host_build { gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" 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 e808eb70..375b01a1 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 5d7080bf2001a022223c4089a199605b5f9a5cce Mon Sep 17 00:00:00 2001 +From 37e7051ef185d7b1a237db725d98f63a155fc95b 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-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 359ee26e..46f1c9ce 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 f3478cde99da29faebbdb3d13a479b50af9804fd Mon Sep 17 00:00:00 2001 +From 2ddd74e630db38b951697c0b020245c0c83b2316 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 @@ -11,7 +11,7 @@ Signed-off-by: Khem Raj 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc -index 0eb5c1f..8af7799 100644 +index 73a52d6..4867198 100644 --- a/chromium/base/process/process_metrics_posix.cc +++ b/chromium/base/process/process_metrics_posix.cc @@ -94,14 +94,14 @@ size_t ProcessMetrics::GetMallocUsage() { @@ -32,18 +32,18 @@ index 0eb5c1f..8af7799 100644 return 0; #endif diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc -index f1cc52a..256138d 100644 +index ffd5191..0c9131e 100644 --- a/chromium/base/trace_event/malloc_dump_provider.cc +++ b/chromium/base/trace_event/malloc_dump_provider.cc -@@ -197,6 +197,7 @@ MallocDumpProvider::~MallocDumpProvider() {} +@@ -197,6 +197,7 @@ MallocDumpProvider::~MallocDumpProvider() = default; // 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; -@@ -316,7 +317,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, + { + base::AutoLock auto_lock(emit_metrics_on_memory_dump_lock_); + if (!emit_metrics_on_memory_dump_) +@@ -322,7 +323,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, pmd->DumpHeapUsage(metrics_by_context, overhead, "malloc"); } tid_dumping_heap_ = kInvalidThreadId; diff --git a/recipes-qt/qt5/qtwebengine/0004-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0004-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch index e4d44f39..f67baea2 100644 --- a/recipes-qt/qt5/qtwebengine/0004-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/0004-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch @@ -1,4 +1,4 @@ -From ac6d09a3bb56dee9fc377f4042b23b209fd0726d Mon Sep 17 00:00:00 2001 +From 84d83fa843e72e2154375c8a002a74dc31ab8aae Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 12 Dec 2017 16:06:14 +0200 Subject: [PATCH] musl: don't use pvalloc as it's not available on musl 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 2af1f3cb..e9324b69 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 660cc2ad6e2c92e0a86948c80f356b754ecd43f5 Mon Sep 17 00:00:00 2001 +From e627afbd990a189d3eaf9992088bd506e306a680 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/0005-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0005-musl-link-against-libexecinfo.patch index 84c1cec3..88d95428 100644 --- a/recipes-qt/qt5/qtwebengine/0005-musl-link-against-libexecinfo.patch +++ b/recipes-qt/qt5/qtwebengine/0005-musl-link-against-libexecinfo.patch @@ -1,4 +1,4 @@ -From 52ef357f629a2c210b3b0fe13cba90fe379afee9 Mon Sep 17 00:00:00 2001 +From acc9fd7805f48fc998f1733db1fd58b05d381582 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 14 Dec 2017 11:28:10 +0200 Subject: [PATCH] musl: link against libexecinfo 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 c07ffa44..6e636311 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 80e2b20ed6aa48b692b7de585c8ea92263c99d72 Mon Sep 17 00:00:00 2001 +From cfd8e1d9c17cc365c5d49d99b47ce8e06e725f86 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 6f578a06..dd2d7a3a 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 671dc6a1d7d507a81d5a53a106d72d6c14f50e13 Mon Sep 17 00:00:00 2001 +From 3bfe9fa1e05ae2faec6dc73895c2bf265ec66d3b 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 1ef7e40a..a9e5e2b1 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 f1c0433093b5511dceb0cf80287d281fd24ac941 Mon Sep 17 00:00:00 2001 +From f9e47fe475eb60c4615215214cea344280e5b26f 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 @@ -10,10 +10,10 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc -index 41adbf8..091971e 100644 +index 4b7de5e..fe56522 100644 --- a/chromium/base/allocator/allocator_shim.cc +++ b/chromium/base/allocator/allocator_shim.cc -@@ -319,7 +319,7 @@ ALWAYS_INLINE void ShimFreeDefiniteSize(void* ptr, size_t size, void* context) { +@@ -302,7 +302,7 @@ ALWAYS_INLINE void ShimFreeDefiniteSize(void* ptr, size_t size, void* context) { // 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. 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 aba7c05c..2d47fd27 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 3789c3d611ee4fd258f85eac9d575af09791585e Mon Sep 17 00:00:00 2001 +From 33fb1fa2f8a846734544db7b21f120f5924f9316 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/0010-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch index 032ff303..5f6dc254 100644 --- a/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch +++ b/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch @@ -1,4 +1,4 @@ -From b4cc182b9cc6b6362cf4039883e4e1953357843a Mon Sep 17 00:00:00 2001 +From ea8b649d60037b08bbb2134f878098c8373a08b7 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 @@ -13,10 +13,10 @@ Signed-off-by: Khem Raj 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 8898f85..28530d5 100644 +index f2e6633..6fe84dd 100644 --- a/chromium/net/dns/dns_config_service_posix.cc +++ b/chromium/net/dns/dns_config_service_posix.cc -@@ -28,6 +28,10 @@ +@@ -27,6 +27,10 @@ #include "net/dns/notify_watcher_mac.h" #include "net/dns/serial_worker.h" diff --git a/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Do-not-define-__sbrk-on-musl.patch index 6223ee5b..57f313c9 100644 --- a/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Do-not-define-__sbrk-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Do-not-define-__sbrk-on-musl.patch @@ -1,4 +1,4 @@ -From e8172c5252dec386fbd95a18f2c59f08307f65c0 Mon Sep 17 00:00:00 2001 +From 567105c9014cbad00aba5bcd172e6aed3e32c509 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 diff --git a/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Adjust-default-pthread-stack-size.patch index cacd623e..a247eb80 100644 --- a/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Adjust-default-pthread-stack-size.patch +++ b/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Adjust-default-pthread-stack-size.patch @@ -1,4 +1,4 @@ -From 6c3233f1eec1a80bc771848af062cc92445b143b Mon Sep 17 00:00:00 2001 +From fdd90ccaebc488bdb68b020a9bc3d89232795559 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 diff --git a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch b/recipes-qt/qt5/qtwebengine/0013-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch index d9c76017..b97045d0 100644 --- a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch +++ b/recipes-qt/qt5/qtwebengine/0013-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch @@ -1,4 +1,4 @@ -From 9624b45166cd5e7976a6ecf99f2545c9cc883986 Mon Sep 17 00:00:00 2001 +From ba501cce8252a22a4baba2d9e524bd7538a079bd 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 @@ -9,7 +9,7 @@ Signed-off-by: Khem Raj 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 eca131f..80a6cec 100644 +index d6ed5e1..b550f89 100644 --- a/chromium/device/serial/serial_io_handler_posix.cc +++ b/chromium/device/serial/serial_io_handler_posix.cc @@ -6,6 +6,7 @@ diff --git a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch index f7880f81..adc2d824 100644 --- a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch +++ b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch @@ -1,4 +1,4 @@ -From d723d506ff8b5e0dd1bb3f2c11805a2ec1f0b712 Mon Sep 17 00:00:00 2001 +From fc03e0f3c36d4d20e00dfbcd02616a467e4b0a15 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 diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 1d1763d0..80928a4d 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -121,10 +121,10 @@ RDEPENDS_${PN}-examples += " \ qtdeclarative-qmlplugins \ " -QT_MODULE_BRANCH_CHROMIUM = "63-based" +QT_MODULE_BRANCH_CHROMIUM = "65-based" # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.11 -# 5.11.meta-qt5.1 +# 5.11.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-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ @@ -136,8 +136,8 @@ SRC_URI_append_libc-musl = "\ file://0005-musl-link-against-libexecinfo.patch \ " -# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/63-based -# 63-based.meta-qt5.1 +# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/65-based +# 65-based.meta-qt5.2 SRC_URI += " \ file://0001-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ file://0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ @@ -158,8 +158,8 @@ SRC_URI_append_libc-musl = "\ file://0014-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "732d09331c1e4efa51501aae9bcd6924eecdd5c3" -SRCREV_chromium = "3fa04d22883e42bd987e4f83d394a1040b410024" +SRCREV_qtwebengine = "b7e5722cce95730004ef6cb9f4aabde5bbd5685d" +SRCREV_chromium = "e173cb17d97aa3c2065189275c85db79eb7d1748" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 1e8719a7..cd55bdd7 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 = "8a549aca7b371722cbf012d85216e4560ef1cf33" +SRCREV = "34ce4b65ba35a487bdb8afa5e59b57cfa3f9b0e0" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index ceecfb0b..f8c24258 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_armv7ve = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" -SRCREV = "cf23a402b97b459309ec32fe49c82a845a3636af" +SRCREV = "bb7dda99936b97cc262f07b25fcb500f8a552c8a" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 8a98f548..b3ce9453 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 = "78a10dad08d1c354f7afb539bd89f0d75a9fe3b1" +SRCREV = "d80236f50559f4fe785fba598a03aaa7f05d37ac" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 2325eb03..399adc35 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "c892ceec1c301f12d5c276e12be0bee8fd7d4cbf" +SRCREV = "e4abf2c6e3de158d3a6eb3c46b5158f741136c9d" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3-54-g00ecf From 4a3318e5b342e19bb1430d89d7fc0784e92be2d0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 19 Apr 2018 06:34:11 +0000 Subject: tufao: fix build with Qt 5.11, don't use qt5_use_modules Signed-off-by: Martin Jansa --- ...txt-fix-build-with-Qt-5.11-don-t-use-qt5_.patch | 91 ++++++++++++++++++++++ recipes-qt/tufao/tufao_1.3.10.bb | 4 +- 2 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 recipes-qt/tufao/tufao/0001-CMakeLists.txt-fix-build-with-Qt-5.11-don-t-use-qt5_.patch (limited to 'recipes-qt') diff --git a/recipes-qt/tufao/tufao/0001-CMakeLists.txt-fix-build-with-Qt-5.11-don-t-use-qt5_.patch b/recipes-qt/tufao/tufao/0001-CMakeLists.txt-fix-build-with-Qt-5.11-don-t-use-qt5_.patch new file mode 100644 index 00000000..50dd7844 --- /dev/null +++ b/recipes-qt/tufao/tufao/0001-CMakeLists.txt-fix-build-with-Qt-5.11-don-t-use-qt5_.patch @@ -0,0 +1,91 @@ +From 85a4a1fcba0d81fbd8c4af3421114360f32c384e Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Thu, 19 Apr 2018 06:31:09 +0000 +Subject: [PATCH] CMakeLists.txt: fix build with Qt 5.11, don't use + qt5_use_modules + +* replace deprecated (and in 5.11 removed) qt5_use_modules macro usage with + the list of libraries in target_link_libraries as suggested in: + https://stackoverflow.com/questions/31172156/what-to-use-instead-of-qt5-use-modules + +Upstream-Status: Submitted https://github.com/vinipsmaker/tufao/pull/91 + +Signed-off-by: Martin Jansa +--- + examples/cmake/hello-cmake/CMakeLists.txt | 3 +-- + examples/cmake/sample_plugin/plugins/CMakeLists.txt | 3 +-- + examples/cmake/sample_plugin/src/CMakeLists.txt | 3 +-- + src/CMakeLists.txt | 2 +- + src/tests/CMakeLists.txt | 3 +-- + 5 files changed, 5 insertions(+), 9 deletions(-) + +diff --git a/examples/cmake/hello-cmake/CMakeLists.txt b/examples/cmake/hello-cmake/CMakeLists.txt +index 1995220..e93c83c 100644 +--- a/examples/cmake/hello-cmake/CMakeLists.txt ++++ b/examples/cmake/hello-cmake/CMakeLists.txt +@@ -13,5 +13,4 @@ find_package(CXX11 REQUIRED) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_FLAGS}") + + add_executable(${PROJECT_NAME} main.cpp) +-qt5_use_modules(${PROJECT_NAME} Core Network) +-target_link_libraries(${PROJECT_NAME} ${TUFAO_LIBRARIES}) ++target_link_libraries(${PROJECT_NAME} ${TUFAO_LIBRARIES} Qt5::Core Qt5::Network) +diff --git a/examples/cmake/sample_plugin/plugins/CMakeLists.txt b/examples/cmake/sample_plugin/plugins/CMakeLists.txt +index 3099dfb..b0ded18 100644 +--- a/examples/cmake/sample_plugin/plugins/CMakeLists.txt ++++ b/examples/cmake/sample_plugin/plugins/CMakeLists.txt +@@ -9,5 +9,4 @@ set(PLUGIN_HEADERS + ) + + add_library(Test SHARED ${PLUGIN_HEADERS} ${PLUGIN_SOURCE}) +-qt5_use_modules(Test Core Network) +-target_link_libraries(Test ${TUFAO_LIBRARIES}) ++target_link_libraries(Test ${TUFAO_LIBRARIES} Qt5::Test Qt5::Core Qt5::Network) +diff --git a/examples/cmake/sample_plugin/src/CMakeLists.txt b/examples/cmake/sample_plugin/src/CMakeLists.txt +index 379440f..fe97a0f 100644 +--- a/examples/cmake/sample_plugin/src/CMakeLists.txt ++++ b/examples/cmake/sample_plugin/src/CMakeLists.txt +@@ -9,5 +9,4 @@ set(${PROJECT_NAME}_HEADERS + ) + + add_executable(${PROJECT_NAME} ${${PROJECT_NAME}_HEADERS} ${${PROJECT_NAME}_SOURCE}) +-qt5_use_modules(${PROJECT_NAME} Core Network) +-target_link_libraries(${PROJECT_NAME} ${TUFAO_LIBRARIES} ${Test}) ++target_link_libraries(${PROJECT_NAME} ${TUFAO_LIBRARIES} ${Test} Qt5::Core Qt5::Network) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 3b10a35..91e619e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -36,7 +36,7 @@ endif() + + add_library("${TUFAO_LIBRARY}" SHARED ${tufao_SRC}) + +-qt5_use_modules("${TUFAO_LIBRARY}" Core Network) ++target_link_libraries("${TUFAO_LIBRARY}" Qt5::Core Qt5::Network) + + set_target_properties( + "${TUFAO_LIBRARY}" +diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt +index cc2fef7..2ec9fa9 100644 +--- a/src/tests/CMakeLists.txt ++++ b/src/tests/CMakeLists.txt +@@ -20,7 +20,6 @@ set(tests + ) + + macro(setup_test_target target) +- qt5_use_modules("${target}" Core Network Test) + set_target_properties( + "${target}" + PROPERTIES +@@ -43,7 +42,7 @@ macro(setup_test_target target) + endif() + + +- target_link_libraries("${target}" "${TUFAO_LIBRARY}") ++target_link_libraries("${target}" "${TUFAO_LIBRARY}" Qt5::Core Qt5::Network Qt5::Test) + + add_test(NAME "${target}" + WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src" +-- +2.17.0 + diff --git a/recipes-qt/tufao/tufao_1.3.10.bb b/recipes-qt/tufao/tufao_1.3.10.bb index d4b62e2b..719269f1 100644 --- a/recipes-qt/tufao/tufao_1.3.10.bb +++ b/recipes-qt/tufao/tufao_1.3.10.bb @@ -5,7 +5,9 @@ DEPENDS = "qtbase" SRCREV = "ad505c32d0ba14c3c616de8ba4c7eb79396c20a6" SRC_URI = "git://github.com/vinipsmaker/tufao.git;protocol=http;branch=1.x \ - file://build-Fix-mkspecs-and-CMake-module-install-directori.patch" + file://build-Fix-mkspecs-and-CMake-module-install-directori.patch \ + file://0001-CMakeLists.txt-fix-build-with-Qt-5.11-don-t-use-qt5_.patch \ +" # This includes bugfixes from 1.x branch PV_append = "+${SRCPV}" -- cgit v1.2.3-54-g00ecf From bc20e3dcd0176529740beb59ccf1f170b9f828a8 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 26 Feb 2018 17:41:06 +0000 Subject: qt5-creator: upgrade to 4.5.1 * old 3.5.1 isn't compatible with Qt 5.11 qt-creator-opensource-src-3.5.1/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp:891:23: error: invalid use of incomplete type 'class QStyle' | QIcon icon(style()->standardIcon(QStyle::SP_DockWidgetCloseButton)); | ^~ Signed-off-by: Martin Jansa --- ...t-creator-to-build-on-arm-aarch32-and-aar.patch | 6 +- ...-Fix-compilation-with-QT_NO_ACCESSIBILITY.patch | 35 -------- .../0002-Link-with-libexecinfo-on-musl.patch | 20 +++++ .../0003-Qmlpuppet-add-missing-includes.patch | 38 --------- .../0004-Link-with-libexecinfo-on-musl.patch | 30 ------- recipes-qt/qt5/qt5-creator_3.5.1.bb | 93 ---------------------- recipes-qt/qt5/qt5-creator_4.5.1.bb | 81 +++++++++++++++++++ 7 files changed, 104 insertions(+), 199 deletions(-) delete mode 100644 recipes-qt/qt5/qt5-creator/0002-Fix-compilation-with-QT_NO_ACCESSIBILITY.patch create mode 100644 recipes-qt/qt5/qt5-creator/0002-Link-with-libexecinfo-on-musl.patch delete mode 100644 recipes-qt/qt5/qt5-creator/0003-Qmlpuppet-add-missing-includes.patch delete mode 100644 recipes-qt/qt5/qt5-creator/0004-Link-with-libexecinfo-on-musl.patch delete mode 100644 recipes-qt/qt5/qt5-creator_3.5.1.bb create mode 100644 recipes-qt/qt5/qt5-creator_4.5.1.bb (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch b/recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch index c4ee34bf..28dc4755 100644 --- a/recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch +++ b/recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch @@ -1,4 +1,4 @@ -From 056bc88a15df06443a4a6bdea2b1ead045f89bf6 Mon Sep 17 00:00:00 2001 +From 231e0cf0c764d3b63cd5ec788ac0ee901b47fc8e Mon Sep 17 00:00:00 2001 From: Greg Nietsky Date: Tue, 4 Mar 2014 11:33:40 +0200 Subject: [PATCH] Fix: Allow qt-creator to build on arm aarch32 and aarch64 @@ -14,7 +14,7 @@ Change-Id: Iddea28f21c9fa1afd2fdd5d16a44e6c96a516a7a 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/libs/3rdparty/botan/botan.cpp b/src/libs/3rdparty/botan/botan.cpp -index e6a5f22..7b625ac 100644 +index 87736d5..2e950d8 100644 --- a/src/libs/3rdparty/botan/botan.cpp +++ b/src/libs/3rdparty/botan/botan.cpp @@ -1101,6 +1101,8 @@ class Montgomery_Exponentiator : public Modular_Exponentiator @@ -76,7 +76,7 @@ index e6a5f22..7b625ac 100644 * Helper Macros for x86 Assembly */ diff --git a/src/libs/3rdparty/botan/botan.h b/src/libs/3rdparty/botan/botan.h -index 2caa4a3..39b8079 100644 +index d7b90cc..26ca8ac 100644 --- a/src/libs/3rdparty/botan/botan.h +++ b/src/libs/3rdparty/botan/botan.h @@ -85,7 +85,9 @@ diff --git a/recipes-qt/qt5/qt5-creator/0002-Fix-compilation-with-QT_NO_ACCESSIBILITY.patch b/recipes-qt/qt5/qt5-creator/0002-Fix-compilation-with-QT_NO_ACCESSIBILITY.patch deleted file mode 100644 index 8d953c99..00000000 --- a/recipes-qt/qt5/qt5-creator/0002-Fix-compilation-with-QT_NO_ACCESSIBILITY.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fbae8e85e74976b79308c203d38839b364757302 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); - diff --git a/recipes-qt/qt5/qt5-creator/0002-Link-with-libexecinfo-on-musl.patch b/recipes-qt/qt5/qt5-creator/0002-Link-with-libexecinfo-on-musl.patch new file mode 100644 index 00000000..40e277fe --- /dev/null +++ b/recipes-qt/qt5/qt5-creator/0002-Link-with-libexecinfo-on-musl.patch @@ -0,0 +1,20 @@ +From a30f4335d49516eb4654111af5bf073b633f7336 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 16 Jan 2018 13:26:57 +0000 +Subject: [PATCH] Link with libexecinfo on musl + +Signed-off-by: Khem Raj +Signed-off-by: Martin Jansa +--- + src/plugins/debugger/debugger.pro | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro +index f5a34aa..4a1359d 100644 +--- a/src/plugins/debugger/debugger.pro ++++ b/src/plugins/debugger/debugger.pro +@@ -141,3 +141,4 @@ include(console/console.pri) + include(analyzer/analyzer.pri) + + include(shared/shared.pri) ++LIBS *= -lexecinfo diff --git a/recipes-qt/qt5/qt5-creator/0003-Qmlpuppet-add-missing-includes.patch b/recipes-qt/qt5/qt5-creator/0003-Qmlpuppet-add-missing-includes.patch deleted file mode 100644 index e64b6d9a..00000000 --- a/recipes-qt/qt5/qt5-creator/0003-Qmlpuppet-add-missing-includes.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 896624d715e20e658344ac85db91cd55d25e7211 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 diff --git a/recipes-qt/qt5/qt5-creator/0004-Link-with-libexecinfo-on-musl.patch b/recipes-qt/qt5/qt5-creator/0004-Link-with-libexecinfo-on-musl.patch deleted file mode 100644 index 59687e55..00000000 --- a/recipes-qt/qt5/qt5-creator/0004-Link-with-libexecinfo-on-musl.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7fb65b82d247123c7fdb61436183f1d76067b66b Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 16 Jan 2018 13:26:57 +0000 -Subject: [PATCH] Link with libexecinfo on musl - -Signed-off-by: Khem Raj -Signed-off-by: Martin Jansa ---- - src/plugins/debugger/debugger.pro | 1 + - src/plugins/qmldesigner/config.pri | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro -index c40bd63..96ab542 100644 ---- a/src/plugins/debugger/debugger.pro -+++ b/src/plugins/debugger/debugger.pro -@@ -148,3 +148,4 @@ include(qml/qml.pri) - include(namedemangler/namedemangler.pri) - - include(shared/shared.pri) -+LIBS *= -lexecinfo -diff --git a/src/plugins/qmldesigner/config.pri b/src/plugins/qmldesigner/config.pri -index 1b559b2..b485b63 100644 ---- a/src/plugins/qmldesigner/config.pri -+++ b/src/plugins/qmldesigner/config.pri -@@ -9,3 +9,4 @@ equals(TMP_BAUHAUS_NO_OUTPUT, true):DEFINES += QT_NO_DEBUG_OUTPUT \ - 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 deleted file mode 100644 index fe9cb414..00000000 --- a/recipes-qt/qt5/qt5-creator_3.5.1.bb +++ /dev/null @@ -1,93 +0,0 @@ -SUMMARY = "Qt Creator is a new cross-platform Qt IDE" - -# Note: -# The toolchain auto detection does not work completely yet. To compile/debug -# open menu 'Tools/Options and select 'Build & Run'. In tab 'Kits' select 'Desktop' -# 'Compiler/Manage...' and add local gcc'. At 'Debugger' select -# 'System GDB at /usr/bin/gdb. - -HOMEPAGE = "https://qt-project.org/" -LICENSE = "LGPLv2.1 | GPLv3" -LIC_FILES_CHKSUM = " \ - file://LGPL_EXCEPTION.TXT;md5=f4748b0d1a72c5c8fb5dab2dd1f7fa46 \ - file://LICENSE.LGPLv21;md5=825920de5f6db2eeb1bebe625476346d \ - file://LICENSE.LGPLv3;md5=0786418af032b9e608909874f334a2d1 \ -" - -inherit qmake5 - -DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg qtquick1" -DEPENDS_append_libc-musl = " libexecinfo" - -# Patches from https://github.com/meta-qt5/qtcreator/commits/b5.3.1 -# 5.3.1.meta-qt5.1 -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://0002-Fix-compilation-with-QT_NO_ACCESSIBILITY.patch \ - file://0003-Qmlpuppet-add-missing-includes.patch \ - file://qtcreator.desktop.in \ -" - -SRC_URI_append_libc-musl = " file://0004-Link-with-libexecinfo-on-musl.patch" - - -SRC_URI[md5sum] = "77aef7df837eba07c7ce6037ee504c05" -SRC_URI[sha256sum] = "5925ac818a08be919094e0f28fb4c5d8896765e0975d54d353e4c50f13d63e65" - -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 - sed -i 's:${STAGING_BINDIR}.*/qdoc:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdoc:g' ${B}/Makefile - - # see qtbase-native.inc - # sed -i 's:QT_INSTALL_DOCS=${docdir}:QT_INSTALL_DOCS=${STAGING_DATADIR_NATIVE}${QT_DIR_NAME}/doc:g' ${B}/Makefile -} - -do_compile_append() { - # build docs - #oe_runmake docs_online -} - -do_install() { - oe_runmake install INSTALL_ROOT=${D}${prefix} - oe_runmake install_inst_qch_docs INSTALL_ROOT=${D}${prefix} - # install desktop and ensure that qt-creator finds qmake - install -d ${D}${datadir}/applications - install -m 0644 ${WORKDIR}/qtcreator.desktop.in ${D}${datadir}/applications/qtcreator.desktop - sed -i 's:@QT5_QMAKE@:${OE_QMAKE_PATH_QT_BINS}:g' ${D}${datadir}/applications/qtcreator.desktop -} - -FILES_${PN} += " \ - ${datadir}/qtcreator \ - ${datadir}/icons \ - ${libdir}${QT_DIR_NAME}/qtcreator \ -" -FILES_${PN}-dbg += " \ - ${libdir}${QT_DIR_NAME}/qtcreator/.debug \ - ${libdir}${QT_DIR_NAME}/qtcreator/plugins/.debug \ - ${libdir}${QT_DIR_NAME}/qtcreator/plugins/qmldesigner/.debug \ - ${libdir}${QT_DIR_NAME}/qtcreator/plugins/qbs/plugins/.debug \ -" - -FILES_${PN}-dev += " \ - ${libdir}${QT_DIR_NAME}/qtcreator/*${SOLIBSDEV} \ -" - -RDEPENDS_${PN} += "perl" -RCONFLICTS_${PN} = "qt-creator" - -# To give best user experience out of the box.. -RRECOMMENDS_${PN} += " \ - packagegroup-qt5-toolchain-target \ - binutils \ - ccache \ - make \ - gcc-symlinks g++-symlinks cpp-symlinks \ - gdb \ -" diff --git a/recipes-qt/qt5/qt5-creator_4.5.1.bb b/recipes-qt/qt5/qt5-creator_4.5.1.bb new file mode 100644 index 00000000..e97e591e --- /dev/null +++ b/recipes-qt/qt5/qt5-creator_4.5.1.bb @@ -0,0 +1,81 @@ +SUMMARY = "Qt Creator is a new cross-platform Qt IDE" + +# Note: +# The toolchain auto detection does not work completely yet. To compile/debug +# open menu 'Tools/Options and select 'Build & Run'. In tab 'Kits' select 'Desktop' +# 'Compiler/Manage...' and add local gcc'. At 'Debugger' select +# 'System GDB at /usr/bin/gdb. + +HOMEPAGE = "https://qt-project.org/" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = " \ + file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ +" + +inherit qmake5 + +DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg qtquick1" +DEPENDS_append_libc-musl = " libexecinfo" + +# Patches from https://github.com/meta-qt5/qtcreator/commits/b5.4.1 +# 5.4.1.meta-qt5.1 +SRC_URI = " \ + http://download.qt.io/official_releases/qtcreator/4.5/${PV}/qt-creator-opensource-src-${PV}.tar.gz \ + file://0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch \ + file://qtcreator.desktop.in \ +" +SRC_URI_append_libc-musl = " file://0002-Link-with-libexecinfo-on-musl.patch" + +SRC_URI[md5sum] = "bd7fdbcdfa84df1171fb28174353e57f" +SRC_URI[sha256sum] = "5fdfc8f05694e37162f208616627262c9971749d6958d8881d62933b3b53e909" + +S = "${WORKDIR}/qt-creator-opensource-src-${PV}" + +EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}${QT_DIR_NAME}" + +do_configure_append() { + # Find native tools + sed -i 's:${STAGING_BINDIR}.*/qdoc:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdoc:g' ${B}/Makefile +} + +do_install() { + oe_runmake install INSTALL_ROOT=${D}${prefix} + oe_runmake install_inst_qch_docs INSTALL_ROOT=${D}${prefix} + # install desktop and ensure that qt-creator finds qmake + install -d ${D}${datadir}/applications + install -m 0644 ${WORKDIR}/qtcreator.desktop.in ${D}${datadir}/applications/qtcreator.desktop + sed -i 's:@QT5_QMAKE@:${OE_QMAKE_PATH_QT_BINS}:g' ${D}${datadir}/applications/qtcreator.desktop +} + +FILES_${PN} += " \ + ${datadir}/qtcreator \ + ${datadir}/metainfo \ + ${datadir}/icons \ + ${libdir}${QT_DIR_NAME}/qtcreator \ +" +FILES_${PN}-dbg += " \ + ${libdir}${QT_DIR_NAME}/qtcreator/.debug \ + ${libdir}${QT_DIR_NAME}/qtcreator/plugins/.debug \ + ${libdir}${QT_DIR_NAME}/qtcreator/plugins/qmldesigner/.debug \ + ${libdir}${QT_DIR_NAME}/qtcreator/plugins/qbs/plugins/.debug \ +" + +FILES_${PN}-dev += " \ + ${libdir}${QT_DIR_NAME}/qtcreator/*${SOLIBSDEV} \ +" + +RDEPENDS_${PN} += "perl python" +RCONFLICTS_${PN} = "qt-creator" + +# To give best user experience out of the box.. +RRECOMMENDS_${PN} += " \ + packagegroup-qt5-toolchain-target \ + binutils \ + ccache \ + make \ + gcc-symlinks g++-symlinks cpp-symlinks \ + gdb \ +" + +# ERROR: qt5-creator-4.5.1-r0 do_package_qa: QA Issue: No GNU_HASH in the elf binary: '/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qt5-creator/4.5.1-r0/packages-split/qt5-creator/usr/lib/qt5/qtcreator/libqbscore.so.1.10.1' +INSANE_SKIP_${PN} += "ldflags" -- cgit v1.2.3-54-g00ecf