diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-06-26 12:42:33 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-06-27 12:03:36 +0000 |
| commit | 6765cbe6a255771cc1d06e5d3878c7e705769fc3 (patch) | |
| tree | 377c10e198c33bb5ffa509f24748891a7e341a02 | |
| parent | b84881444814a361fcc17e7eb34407fb175541da (diff) | |
| parent | 40054db1de152d85c22aefdae50b136ca56967c5 (diff) | |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11
* qtyocto/upstream/master:
40054db qt5: qtbase: Upgrade Double-Conversion
dd1ce3c README: Rework to start using GitHub for development
ef5f5d9 qt5: upgrade to 5.11.1
820f3ef qt5: add common PACKAGECONFIG for QtQuickCompiler
e199d80 python-pyqt5: update recipe to 5.10.1
65db89e qtbase: don't pass empty filename to function
3b27896 nativesdk-qtbase: add quotes to CC and CXX in environment file
a36cc5f libvcard: add recipe
1ac92b6 qtbase: Add packageconfigs for renameat2 and getentropy use
557aabd qttranslations: remove qtquick1 translation package
00aafa0 qt5-creator: Remove qtquick1 dependency
731334a qtwebengine: fix build with plugins as well as ozone enabled
70ce980 qtwebengine: add -fpermissive
33f58ff qtwebengine: fix build with gcc8, part II
267a38f qtwebengine: fix build with gcc8
7193a7f qtquick1: remove recipe and all references
29445f6 qtwebkit: do not skip build - use cmake as build system
dde9b55 qt5: refresh the patches and update them on meta-qt5 repositories
e0a4e23 qt5: Update to Qt 5.11.0
73f99f2 gstreamer1.0-plugins-{good,bad}: move the qt5 PACKAGECONFIG from bad to good bbappend
Change-Id: Ib58d0e103bda0b58338989c00f1fa80bd699534c
65 files changed, 710 insertions, 298 deletions
diff --git a/README b/README deleted file mode 100644 index 9817851b..00000000 --- a/README +++ /dev/null @@ -1,33 +0,0 @@ -This layer depends on: - -URI: git://github.com/openembedded/oe-core.git -branch: master -revision: HEAD - -When building stuff like qtdeclarative, qtquick, qtwebkit, make sure that -you have required PACKAGECONFIG options enabled in qtbase build, see qtbase.inc -for detail. - -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-qt5]' in the subject' - -When sending single patches, please using something like: - -git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-qt5][PATCH' - -Change option '-1' to '-n' for n number of patches in series - -You are encouraged to fork the mirror on github[1] to share your -patches. This is preferred for patch sets consisting of more than one -patch. Other services like gitlab, repo.or.cz or self hosted setups -are of course accepted as well, 'git fetch <remote>' works the same on -all of them. We recommend github because it is free, easy to use, has -been proven to be reliable and has a really good web GUI. - -1. https://github.com/meta-qt5/meta-qt5/ - -meta-qt5 has Yocto Project Compatible status since 2013: -https://www.yoctoproject.org/product/meta-qt5 - -Main layer maintainers: - Martin 'JaMa' Jansa <martin.jansa@gmail.com> - Otavio Salvador <otavio@ossystems.com.br> diff --git a/README.md b/README.md new file mode 100644 index 00000000..fe943211 --- /dev/null +++ b/README.md @@ -0,0 +1,32 @@ +Qt5 OpenEmbedded/Yocto Project layer +==================================== + +This layer depends on: + +URI: https://github.com/openembedded/openembedded-core +branch: master +revision: HEAD + +When building stuff like `qtdeclarative`, `qtquick`, `qtwebkit`, make +sure that you have required `PACKAGECONFIG` options enabled in qtbase +build, see `qtbase` recipe for detail. + + +Contributing +------------ + +Please submit any patches against the `meta-qt5` layer by using the +GitHub pull-request feature. Fork the repo, make a branch, do the +work, rebase from upstream, create the pull request, yada-yada. + +Maintainers +----------- + +- Martin 'JaMa' Jansa <martin.jansa@gmail.com> +- Otavio Salvador <otavio@ossystems.com.br> + +Yocto Project Compatible +------------------------ + +meta-qt5 has Yocto Project Compatible status since 2013: +https://www.yoctoproject.org/product/meta-qt5 diff --git a/lib/recipetool/create_qt5.py b/lib/recipetool/create_qt5.py index 51708b40..3ac991fb 100644 --- a/lib/recipetool/create_qt5.py +++ b/lib/recipetool/create_qt5.py @@ -79,7 +79,6 @@ class Qmake5RecipeHandler(RecipeHandler): 'core': 'qtbase', 'gui': 'qtbase', 'dbus': 'qtbase', - 'declarative': 'qtquick1', 'designer': 'qttools', 'help': 'qttools', 'multimedia': 'qtmultimedia', diff --git a/recipes-connectivity/libvcard/libvcard_git.bb b/recipes-connectivity/libvcard/libvcard_git.bb new file mode 100644 index 00000000..58189ede --- /dev/null +++ b/recipes-connectivity/libvcard/libvcard_git.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Qt vCard library" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f94eaed54ffa1718d593504bae740faf" + +DEPENDS += "qtbase" + +SRCREV = "4250e2468552ea01954244a2d9cd5d2b44b00042" +SRC_URI = "git://github.com/pol51/libvcard.git;protocol=https" + +PV = "1.0+gitr${SRCPV}" + +S = "${WORKDIR}/git" + +inherit cmake_qt5 diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend index b42338ab..b42338ab 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend diff --git a/recipes-python/pyqt5/files/0001-qtabbar.sip-fix-build-with-accessibility-disabled.patch b/recipes-python/pyqt5/files/0001-qtabbar.sip-fix-build-with-accessibility-disabled.patch deleted file mode 100644 index 7e1c7bf4..00000000 --- a/recipes-python/pyqt5/files/0001-qtabbar.sip-fix-build-with-accessibility-disabled.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8a2f852417414e19d060da66cd7c5cba76e43c7d Mon Sep 17 00:00:00 2001 -From: Diego Rondini <diego.rondini@kynetics.com> -Date: Wed, 19 Jul 2017 14:17:51 +0200 -Subject: [PATCH] qtabbar.sip: fix build with accessibility disabled - -Upstream-Status: Submitted - -Signed-off-by: Diego Rondini <diego.rondini@kynetics.com> ---- - sip/QtWidgets/qtabbar.sip | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/sip/QtWidgets/qtabbar.sip b/sip/QtWidgets/qtabbar.sip -index ffe2d3b..80ad816 100644 ---- a/sip/QtWidgets/qtabbar.sip -+++ b/sip/QtWidgets/qtabbar.sip -@@ -166,11 +166,15 @@ protected: - - public: - %If (Qt_5_8_0 -) -+%If (PyQt_Accessibility) - QString accessibleTabName(int index) const; - %End -+%End - %If (Qt_5_8_0 -) -+%If (PyQt_Accessibility) - void setAccessibleTabName(int index, const QString &name); - %End -+%End - - private: - QTabBar(const QTabBar &); --- -2.7.4 - diff --git a/recipes-python/pyqt5/files/fix-sm.patch b/recipes-python/pyqt5/files/fix-sm.patch deleted file mode 100644 index f2936a23..00000000 --- a/recipes-python/pyqt5/files/fix-sm.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- PyQt5_gpl-5.8.2/sip/QtGui/qguiapplication.sip.orig 2017-05-13 13:28:42.523392315 -0400 -+++ PyQt5_gpl-5.8.2/sip/QtGui/qguiapplication.sip 2017-05-13 13:30:08.081207211 -0400 -@@ -270,12 +270,14 @@ - %End - - public: -+%If (PyQt_SessionManager) - %If (Qt_5_6_0 -) - static bool isFallbackSessionManagementEnabled(); - %End - %If (Qt_5_6_0 -) - static void setFallbackSessionManagementEnabled(bool); - %End -+%End - - signals: - %If (Qt_5_6_0 -) diff --git a/recipes-python/pyqt5/python-pyqt5_5.8.2.bb b/recipes-python/pyqt5/python-pyqt5_5.10.1.bb index fdfa1205..9a0f8499 100644 --- a/recipes-python/pyqt5/python-pyqt5_5.8.2.bb +++ b/recipes-python/pyqt5/python-pyqt5_5.10.1.bb @@ -10,11 +10,9 @@ DEPENDS = "sip sip-native qtbase python" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/pyqt/PyQt5_gpl-${PV}.tar.gz \ - file://fix-sm.patch \ - file://0001-qtabbar.sip-fix-build-with-accessibility-disabled.patch \ " -SRC_URI[md5sum] = "c3048e9d242f3e72fd393630da1d971a" -SRC_URI[sha256sum] = "ebd70515b30bbd6098fee29e6271a6696b1183c5530ee30e6ba9aaab195536e8" +SRC_URI[md5sum] = "be36c2abaffc9daa8b993f1ca982968f" +SRC_URI[sha256sum] = "9932e971e825ece4ea08f84ad95017837fa8f3f29c6b0496985fa1093661e9ef" S = "${WORKDIR}/PyQt5_gpl-${PV}" @@ -63,7 +61,7 @@ do_install() { oe_runmake install } -RDEPENDS_${PN} = "python-core python-sip" +RDEPENDS_${PN} = "python-core python-sip qtbase" FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/" FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*/.debug/" diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb index f8662ecb..8219aeb2 100755 --- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb @@ -9,11 +9,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" # Requires Ruby to work USE_RUBY = " \ - qtquick1-dev \ - qtquick1-mkspecs \ - qtquick1-plugins \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtquick1-qmlplugins', '', d)} \ - qttranslations-qtquick1 \ qtwebkit-dev \ " diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 6985058a..595e5858 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -24,7 +24,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.2 +# 5.11.meta-qt5-shared.6 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -38,13 +38,14 @@ SRC_URI += "\ file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ + file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native -# 5.11.meta-qt5-native.2 +# 5.11.meta-qt5-native.6 SRC_URI += " \ - file://0013-Always-build-uic-and-qvkgen.patch \ + file://0014-Always-build-uic-and-qvkgen.patch \ " # CMake's toolchain configuration of nativesdk-qtbase 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 61d0e4a1..88363219 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 0fc2916634a213f38b81ae74160136cf384f6166 Mon Sep 17 00:00:00 2001 +From 15ba3204df65645f604a23f71f819a392ff1e4b7 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@theqtcompany.com> Date: Wed, 10 Feb 2016 09:02:09 +0200 Subject: [PATCH] Allow a tools-only build @@ -40,7 +40,7 @@ index 8ba2d9a41..e973d93dd 100644 } else { include(assimp.pri) diff --git a/tools/tools.pro b/tools/tools.pro -index 64f2b9f..d108e7f 100644 +index 64f2b9fc7..d108e7fa7 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,4 +1,4 @@ diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index bf5b0129..bd87dcb2 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -12,7 +12,7 @@ DEPENDS += "qtbase" DEPENDS_class-target += "qtdeclarative qt3d-native" # Patches from https://github.com/meta-qt5/qt3d/commits/b5.11 -# 5.11.meta-qt5.2 +# 5.11.meta-qt5.4 SRC_URI += " \ file://0001-Allow-a-tools-only-build.patch \ " diff --git a/recipes-qt/qt5/qt5-creator_4.5.1.bb b/recipes-qt/qt5/qt5-creator_4.5.1.bb index e97e591e..c56fcd10 100644 --- a/recipes-qt/qt5/qt5-creator_4.5.1.bb +++ b/recipes-qt/qt5/qt5-creator_4.5.1.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ inherit qmake5 -DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg qtquick1" +DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg" DEPENDS_append_libc-musl = " libexecinfo" # Patches from https://github.com/meta-qt5/qtcreator/commits/b5.4.1 diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 50845f1e..819f4473 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -19,7 +19,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.2 +# 5.11.meta-qt5-shared.6 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -33,18 +33,19 @@ SRC_URI += "\ file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ + file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native -# 5.11.meta-qt5-native.2 +# 5.11.meta-qt5-native.6 SRC_URI += " \ - file://0013-Always-build-uic-and-qvkgen.patch \ + file://0014-Always-build-uic-and-qvkgen.patch \ " # only for qtbase-native SRC_URI += " \ - file://0014-Bootstrap-without-linkat-feature.patch \ + file://0015-Bootstrap-without-linkat-feature.patch \ " CLEANBROKEN = "1" 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 dbb0b9dc..8f7afb6d 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 6a84c4a36742716b5db715c2538901f37ff8b1c5 Mon Sep 17 00:00:00 2001 +From bb416ea80d421c53012e13280d68bdcefc815b8f Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH] Add linux-oe-g++ platform @@ -21,16 +21,16 @@ Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- configure | 2 +- - mkspecs/features/configure.prf | 4 ++-- + mkspecs/features/configure.prf | 4 +-- mkspecs/features/qt_functions.prf | 2 +- - mkspecs/linux-oe-g++/qmake.conf | 42 ++++++++++++++++++++++++++++++++++++ + mkspecs/linux-oe-g++/qmake.conf | 42 ++++++++++++++++++++++++++++ mkspecs/linux-oe-g++/qplatformdefs.h | 1 + 5 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 mkspecs/linux-oe-g++/qmake.conf create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index 2830a1b..6445dc2 100755 +index 2830a1b189..6445dc2d5a 100755 --- a/configure +++ b/configure @@ -712,7 +712,7 @@ fi @@ -43,7 +43,7 @@ index 2830a1b..6445dc2 100755 # build qmake diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index 934a18a..0f5b1b6 100644 +index 934a18a924..0f5b1b6333 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -46,14 +46,14 @@ defineTest(qtCompileTest) { @@ -64,7 +64,7 @@ index 934a18a..0f5b1b6 100644 msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 1903e50..c093dd4 100644 +index 1903e509c8..c093dd4592 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -69,7 +69,7 @@ defineTest(qtHaveModule) { @@ -78,7 +78,7 @@ index 1903e50..c093dd4 100644 cmd = perl -w $$system_path($${cmd}.pl) diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 -index 0000000..30d31ed +index 0000000000..30d31ed16d --- /dev/null +++ b/mkspecs/linux-oe-g++/qmake.conf @@ -0,0 +1,42 @@ @@ -126,7 +126,7 @@ index 0000000..30d31ed +load(qt_config) diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h new file mode 100644 -index 0000000..5d22fb4 +index 0000000000..5d22fb4101 --- /dev/null +++ b/mkspecs/linux-oe-g++/qplatformdefs.h @@ -0,0 +1 @@ diff --git a/recipes-qt/qt5/qtbase/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 5c23052b..3a219c1f 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 7c0c897d0d534bfc9183f9da1d9b280e709b0917 Mon Sep 17 00:00:00 2001 +From 4941648d4b26d625e86273d992697129209d8256 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> 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 e0652fd..215f435 100644 +index e0652fdcf9..215f4357f8 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) @@ -50,7 +50,7 @@ index e0652fd..215f435 100644 _qt5_Core_check_file_exists(${imported_location}) diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in -index 1d94715..301af8f 100644 +index 1d947159e2..301af8f1b2 100644 --- a/src/dbus/Qt5DBusConfigExtras.cmake.in +++ b/src/dbus/Qt5DBusConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) @@ -72,7 +72,7 @@ index 1d94715..301af8f 100644 _qt5_DBus_check_file_exists(${imported_location}) diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -index 99d87e2..5621dc0 100644 +index 99d87e2e46..5621dc0fae 100644 --- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in +++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic) diff --git a/recipes-qt/qt5/qtbase/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 83011d6c..2450f7ef 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 d52e2787db887056eed59b9020f1ca625cffa2e4 Mon Sep 17 00:00:00 2001 +From 1fce658543816f654c6b4abcf02b6190189ba3b7 Mon Sep 17 00:00:00 2001 From: Holger Freyther <zecke@selfish.org> Date: Wed, 26 Sep 2012 17:22:30 +0200 Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the @@ -13,13 +13,14 @@ Upstream-Status: Inappropriate [embedded specific] qmake from sstate and replacing all configured paths in it with qt.conf from environment). +Change-Id: I41595c6ce7514e8f197d0a19a1308c9460037d1b Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- src/corelib/global/qlibraryinfo.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 422d08f..a59df4f 100644 +index 422d08f32c..cb092301fa 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 e806fabb..141923df 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 eb7df134dff6991cf9d84ea0c8313dfa1f2cc4dc Mon Sep 17 00:00:00 2001 +From 0dbc0d39c274f35415122d0b4d001da50d8e5355 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko <denys@ti.com> Date: Tue, 25 Aug 2015 10:05:15 -0400 Subject: [PATCH] configure: bump path length from 256 to 512 characters @@ -15,7 +15,7 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com> 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.pri b/configure.pri -index 0512ef0..8a53223 100644 +index 0512ef0144..8a53223a4e 100644 --- a/configure.pri +++ b/configure.pri @@ -817,10 +817,10 @@ defineTest(qtConfOutput_preparePaths) { diff --git a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch index 88967e78..24f966f5 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 a1799db5d1b2e2e7d47c37872e887dfab4b4974a Mon Sep 17 00:00:00 2001 +From ffc59fc3f976db9008859857c2db1579b7784b57 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Mon, 24 Oct 2016 09:45:18 +0300 Subject: [PATCH] Disable all unknown features instead of erroring out @@ -10,7 +10,7 @@ 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 6e29eaa..de8c8d2 100644 +index 1211129283..f2c5b3a5a4 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -1265,7 +1265,8 @@ defineReplace(qtConfEvaluateSingleExpression) { 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 3d5a7323..537ff3f6 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 2df6d12cfef0769f7801410cad012dd20d0497e2 Mon Sep 17 00:00:00 2001 +From 78d36c322ca9d8d90a419b15febef4c11bf9066b Mon Sep 17 00:00:00 2001 From: Pascal Bach <pascal.bach@siemens.com> Date: Wed, 11 May 2016 15:20:41 +0200 Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS @@ -30,7 +30,7 @@ Signed-off-by: Pascal Bach <pascal.bach@siemens.com> 2 files changed, 10 insertions(+) diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 27f4c27..01f68a5 100644 +index 27f4c277d6..01f68a569d 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) @@ -46,7 +46,7 @@ index 27f4c27..01f68a5 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 6b6544f..d317912 100644 +index 6b6544f932..d317912632 100644 --- a/src/corelib/Qt5Config.cmake.in +++ b/src/corelib/Qt5Config.cmake.in @@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) diff --git a/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch index 57ad3f87..9b449d36 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 6407bc53339920c16bf384145e4dd95ed0c325d0 Mon Sep 17 00:00:00 2001 +From ee84c3b9cc8add6ee0c1a49c167b51f8d37230ae Mon Sep 17 00:00:00 2001 From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Date: Wed, 7 Jun 2017 21:00:49 +0900 Subject: [PATCH] Delete qlonglong and qulonglong @@ -9,7 +9,7 @@ Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> 1 file changed, 2 deletions(-) diff --git a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro -index 09458bd..59a120e 100644 +index 09458bd9c3..59a120eb26 100644 --- a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro +++ b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro @@ -5,10 +5,8 @@ SUBDIRS=\ 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 1262ffe4..77b11a4b 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 9f9eac8d12531fe6ec3aa77f719c0b8ca7cfdd75 Mon Sep 17 00:00:00 2001 +From ef85b182bc1f2f6a337c6946fdbf3b37ade936cb Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> 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 <raj.khem@gmail.com> 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 c6fd5d1..7bf6bfd 100644 +index c6fd5d17c2..7bf6bfd0e6 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -34,7 +34,7 @@ @@ -36,7 +36,7 @@ index c6fd5d1..7bf6bfd 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 fc92ed6..e59b858 100644 +index 263a475435..11994b3c4f 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -78,6 +78,7 @@ @@ -47,7 +47,7 @@ index fc92ed6..e59b858 100644 #endif #include "private/qhostinfo_p.h" -@@ -2136,8 +2137,8 @@ public slots: +@@ -2132,8 +2133,8 @@ public slots: #if defined(Q_OS_MAC) pthread_yield_np(); 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 7eb78fac..3aa0d2dd 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,11 +1,11 @@ -From ef4ff7241ee33819f11357d5a6ceee58146d63b4 Mon Sep 17 00:00:00 2001 +From 9a370262cce48a78b944a8d6e77257f915ab76e6 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 3 Sep 2017 09:11:44 -0700 Subject: [PATCH] Add OE specific specs for clang compiler Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - mkspecs/linux-oe-clang/qmake.conf | 43 ++++++++++++++++++++++++++++++++++ + mkspecs/linux-oe-clang/qmake.conf | 43 ++++++++++++++++++++++++++ mkspecs/linux-oe-clang/qplatformdefs.h | 1 + 2 files changed, 44 insertions(+) create mode 100644 mkspecs/linux-oe-clang/qmake.conf @@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf new file mode 100644 -index 0000000..ffc9f05 +index 0000000000..ffc9f051db --- /dev/null +++ b/mkspecs/linux-oe-clang/qmake.conf @@ -0,0 +1,43 @@ @@ -62,7 +62,7 @@ index 0000000..ffc9f05 +load(qt_config) diff --git a/mkspecs/linux-oe-clang/qplatformdefs.h b/mkspecs/linux-oe-clang/qplatformdefs.h new file mode 100644 -index 0000000..880c927 +index 0000000000..880c927b21 --- /dev/null +++ b/mkspecs/linux-oe-clang/qplatformdefs.h @@ -0,0 +1 @@ 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 e98b9b2e..5b8a10d6 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 a3358cf43c523af046638337960686e942798d2c Mon Sep 17 00:00:00 2001 +From c8840a63123e084cd5b2b3b8f10df72ed0ba2efb Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 3 Sep 2017 09:44:48 -0700 Subject: [PATCH] linux-clang: Invert conditional for defining QT_SOCKLEN_T @@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mkspecs/linux-clang/qplatformdefs.h b/mkspecs/linux-clang/qplatformdefs.h -index a818d97..959a508 100644 +index a818d973f0..959a508d3a 100644 --- a/mkspecs/linux-clang/qplatformdefs.h +++ b/mkspecs/linux-clang/qplatformdefs.h @@ -81,10 +81,10 @@ 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 94d2ea16..cc82877e 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 8bf717e2ecda234f626f96ae08e0be3a6eca26d8 Mon Sep 17 00:00:00 2001 +From 50c9fd7dc392ac4591c37bc3c97a6e48486e01b7 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> 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 <raj.khem@gmail.com> 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 375cecd..46ca9b1 100644 +index 375cecd521..46ca9b11cc 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 89252dea..1d6f3632 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 f09d998036af014a42c464eea72368c8f2920f6a Mon Sep 17 00:00:00 2001 +From b41e0477f9b7aad73c94833dc750971a606871dc Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 14 Feb 2018 17:08:43 -0800 Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf -index 234f71d..ee3da02 100644 +index 234f71d495..ee3da023e6 100644 --- a/mkspecs/common/gcc-base.conf +++ b/mkspecs/common/gcc-base.conf @@ -46,7 +46,7 @@ QMAKE_CFLAGS_DEBUG += -g diff --git a/recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch b/recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch new file mode 100644 index 00000000..fcfb4e9e --- /dev/null +++ b/recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch @@ -0,0 +1,344 @@ +From 1f9aefc7b4dee2f64ae64b72f7a20b139feb8440 Mon Sep 17 00:00:00 2001 +From: Ulf Hermann <ulf.hermann@qt.io> +Date: Fri, 27 Apr 2018 10:38:18 +0200 +Subject: [PATCH] Upgrade double-conversion to v3.0.0 + +This fixes their issue #41, a potential undefined behavior. + +We preserve the locally added "__ghs" clause as well as the _M_ARM_FP +clause necessary for winrt in utils.h. + +[ChangeLog][Third-Party Code] double-conversion got updated to upstream +version 3.0.0. + +Task-number: QTBUG-66561 +Change-Id: Id79125bdeeaebb61dca2e2885d3370accce9030c +Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> +Upstream-Status: Backport +--- + src/3rdparty/double-conversion/bignum.cc | 2 +- + src/3rdparty/double-conversion/bignum.h | 1 - + .../double-conversion/cached-powers.cc | 5 +-- + src/3rdparty/double-conversion/diy-fp.h | 22 +++++------ + .../double-conversion/double-conversion.cc | 21 ++++++---- + src/3rdparty/double-conversion/fixed-dtoa.cc | 5 ++- + src/3rdparty/double-conversion/ieee.h | 2 +- + .../include/double-conversion/utils.h | 38 +++++++++++++------ + .../double-conversion/qt_attribution.json | 4 +- + src/3rdparty/double-conversion/strtod.cc | 2 +- + 10 files changed, 60 insertions(+), 42 deletions(-) + +diff --git a/src/3rdparty/double-conversion/bignum.cc b/src/3rdparty/double-conversion/bignum.cc +index 2743d67e8d..8892de8f2a 100644 +--- a/src/3rdparty/double-conversion/bignum.cc ++++ b/src/3rdparty/double-conversion/bignum.cc +@@ -104,7 +104,7 @@ void Bignum::AssignDecimalString(Vector<const char> value) { + const int kMaxUint64DecimalDigits = 19; + Zero(); + int length = value.length(); +- int pos = 0; ++ unsigned int pos = 0; + // Let's just say that each digit needs 4 bits. + while (length >= kMaxUint64DecimalDigits) { + uint64_t digits = ReadUInt64(value, pos, kMaxUint64DecimalDigits); +diff --git a/src/3rdparty/double-conversion/bignum.h b/src/3rdparty/double-conversion/bignum.h +index 5ec3544f57..c385f2237b 100644 +--- a/src/3rdparty/double-conversion/bignum.h ++++ b/src/3rdparty/double-conversion/bignum.h +@@ -49,7 +49,6 @@ class Bignum { + + void AssignPowerUInt16(uint16_t base, int exponent); + +- void AddUInt16(uint16_t operand); + void AddUInt64(uint64_t operand); + void AddBignum(const Bignum& other); + // Precondition: this >= other. +diff --git a/src/3rdparty/double-conversion/cached-powers.cc b/src/3rdparty/double-conversion/cached-powers.cc +index 9536f26927..2b43f06412 100644 +--- a/src/3rdparty/double-conversion/cached-powers.cc ++++ b/src/3rdparty/double-conversion/cached-powers.cc +@@ -131,7 +131,6 @@ static const CachedPower kCachedPowers[] = { + {UINT64_2PART_C(0xaf87023b, 9bf0ee6b), 1066, 340}, + }; + +-static const int kCachedPowersLength = ARRAY_SIZE(kCachedPowers); + static const int kCachedPowersOffset = 348; // -1 * the first decimal_exponent. + static const double kD_1_LOG2_10 = 0.30102999566398114; // 1 / lg(10) + // Difference between the decimal exponents in the table above. +@@ -144,14 +143,12 @@ void PowersOfTenCache::GetCachedPowerForBinaryExponentRange( + int max_exponent, + DiyFp* power, + int* decimal_exponent) { +- (void)max_exponent; // Silence unused parameter warning in release builds +- (void)kCachedPowersLength; // Silence unused parameter warning in release builds + int kQ = DiyFp::kSignificandSize; + double k = ceil((min_exponent + kQ - 1) * kD_1_LOG2_10); + int foo = kCachedPowersOffset; + int index = + (foo + static_cast<int>(k) - 1) / kDecimalExponentDistance + 1; +- ASSERT(0 <= index && index < kCachedPowersLength); ++ ASSERT(0 <= index && index < static_cast<int>(ARRAY_SIZE(kCachedPowers))); + CachedPower cached_power = kCachedPowers[index]; + ASSERT(min_exponent <= cached_power.binary_exponent); + (void) max_exponent; // Mark variable as used. +diff --git a/src/3rdparty/double-conversion/diy-fp.h b/src/3rdparty/double-conversion/diy-fp.h +index 9dcf8fbdba..2edf34674e 100644 +--- a/src/3rdparty/double-conversion/diy-fp.h ++++ b/src/3rdparty/double-conversion/diy-fp.h +@@ -42,7 +42,7 @@ class DiyFp { + static const int kSignificandSize = 64; + + DiyFp() : f_(0), e_(0) {} +- DiyFp(uint64_t f, int e) : f_(f), e_(e) {} ++ DiyFp(uint64_t significand, int exponent) : f_(significand), e_(exponent) {} + + // this = this - other. + // The exponents of both numbers must be the same and the significand of this +@@ -76,22 +76,22 @@ class DiyFp { + + void Normalize() { + ASSERT(f_ != 0); +- uint64_t f = f_; +- int e = e_; ++ uint64_t significand = f_; ++ int exponent = e_; + + // This method is mainly called for normalizing boundaries. In general + // boundaries need to be shifted by 10 bits. We thus optimize for this case. + const uint64_t k10MSBits = UINT64_2PART_C(0xFFC00000, 00000000); +- while ((f & k10MSBits) == 0) { +- f <<= 10; +- e -= 10; ++ while ((significand & k10MSBits) == 0) { ++ significand <<= 10; ++ exponent -= 10; + } +- while ((f & kUint64MSB) == 0) { +- f <<= 1; +- e--; ++ while ((significand & kUint64MSB) == 0) { ++ significand <<= 1; ++ exponent--; + } +- f_ = f; +- e_ = e; ++ f_ = significand; ++ e_ = exponent; + } + + static DiyFp Normalize(const DiyFp& a) { +diff --git a/src/3rdparty/double-conversion/double-conversion.cc b/src/3rdparty/double-conversion/double-conversion.cc +index 909985be82..6f21a0124c 100644 +--- a/src/3rdparty/double-conversion/double-conversion.cc ++++ b/src/3rdparty/double-conversion/double-conversion.cc +@@ -118,7 +118,7 @@ void DoubleToStringConverter::CreateDecimalRepresentation( + StringBuilder* result_builder) const { + // Create a representation that is padded with zeros if needed. + if (decimal_point <= 0) { +- // "0.00000decimal_rep". ++ // "0.00000decimal_rep" or "0.000decimal_rep00". + result_builder->AddCharacter('0'); + if (digits_after_point > 0) { + result_builder->AddCharacter('.'); +@@ -129,7 +129,7 @@ void DoubleToStringConverter::CreateDecimalRepresentation( + result_builder->AddPadding('0', remaining_digits); + } + } else if (decimal_point >= length) { +- // "decimal_rep0000.00000" or "decimal_rep.0000" ++ // "decimal_rep0000.00000" or "decimal_rep.0000". + result_builder->AddSubstring(decimal_digits, length); + result_builder->AddPadding('0', decimal_point - length); + if (digits_after_point > 0) { +@@ -137,7 +137,7 @@ void DoubleToStringConverter::CreateDecimalRepresentation( + result_builder->AddPadding('0', digits_after_point); + } + } else { +- // "decima.l_rep000" ++ // "decima.l_rep000". + ASSERT(digits_after_point > 0); + result_builder->AddSubstring(decimal_digits, decimal_point); + result_builder->AddCharacter('.'); +@@ -494,10 +494,17 @@ static double SignedZero(bool sign) { + // because it constant-propagated the radix and concluded that the last + // condition was always true. By moving it into a separate function the + // compiler wouldn't warn anymore. ++#if _MSC_VER ++#pragma optimize("",off) + static bool IsDecimalDigitForRadix(int c, int radix) { + return '0' <= c && c <= '9' && (c - '0') < radix; + } +- ++#pragma optimize("",on) ++#else ++static bool inline IsDecimalDigitForRadix(int c, int radix) { ++ return '0' <= c && c <= '9' && (c - '0') < radix; ++} ++#endif + // Returns true if 'c' is a character digit that is valid for the given radix. + // The 'a_character' should be 'a' or 'A'. + // +@@ -852,9 +859,9 @@ double StringToDoubleConverter::StringToIeee( + return junk_string_value_; + } + } +- char sign = '+'; ++ char exponen_sign = '+'; + if (*current == '+' || *current == '-') { +- sign = static_cast<char>(*current); ++ exponen_sign = static_cast<char>(*current); + ++current; + if (current == end) { + if (allow_trailing_junk) { +@@ -888,7 +895,7 @@ double StringToDoubleConverter::StringToIeee( + ++current; + } while (current != end && *current >= '0' && *current <= '9'); + +- exponent += (sign == '-' ? -num : num); ++ exponent += (exponen_sign == '-' ? -num : num); + } + + if (!(allow_trailing_spaces || allow_trailing_junk) && (current != end)) { +diff --git a/src/3rdparty/double-conversion/fixed-dtoa.cc b/src/3rdparty/double-conversion/fixed-dtoa.cc +index aef65fdc21..0f55a0b6eb 100644 +--- a/src/3rdparty/double-conversion/fixed-dtoa.cc ++++ b/src/3rdparty/double-conversion/fixed-dtoa.cc +@@ -98,7 +98,7 @@ class UInt128 { + return high_bits_ == 0 && low_bits_ == 0; + } + +- int BitAt(int position) { ++ int BitAt(int position) const { + if (position >= 64) { + return static_cast<int>(high_bits_ >> (position - 64)) & 1; + } else { +@@ -259,7 +259,8 @@ static void FillFractionals(uint64_t fractionals, int exponent, + fractionals -= static_cast<uint64_t>(digit) << point; + } + // If the first bit after the point is set we have to round up. +- if (((fractionals >> (point - 1)) & 1) == 1) { ++ ASSERT(fractionals == 0 || point - 1 >= 0); ++ if ((fractionals != 0) && ((fractionals >> (point - 1)) & 1) == 1) { + RoundUp(buffer, length, decimal_point); + } + } else { // We need 128 bits. +diff --git a/src/3rdparty/double-conversion/ieee.h b/src/3rdparty/double-conversion/ieee.h +index 661141d1a8..b14cf4f717 100644 +--- a/src/3rdparty/double-conversion/ieee.h ++++ b/src/3rdparty/double-conversion/ieee.h +@@ -99,7 +99,7 @@ class Double { + } + + double PreviousDouble() const { +- if (d64_ == (kInfinity | kSignMask)) return -Double::Infinity(); ++ if (d64_ == (kInfinity | kSignMask)) return -Infinity(); + if (Sign() < 0) { + return Double(d64_ + 1).value(); + } else { +diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h +index 20bfd36c84..ca7646d817 100644 +--- a/src/3rdparty/double-conversion/include/double-conversion/utils.h ++++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h +@@ -33,19 +33,29 @@ + + #include <assert.h> + #ifndef ASSERT +-# if defined(WINCE) || defined(_WIN32_WCE) +-# define ASSERT(condition) +-# else +-# define ASSERT(condition) \ ++#define ASSERT(condition) \ + assert(condition); +-# endif + #endif + #ifndef UNIMPLEMENTED +-# define UNIMPLEMENTED() (exit(-1)) ++#define UNIMPLEMENTED() (abort()) ++#endif ++#ifndef DOUBLE_CONVERSION_NO_RETURN ++#ifdef _MSC_VER ++#define DOUBLE_CONVERSION_NO_RETURN __declspec(noreturn) ++#else ++#define DOUBLE_CONVERSION_NO_RETURN __attribute__((noreturn)) ++#endif + #endif + #ifndef UNREACHABLE +-# define UNREACHABLE() (exit(-1)) ++#ifdef _MSC_VER ++void DOUBLE_CONVERSION_NO_RETURN abort_noreturn(); ++inline void abort_noreturn() { abort(); } ++#define UNREACHABLE() (abort_noreturn()) ++#else ++#define UNREACHABLE() (abort()) + #endif ++#endif ++ + + // Double operations detection based on target architecture. + // Linux uses a 80bit wide floating point stack on x86. This induces double +@@ -62,11 +72,15 @@ + defined(__hppa__) || defined(__ia64__) || \ + defined(__mips__) || \ + defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ ++ defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \ + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ + defined(__SH4__) || defined(__alpha__) || \ + defined(_MIPS_ARCH_MIPS32R2) || \ +- defined(__AARCH64EL__) ++ defined(__AARCH64EL__) || defined(__aarch64__) || \ ++ defined(__riscv) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 ++#elif defined(__mc68000__) ++#undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS + #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) + #if defined(_WIN32) + // Windows uses a 64bit wide floating point stack. +@@ -172,8 +186,8 @@ template <typename T> + class Vector { + public: + Vector() : start_(NULL), length_(0) {} +- Vector(T* data, int length) : start_(data), length_(length) { +- ASSERT(length == 0 || (length > 0 && data != NULL)); ++ Vector(T* data, int len) : start_(data), length_(len) { ++ ASSERT(len == 0 || (len > 0 && data != NULL)); + } + + // Returns a vector using the same backing storage as this one, +@@ -215,8 +229,8 @@ class Vector { + // buffer bounds on all operations in debug mode. + class StringBuilder { + public: +- StringBuilder(char* buffer, int size) +- : buffer_(buffer, size), position_(0) { } ++ StringBuilder(char* buffer, int buffer_size) ++ : buffer_(buffer, buffer_size), position_(0) { } + + ~StringBuilder() { if (!is_finalized()) Finalize(); } + +diff --git a/src/3rdparty/double-conversion/qt_attribution.json b/src/3rdparty/double-conversion/qt_attribution.json +index 92118ac779..d41a7ef332 100644 +--- a/src/3rdparty/double-conversion/qt_attribution.json ++++ b/src/3rdparty/double-conversion/qt_attribution.json +@@ -5,8 +5,8 @@ + "QtUsage": "Used in Qt Core. Configure with -system-doubleconversion or -no-doubleconversion to avoid.", + + "Homepage": "https://github.com/google/double-conversion", +- "Version": "2.0.1", +- "DownloadLocation": "https://github.com/google/double-conversion/commit/2fb03de56faa32bbba5e02222528e7b760f71d77", ++ "Version": "3.0.0", ++ "DownloadLocation": "https://github.com/google/double-conversion/commit/ca220cbafa83ca706f028bfbb5adc7eb2f1f90e1", + "License": "BSD 3-clause \"New\" or \"Revised\" License", + "LicenseId": "BSD-3-Clause", + "LicenseFile": "LICENSE", +diff --git a/src/3rdparty/double-conversion/strtod.cc b/src/3rdparty/double-conversion/strtod.cc +index 34717562bd..17abcbb2a5 100644 +--- a/src/3rdparty/double-conversion/strtod.cc ++++ b/src/3rdparty/double-conversion/strtod.cc +@@ -286,7 +286,7 @@ static bool DiyFpStrtod(Vector<const char> buffer, + const int kDenominator = 1 << kDenominatorLog; + // Move the remaining decimals into the exponent. + exponent += remaining_decimals; +- int error = (remaining_decimals == 0 ? 0 : kDenominator / 2); ++ uint64_t error = (remaining_decimals == 0 ? 0 : kDenominator / 2); + + int old_e = input.e(); + input.Normalize(); diff --git a/recipes-qt/qt5/qtbase/0013-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0014-Always-build-uic-and-qvkgen.patch index ea23cce7..060e8fbf 100644 --- a/recipes-qt/qt5/qtbase/0013-Always-build-uic-and-qvkgen.patch +++ b/recipes-qt/qt5/qtbase/0014-Always-build-uic-and-qvkgen.patch @@ -1,4 +1,4 @@ -From 10f419678fe4f7087c973a8d8dd96bb0d781487b Mon Sep 17 00:00:00 2001 +From 7b0de75cc3d85b44f96f1c6869c65399351a1398 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 16 Nov 2013 00:32:30 +0100 Subject: [PATCH] Always build uic and qvkgen @@ -14,7 +14,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src.pro b/src/src.pro -index 1f7c5d9..6b39379 100644 +index 1f7c5d99c1..6b39379dd0 100644 --- a/src/src.pro +++ b/src/src.pro @@ -222,7 +222,7 @@ qtConfig(gui) { diff --git a/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0015-Bootstrap-without-linkat-feature.patch index 57cfe368..8863ddd8 100644 --- a/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch +++ b/recipes-qt/qt5/qtbase/0015-Bootstrap-without-linkat-feature.patch @@ -1,4 +1,4 @@ -From 7691598a164737591068f8670f02a904ffce5dd2 Mon Sep 17 00:00:00 2001 +From 6ff049f08cbe80b00b34859acdc5ccf7b9c9ae18 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Fri, 24 Nov 2017 15:16:31 +0200 Subject: [PATCH] Bootstrap without linkat feature @@ -13,7 +13,7 @@ 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 3469ebe..cb889f2 100644 +index 3469ebe5e6..cb889f27c2 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h @@ -90,7 +90,7 @@ diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 57b60392..da0b1d4e 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = " \ # 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.2 +# 5.11.meta-qt5-shared.6 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -29,6 +29,7 @@ SRC_URI += "\ file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ + file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ " # for syncqt @@ -144,6 +145,10 @@ PACKAGECONFIG[widgets] = "-widgets,-no-widgets" PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy" PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput" PACKAGECONFIG[journald] = "-journald,-no-journald,systemd" +# needs kernel 3.16+ +PACKAGECONFIG[renameat2] = "-feature-renameat2,-no-feature-renameat2," +# needs kernel 3.17+ +PACKAGECONFIG[getentropy] = "-feature-getentropy,-no-feature-getentropy," QT_CONFIG_FLAGS_GOLD = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-use-gold-linker', '-no-use-gold-linker', d)}" QT_CONFIG_FLAGS += " \ 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 ddcc7f5a..9e1a7f70 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 556f69870fb3b5788ebae2baa9b832cb4d6fd996 Mon Sep 17 00:00:00 2001 +From 5c42b403e8ddb3c6a49baa7c370c7fdd6014fa7c Mon Sep 17 00:00:00 2001 From: Wenlin Kang <wenlin.kang@windriver.com> Date: Thu, 8 Sep 2016 12:18:13 +0800 Subject: [PATCH] qtmultimedia: fix a conflicting declaration @@ -8,15 +8,15 @@ fix a "conflicting declaration" error. Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> --- - src/plugins/videonode/imx6/lgl2.h | 46 ++++++++++++++++++++++ - .../videonode/imx6/qsgvivantevideomaterial.cpp | 5 ++- - src/plugins/videonode/imx6/qsgvivantevideonode.cpp | 5 ++- + src/plugins/videonode/imx6/lgl2.h | 46 +++++++++++++++++++ + .../imx6/qsgvivantevideomaterial.cpp | 5 +- + .../videonode/imx6/qsgvivantevideonode.cpp | 5 +- 3 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 src/plugins/videonode/imx6/lgl2.h diff --git a/src/plugins/videonode/imx6/lgl2.h b/src/plugins/videonode/imx6/lgl2.h new file mode 100644 -index 0000000..2423697 +index 00000000..24236976 --- /dev/null +++ b/src/plugins/videonode/imx6/lgl2.h @@ -0,0 +1,46 @@ @@ -67,7 +67,7 @@ index 0000000..2423697 + +#endif diff --git a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp -index 465ccfa..40e7592 100644 +index 465ccfa7..40e7592b 100644 --- a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp +++ b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp @@ -37,8 +37,9 @@ @@ -83,7 +83,7 @@ index 465ccfa..40e7592 100644 #include "qsgvivantevideomaterial.h" #include "qsgvivantevideomaterialshader.h" diff --git a/src/plugins/videonode/imx6/qsgvivantevideonode.cpp b/src/plugins/videonode/imx6/qsgvivantevideonode.cpp -index c8d83b4..5b1b8f2 100644 +index c8d83b4b..5b1b8f24 100644 --- a/src/plugins/videonode/imx6/qsgvivantevideonode.cpp +++ b/src/plugins/videonode/imx6/qsgvivantevideonode.cpp @@ -37,8 +37,9 @@ diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 05804eac..69ca00e7 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.2 +# 5.11.meta-qt5.4 SRC_URI += "\ file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ " diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb deleted file mode 100644 index fd440b74..00000000 --- a/recipes-qt/qt5/qtquick1_git.bb +++ /dev/null @@ -1,29 +0,0 @@ -require qt5.inc -require qt5-git.inc -require qt5-ptest.inc - -HOMEPAGE = "http://www.qt.io" -LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ - file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ -" - -DEPENDS += "qtscript qtsvg qtxmlpatterns" -# qttools - -PACKAGECONFIG ??= "webkit" -PACKAGECONFIG[webkit] = ",,qtwebkit" - -EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'webkit', '', 'CONFIG+=noqtwebkit', d)}" - -do_configure_prepend() { - sed -i 's#^qtHaveModule(webkitwidgets):#qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit):#g' ${S}/src/imports/imports.pro -} - -QT_MODULE_BRANCH = "dev" - -SRCREV = "fa02271a18837f20e82006de23c2af1899294aa1" 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 3d3599da..f52743e3 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 51cfd34b85738194616c7a9354d707cc96062450 Mon Sep 17 00:00:00 2001 +From e1b89c21f212bf60ad7a91359991fc6a6551edbe Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> 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 de8ad962..b998922e 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.2 +# 5.11.meta-qt5.4 SRC_URI += " \ file://0001-Allow-a-tools-only-build.patch \ " 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 348693da..16566b38 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 602abde351bcb2ac475253cf547e15f10620b6e7 Mon Sep 17 00:00:00 2001 +From eba275e193aacf43a2fb30cca545f0c13d968c65 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> 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 3ebef2ed..503f9dbf 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -13,7 +13,7 @@ DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" SRCREV = "de31ea0edc5ed6511bf635aa75f5d5c6f9aedc94" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.11 -# 5.11.meta-qt5.2 +# 5.11.meta-qt5.4 SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" do_install_append_class-nativesdk() { diff --git a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch index 5d3f9843..3d376084 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 2a61817d5eac01b1dbc445a65d14573294b7ed71 Mon Sep 17 00:00:00 2001 +From ca531038c01d28f98cd80ac063bb82dc9fe9ed86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> Date: Wed, 4 Jun 2014 11:28:16 +0200 Subject: [PATCH] add noqtwebkit configuration @@ -16,7 +16,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro -index 1374c07..28c45a2 100644 +index 1374c073..28c45a25 100644 --- a/src/assistant/assistant/assistant.pro +++ b/src/assistant/assistant/assistant.pro @@ -1,4 +1,4 @@ @@ -35,7 +35,7 @@ index 1374c07..28c45a2 100644 QT += webkitwidgets SOURCES += helpviewer_qwv.cpp diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro -index 500a153..b60fa2d 100644 +index 500a1534..b60fa2d9 100644 --- a/src/designer/src/plugins/plugins.pro +++ b/src/designer/src/plugins/plugins.pro @@ -1,6 +1,6 @@ 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 790657b3..4202440e 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 db6995482d1bd290ea8f09a02ff31f8e769f87c4 Mon Sep 17 00:00:00 2001 +From d754f1e1d4579d8005283dfdc3c9eb7995e61739 Mon Sep 17 00:00:00 2001 From: Cody P Schafer <dev@codyps.com> Date: Thu, 9 Jul 2015 11:28:19 -0400 Subject: [PATCH] linguist-tools cmake: allow overriding the location for @@ -9,7 +9,7 @@ Subject: [PATCH] linguist-tools cmake: allow overriding the location for 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in -index 4318b16..2e3b70f 100644 +index 4318b16f..2e3b70fa 100644 --- a/src/linguist/Qt5LinguistToolsConfig.cmake.in +++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in @@ -26,6 +26,9 @@ get_filename_component(_qt5_linguisttools_install_prefix \"${CMAKE_CURRENT_LIST_ diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index f729257c..678624dc 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.2 +# 5.11.meta-qt5.4 SRC_URI += " \ file://0001-add-noqtwebkit-configuration.patch \ file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \ diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index fe76d7eb..d402bf1b 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -8,6 +8,13 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qttools-native" +do_install_append() { + # remove qtquick1 translations - qtquick1 is gone + for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qtquick1_*.qm`; do + rm $transfile + done +} + PACKAGES =. " \ ${PN}-assistant \ ${PN}-designer \ @@ -22,7 +29,6 @@ PACKAGES =. " \ ${PN}-qtwebsockets \ ${PN}-qtwebengine \ ${PN}-qtxmlpatterns \ - ${PN}-qtquick1 \ ${PN}-qtscript \ ${PN}-qtserialport \ ${PN}-qtbase \ @@ -82,10 +88,6 @@ FILES_${PN}-qtxmlpatterns = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qtxmlpatterns_*.qm \ " -FILES_${PN}-qtquick1 = " \ - ${OE_QMAKE_PATH_TRANSLATIONS}/qtquick1_*.qm \ -" - FILES_${PN}-qtscript = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qtscript_*.qm \ " 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 17f34052..b0b9a7d3 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 882d9b41fd538c3dd4170bdcdb3938f8989d7700 Mon Sep 17 00:00:00 2001 +From 8638cd129e040e8958570c95a3d4e91d9366f5a8 Mon Sep 17 00:00:00 2001 From: Cleiton Bueno <cleitonrbueno@gmail.com> 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 <cleitonrbueno@gmail.com> 1 file changed, 2 insertions(+) diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h -index 73607aa..151d261 100644 +index 1723da7e..4d9e5981 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/0002-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch index e8cd395f..2184408c 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 1095ff439340980b297eb988f23fceb5d198b18e Mon Sep 17 00:00:00 2001 +From 0101ed343c6f6eb652c5992ed2279ddd5c6d5969 Mon Sep 17 00:00:00 2001 From: Cleiton Bueno <cleitonrbueno@gmail.com> Date: Thu, 24 Dec 2015 15:59:51 -0200 Subject: [PATCH] Include dependency to QCoreApplication::translate() @@ -9,7 +9,7 @@ Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> 1 file changed, 2 insertions(+) diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h -index 579d159..0904c46 100644 +index 579d159a..0904c468 100644 --- a/src/core/media_capture_devices_dispatcher.h +++ b/src/core/media_capture_devices_dispatcher.h @@ -45,6 +45,8 @@ 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 13e0dc9b..eaed7a6c 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 e0d8fe57a8bbd1c24ae35d93c54ab0c6e58eff20 Mon Sep 17 00:00:00 2001 +From a7eff4032f84490b33df27771d43e098ceea439e Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Wed, 15 Mar 2017 13:53:28 +0200 Subject: [PATCH] Force host toolchain configuration @@ -18,7 +18,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro -index dd0d3e3..70161c8 100644 +index dd0d3e32..70161c82 100644 --- a/src/buildtools/configure_host.pro +++ b/src/buildtools/configure_host.pro @@ -4,7 +4,7 @@ TEMPLATE = aux @@ -57,7 +57,7 @@ index dd0d3e3..70161c8 100644 " nm = \"$$which(nm)\" " \ " toolchain_args = { " \ diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri -index 68d64fd..9ab43df 100644 +index b56134ad..69f463e9 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -91,7 +91,7 @@ contains(QT_ARCH, "mips") { diff --git a/recipes-qt/qt5/qtwebengine/0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch b/recipes-qt/qt5/qtwebengine/0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch new file mode 100644 index 00000000..0b79599d --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch @@ -0,0 +1,50 @@ +From 9e8b0fda6b2338feed486d238a61c2a51e4fd2b3 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sun, 10 Jun 2018 10:26:17 +0000 +Subject: [PATCH] chromium_overrides.cpp: Fix build with plugins and ozone + enabled + +* otherwise it fails with: + | make[3]: Entering directory '/OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core' +| creating linker version script QtWebEngineCore.version +| rm -f libQt5WebEngineCore.so.5.10.1 libQt5WebEngineCore.so libQt5WebEngineCore.so.5 libQt5WebEngineCore.so.5.10 +| linking ../../lib/libQt5WebEngineCore.so.5.10.1 +| /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/recipe-sysroot-native/usr/bin/i586-webos-linux/../../libexec/i586-webos-linux/gcc/i586-webos-linux/7.3.0/ld: error: /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core/release/obj/content/browser/browser/pepper_truetype_font_list_ozone.o: multiple definition of 'content::GetFontFamilies_SlowBlocking(std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >*)' +| /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/recipe-sysroot-native/usr/bin/i586-webos-linux/../../libexec/i586-webos-linux/gcc/i586-webos-linux/7.3.0/ld: /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core/release/obj/QtWebEngineCore/chromium_overrides.o: previous definition here +| /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/recipe-sysroot-native/usr/bin/i586-webos-linux/../../libexec/i586-webos-linux/gcc/i586-webos-linux/7.3.0/ld: error: /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core/release/obj/content/browser/browser/pepper_truetype_font_list_ozone.o: multiple definition of 'content::GetFontsInFamily_SlowBlocking(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<ppapi::proxy::SerializedTrueTypeFontDesc, std::allocator<ppapi::proxy::SerializedTrueTypeFontDesc> >*)' +| /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/recipe-sysroot-native/usr/bin/i586-webos-linux/../../libexec/i586-webos-linux/gcc/i586-webos-linux/7.3.0/ld: /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core/release/obj/QtWebEngineCore/chromium_overrides.o: previous definition here +| collect2: error: ld returned 1 exit status +| Makefile.core_module:74: recipe for target '../../lib/libQt5WebEngineCore.so.5.10.1' failed +| make[3]: *** [../../lib/libQt5WebEngineCore.so.5.10.1] Error 1 +| make[3]: Leaving directory '/OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core' +| Makefile:122: recipe for target 'sub-core_module-pro-make_first' failed +| make[2]: *** [sub-core_module-pro-make_first] Error 2 +| make[2]: Leaving directory '/OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core' +| Makefile:78: recipe for target 'sub-core-make_first' failed +| make[1]: *** [sub-core-make_first] Error 2 +| make[1]: Leaving directory '/OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src' +| Makefile:46: recipe for target 'sub-src-make_first' failed +| make: *** [sub-src-make_first] Error 2 +| ERROR: oe_runmake failed +| WARNING: /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/temp/run.do_compile.10122:1 exit 1 from 'exit 1' +| ERROR: Function failed: do_compile (log file is located at /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/temp/log.do_compile.10122) + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com> +--- + src/core/chromium_overrides.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp +index 8f6687ff..994e2799 100644 +--- a/src/core/chromium_overrides.cpp ++++ b/src/core/chromium_overrides.cpp +@@ -159,7 +159,7 @@ std::unique_ptr<base::ListValue> GetFontList_SlowBlocking() + return std::move(font_list); + } + +-#if BUILDFLAG(ENABLE_PLUGINS) ++#if BUILDFLAG(ENABLE_PLUGINS) && !defined(USE_OZONE) + // content/browser/renderer_host/pepper/pepper_truetype_font_list.h + void GetFontFamilies_SlowBlocking(std::vector<std::string> *font_families) + { 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/0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch index f67baea2..f36f0902 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/0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch @@ -1,4 +1,4 @@ -From 84d83fa843e72e2154375c8a002a74dc31ab8aae Mon Sep 17 00:00:00 2001 +From 6dec716e02e46bc75230b01aafb115f35fd3a895 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Tue, 12 Dec 2017 16:06:14 +0200 Subject: [PATCH] musl: don't use pvalloc as it's not available on musl @@ -10,7 +10,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> 1 file changed, 8 deletions(-) diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp -index 002a1af..8fd2da3 100644 +index 002a1af2..8fd2da36 100644 --- a/src/core/api/qtbug-61521.cpp +++ b/src/core/api/qtbug-61521.cpp @@ -74,10 +74,6 @@ SHIM_SYMBOL_VERSION(valloc); diff --git a/recipes-qt/qt5/qtwebengine/0005-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0006-musl-link-against-libexecinfo.patch index 88d95428..8dd07d65 100644 --- a/recipes-qt/qt5/qtwebengine/0005-musl-link-against-libexecinfo.patch +++ b/recipes-qt/qt5/qtwebengine/0006-musl-link-against-libexecinfo.patch @@ -1,4 +1,4 @@ -From acc9fd7805f48fc998f1733db1fd58b05d381582 Mon Sep 17 00:00:00 2001 +From 418ff96920a520a4c9d082f56864ee8654f584f7 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Thu, 14 Dec 2017 11:28:10 +0200 Subject: [PATCH] musl: link against libexecinfo @@ -10,7 +10,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/core_module.pro b/src/core/core_module.pro -index d21985e..eeebeb4 100644 +index d21985e6..eeebeb4f 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -54,7 +54,7 @@ linux { diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch index c5e9ea57..32efcf99 100644 --- a/recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch @@ -1,4 +1,4 @@ -From 42ad6935a99271f9b481423162d9ead15ffa9ec9 Mon Sep 17 00:00:00 2001 +From 761754d5edf129d526e87ed5ace71d24f30e9618 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Wed, 15 Mar 2017 13:53:28 +0200 Subject: [PATCH] chromium: Force host toolchain configuration @@ -14,7 +14,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py -index 93c6446..0fe7e67 100755 +index 93c6446f28..0fe7e6737d 100755 --- a/chromium/tools/gn/bootstrap/bootstrap.py +++ b/chromium/tools/gn/bootstrap/bootstrap.py @@ -352,10 +352,10 @@ def write_gn_ninja(path, root_gen_dir, options): diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch index bc066645..b5c6c5de 100644 --- a/recipes-qt/qt5/qtwebengine/0002-chromium-workaround-for-too-long-.rps-file-name.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch @@ -1,4 +1,4 @@ -From 95c0c42ca5103adef307fc29b53d8f95b4755baa Mon Sep 17 00:00:00 2001 +From 108bc7caf7544b47a392aac690f0d616f1c6c42e Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Thu, 30 Mar 2017 11:37:24 +0300 Subject: [PATCH] chromium: workaround for too long .rps file name @@ -18,7 +18,7 @@ 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 bab07c5..8f889ae 100644 +index bab07c5d2b..8f889aebc1 100644 --- a/chromium/tools/gn/ninja_action_target_writer.cc +++ b/chromium/tools/gn/ninja_action_target_writer.cc @@ -117,9 +117,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() { diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch new file mode 100644 index 00000000..f2747330 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch @@ -0,0 +1,50 @@ +From d16d04ea5c47974f038c4434011e69dbfc23c797 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Tue, 5 Jun 2018 13:58:16 +0000 +Subject: [PATCH] chromium: Fix build with gcc8 + +--- + chromium/mojo/public/c/system/buffer.h | 2 +- + chromium/mojo/public/c/system/data_pipe.h | 2 +- + chromium/mojo/public/c/system/message_pipe.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/chromium/mojo/public/c/system/buffer.h b/chromium/mojo/public/c/system/buffer.h +index 09f6d285f3..e516a09e49 100644 +--- a/chromium/mojo/public/c/system/buffer.h ++++ b/chromium/mojo/public/c/system/buffer.h +@@ -35,7 +35,7 @@ const MojoCreateSharedBufferOptionsFlags + ((MojoCreateSharedBufferOptionsFlags)0) + #endif + +-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); ++MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); + struct MOJO_ALIGNAS(8) MojoCreateSharedBufferOptions { + uint32_t struct_size; + MojoCreateSharedBufferOptionsFlags flags; +diff --git a/chromium/mojo/public/c/system/data_pipe.h b/chromium/mojo/public/c/system/data_pipe.h +index 62adbea1ea..76225858ba 100644 +--- a/chromium/mojo/public/c/system/data_pipe.h ++++ b/chromium/mojo/public/c/system/data_pipe.h +@@ -46,7 +46,7 @@ const MojoCreateDataPipeOptionsFlags MOJO_CREATE_DATA_PIPE_OPTIONS_FLAG_NONE = + ((MojoCreateDataPipeOptionsFlags)0) + #endif + +-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); ++MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); + struct MOJO_ALIGNAS(8) MojoCreateDataPipeOptions { + MOJO_ALIGNAS(4) uint32_t struct_size; + MOJO_ALIGNAS(4) MojoCreateDataPipeOptionsFlags flags; +diff --git a/chromium/mojo/public/c/system/message_pipe.h b/chromium/mojo/public/c/system/message_pipe.h +index f0f69d1025..364a02971e 100644 +--- a/chromium/mojo/public/c/system/message_pipe.h ++++ b/chromium/mojo/public/c/system/message_pipe.h +@@ -44,7 +44,7 @@ const MojoCreateMessagePipeOptionsFlags + ((MojoCreateMessagePipeOptionsFlags)0) + #endif + +-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); ++MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); + struct MOJO_ALIGNAS(8) MojoCreateMessagePipeOptions { + uint32_t struct_size; + MojoCreateMessagePipeOptionsFlags flags; diff --git a/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch index 375b01a1..8aeba5f1 100644 --- a/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch @@ -1,4 +1,4 @@ -From 37e7051ef185d7b1a237db725d98f63a155fc95b Mon Sep 17 00:00:00 2001 +From 48bcb9e0efa3d67543cc755a2fc0f97b6514cbab Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 14:01:12 -0700 Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not @@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 9 insertions(+) diff --git a/chromium/sandbox/linux/suid/sandbox.c b/chromium/sandbox/linux/suid/sandbox.c -index 66f68ef..9284d0d 100644 +index 66f68ef138..9284d0d4fc 100644 --- a/chromium/sandbox/linux/suid/sandbox.c +++ b/chromium/sandbox/linux/suid/sandbox.c @@ -44,6 +44,15 @@ static bool DropRoot(); diff --git a/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch index 46f1c9ce..9a0b3370 100644 --- a/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch @@ -1,4 +1,4 @@ -From 2ddd74e630db38b951697c0b020245c0c83b2316 Mon Sep 17 00:00:00 2001 +From 913e3c0834dd0371ee62ab91b71428fc2b77b3c4 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> 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 <raj.khem@gmail.com> 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 73a52d6..4867198 100644 +index 73a52d6210..4867198a50 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,7 +32,7 @@ index 73a52d6..4867198 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 ffd5191..0c9131e 100644 +index ffd519133c..0c9131e98e 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() = default; @@ -53,7 +53,7 @@ index ffd5191..0c9131e 100644 } diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc -index 7ddeb4d..b8c73b0 100644 +index 7ddeb4d16a..b8c73b09c5 100644 --- a/chromium/content/child/content_child_helpers.cc +++ b/chromium/content/child/content_child_helpers.cc @@ -25,7 +25,7 @@ namespace content { diff --git a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-include-fcntl.h-for-loff_t.patch index e9324b69..a57d74ec 100644 --- a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-include-fcntl.h-for-loff_t.patch @@ -1,15 +1,15 @@ -From e627afbd990a189d3eaf9992088bd506e306a680 Mon Sep 17 00:00:00 2001 +From 5547d8bcd9241726f2ea01ada0204c4a4a4e922b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 14:37:49 -0700 Subject: [PATCH] chromium: musl: include fcntl.h for loff_t Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 1 + + .../tcmalloc/chromium/src/base/linux_syscall_support.h | 1 + 1 file changed, 1 insertion(+) diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -index b29ec2d..91f77dd 100644 +index b29ec2d29a..91f77dd88d 100644 --- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h @@ -150,6 +150,7 @@ extern "C" { diff --git a/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch index 6e636311..26fe1bd4 100644 --- a/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch @@ -1,4 +1,4 @@ -From cfd8e1d9c17cc365c5d49d99b47ce8e06e725f86 Mon Sep 17 00:00:00 2001 +From 69905bc0ef6576240b3b72c7a00e041b2512fea2 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 14:38:37 -0700 Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t @@ -8,11 +8,11 @@ Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - .../third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 10 +++++----- + .../tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h -index 715c045..edc8cf2 100644 +index 715c045f66..edc8cf2db7 100644 --- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h +++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h @@ -77,7 +77,7 @@ typedef off64_t __off64_t; diff --git a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-linux-glibc-make-the-distinction.patch index dd2d7a3a..66e22bba 100644 --- a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-linux-glibc-make-the-distinction.patch @@ -1,4 +1,4 @@ -From 3bfe9fa1e05ae2faec6dc73895c2bf265ec66d3b Mon Sep 17 00:00:00 2001 +From 8f5a007da9926f411d7ced9d07fcd00e4acc750a Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 14:54:38 -0700 Subject: [PATCH] chromium: musl: linux != glibc, make the distinction @@ -9,7 +9,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc -index 9cd5d22..1e70095 100644 +index 9cd5d2207d..1e70095648 100644 --- a/chromium/base/allocator/allocator_check.cc +++ b/chromium/base/allocator/allocator_check.cc @@ -27,7 +27,7 @@ bool IsAllocatorInitialized() { diff --git a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch index a9e5e2b1..d622ee53 100644 --- a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch @@ -1,4 +1,4 @@ -From f9e47fe475eb60c4615215214cea344280e5b26f Mon Sep 17 00:00:00 2001 +From b93340f0e24d97015a62649616cc52c92473ac64 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 15:09:02 -0700 Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols @@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc -index 4b7de5e..fe56522 100644 +index 4b7de5e1a3..fe565223f2 100644 --- a/chromium/base/allocator/allocator_shim.cc +++ b/chromium/base/allocator/allocator_shim.cc @@ -302,7 +302,7 @@ ALWAYS_INLINE void ShimFreeDefiniteSize(void* ptr, size_t size, void* context) { diff --git a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch index 2d47fd27..910c917e 100644 --- a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch @@ -1,4 +1,4 @@ -From 33fb1fa2f8a846734544db7b21f120f5924f9316 Mon Sep 17 00:00:00 2001 +From e43710f187e1263264fadefef991048d5bfb2fe9 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 15:12:39 -0700 Subject: [PATCH] chromium: musl: Use correct member name __si_fields from @@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc -index 003708d..0fef314 100644 +index 003708d2c8..0fef3148f9 100644 --- a/chromium/sandbox/linux/seccomp-bpf/trap.cc +++ b/chromium/sandbox/linux/seccomp-bpf/trap.cc @@ -168,7 +168,7 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) { diff --git a/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch index 5f6dc254..cbe5d19b 100644 --- a/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch @@ -1,4 +1,4 @@ -From ea8b649d60037b08bbb2134f878098c8373a08b7 Mon Sep 17 00:00:00 2001 +From 1567c7984f1d368cdf32033e801f5568c0855213 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 15:27:50 -0700 Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc @@ -6,14 +6,14 @@ Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - chromium/net/dns/dns_config_service_posix.cc | 4 ++++ - chromium/net/dns/dns_reloader.cc | 4 ++++ - chromium/net/dns/resolv_compat.h | 29 ++++++++++++++++++++++++++++ + 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 f2e6633..6fe84dd 100644 +index f2e66331e3..6fe84dd66a 100644 --- a/chromium/net/dns/dns_config_service_posix.cc +++ b/chromium/net/dns/dns_config_service_posix.cc @@ -27,6 +27,10 @@ @@ -28,7 +28,7 @@ index f2e6633..6fe84dd 100644 #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 +index 322c8a5f0f..72ff40dbe1 100644 --- a/chromium/net/dns/dns_reloader.cc +++ b/chromium/net/dns/dns_reloader.cc @@ -9,6 +9,10 @@ @@ -44,7 +44,7 @@ index 322c8a5..72ff40d 100644 #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 +index 0000000000..4f0e852a19 --- /dev/null +++ b/chromium/net/dns/resolv_compat.h @@ -0,0 +1,29 @@ diff --git a/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch index 57f313c9..e84290e3 100644 --- a/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Do-not-define-__sbrk-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch @@ -1,4 +1,4 @@ -From 567105c9014cbad00aba5bcd172e6aed3e32c509 Mon Sep 17 00:00:00 2001 +From bc578326c48554e2123640869199d0d4505fa357 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 15:39:57 -0700 Subject: [PATCH] chromium: musl: Do not define __sbrk on musl @@ -8,11 +8,11 @@ argument, so we just let it out for now Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 2 +- + .../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 +index edc8cf2db7..a868b50d30 100644 --- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h +++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h @@ -233,7 +233,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size, diff --git a/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch index a247eb80..7fee0d61 100644 --- a/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Adjust-default-pthread-stack-size.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch @@ -1,4 +1,4 @@ -From fdd90ccaebc488bdb68b020a9bc3d89232795559 Mon Sep 17 00:00:00 2001 +From c2bf9db1e3d32a756bcce69c1bc5ce38941b3cd4 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 16:41:23 -0700 Subject: [PATCH] chromium: musl: Adjust default pthread stack size @@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 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 +index 9917a7b1fd..cb406659b9 100644 --- a/chromium/base/threading/platform_thread_linux.cc +++ b/chromium/base/threading/platform_thread_linux.cc @@ -173,7 +173,8 @@ void TerminateOnThread() {} @@ -24,7 +24,7 @@ index 9917a7b..cb40665 100644 // 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 +index 13c3f907f8..07308e0835 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() { diff --git a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch index b97045d0..bf4f362f 100644 --- a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch @@ -1,4 +1,4 @@ -From ba501cce8252a22a4baba2d9e524bd7538a079bd Mon Sep 17 00:00:00 2001 +From 26bdd2d86b57adb8f87081f102431854a55c734a Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> 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 <raj.khem@gmail.com> 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 d6ed5e1..b550f89 100644 +index d6ed5e1f88..b550f895ef 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/chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch index adc2d824..3d322708 100644 --- a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch @@ -1,15 +1,15 @@ -From fc03e0f3c36d4d20e00dfbcd02616a467e4b0a15 Mon Sep 17 00:00:00 2001 +From feabe4c75c5e86dbe2c624da9423f2ad82c6bfac Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> 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 <raj.khem@gmail.com> --- - chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 2 +- + .../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 +index 91f77dd88d..bb84a0b305 100644 --- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h @@ -1929,7 +1929,7 @@ typedef unsigned long int ulong; diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 9a71b7c2..11ee347e 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -124,38 +124,40 @@ RDEPENDS_${PN}-examples += " \ QT_MODULE_BRANCH_CHROMIUM = "65-based" # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.11 -# 5.11.meta-qt5.2 +# 5.11.meta-qt5.6 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 \ file://0002-Include-dependency-to-QCoreApplication-translate.patch \ file://0003-Force-host-toolchain-configuration.patch \ + file://0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch \ " SRC_URI_append_libc-musl = "\ - file://0004-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ - file://0005-musl-link-against-libexecinfo.patch \ + file://0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ + file://0006-musl-link-against-libexecinfo.patch \ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/65-based -# 65-based.meta-qt5.2 +# 65-based.meta-qt5.6 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 \ + file://chromium/0001-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ + file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ + file://chromium/0003-chromium-Fix-build-with-gcc8.patch;patchdir=src/3rdparty \ " SRC_URI_append_libc-musl = "\ - file://0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ - file://0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ - file://0005-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ - file://0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ - file://0007-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ - file://0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ - file://0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \ - file://0010-chromium-musl-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 \ + file://chromium/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ + file://chromium/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ + file://chromium/0006-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ + file://chromium/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ + file://chromium/0008-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ + file://chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ + file://chromium/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \ + file://chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ + file://chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ + file://chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ + file://chromium/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \ + file://chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ " SRCREV_qtwebengine = "fe73e5405716531e85440772f69ad74943024eee" diff --git a/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch b/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch new file mode 100644 index 00000000..dac4815c --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch @@ -0,0 +1,31 @@ +From d9f4d11ffdf1e8b5485aefc3556b1bef3e009587 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Mon, 4 Jun 2018 10:35:46 +0200 +Subject: [PATCH] Do not skip build for cross-compile +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + Tools/qmake/mkspecs/features/functions.prf | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Tools/qmake/mkspecs/features/functions.prf b/Tools/qmake/mkspecs/features/functions.prf +index e3f42cec4..797b7085f 100644 +--- a/Tools/qmake/mkspecs/features/functions.prf ++++ b/Tools/qmake/mkspecs/features/functions.prf +@@ -53,8 +53,6 @@ defineReplace(appleSdkVersion) { + defineTest(isPlatformSupported) { + !qtHaveModule(widgets): skipBuild("QtWidgets module is required to build QtWebKit.") + +- cross_compile: skipBuild("cross-compilation of QtWebKit with qmake is not supported yet") +- + requiredPrograms = cmake gperf python perl bison ruby flex + for(program, requiredPrograms): \ + !programExistsInPath($$program): \ +-- +2.14.3 + diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 36c967f4..9e4617a0 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -1,6 +1,8 @@ require qt5.inc require qt5-git.inc +SRC_URI += "file://0001-Do-not-skip-build-for-cross-compile.patch" + LICENSE = "BSD & LGPLv2+ | GPL-2.0" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ @@ -9,6 +11,8 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf-native" +inherit cmake_qt5 perlnative pythonnative + # qemuarm build fails with: # | {standard input}: Assembler messages: # | {standard input}:106: Error: invalid immediate: 983040 is out of range @@ -24,41 +28,37 @@ ARM_INSTRUCTION_SET_armv7a = "thumb" ARM_INSTRUCTION_SET_armv7r = "thumb" ARM_INSTRUCTION_SET_armv7ve = "thumb" -PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxrender', '', d)} \ - fontconfig \ -" -PACKAGECONFIG[gstreamer] = "OE_GSTREAMER_ENABLED,,gstreamer1.0 gstreamer1.0-plugins-base" -PACKAGECONFIG[gstreamer010] = "OE_GSTREAMER010_ENABLED,,gstreamer gst-plugins-base" -PACKAGECONFIG[qtlocation] = "OE_QTLOCATION_ENABLED,,qtlocation" -PACKAGECONFIG[qtmultimedia] = "OE_QTMULTIMEDIA_ENABLED,,qtmultimedia" -PACKAGECONFIG[qtsensors] = "OE_QTSENSORS_ENABLED,,qtsensors" -PACKAGECONFIG[qtwebchannel] = "OE_QTWEBCHANNEL_ENABLED,,qtwebchannel" -PACKAGECONFIG[libwebp] = "OE_LIBWEBP_ENABLED,,libwebp" -PACKAGECONFIG[libxcomposite] = "OE_LIBXCOMPOSITE_ENABLED,,libxcomposite" -PACKAGECONFIG[libxrender] = "OE_LIBXRENDER_ENABLED,,libxrender" -PACKAGECONFIG[fontconfig] = "OE_FONTCONFIG_ENABLED,,fontconfig" +# http://errors.yoctoproject.org/Errors/Details/179245/ +# just use -fpermissive in this case like fedora did: +# https://bugzilla.redhat.com/show_bug.cgi?id=1582954 +CXXFLAGS += "-fpermissive" -do_configure_prepend() { - export QMAKE_CACHE_EVAL="CONFIG+=${PACKAGECONFIG_CONFARGS}" -} +EXTRA_OECMAKE = " \ + -DPORT=Qt \ + -DECM_MKSPECS_INSTALL_DIR=${libdir}${QT_DIR_NAME}/mkspecs/modules \ + -DQML_INSTALL_DIR=${OE_QMAKE_PATH_QML} \ +" -# Forcibly enable ICU, so qtbase doesn't need it. -EXTRA_QMAKEVARS_PRE += "QT_CONFIG+=icu" +PACKAGECONFIG ??= "qtlocation qtmultimedia qtsensors qtwebchannel \ + ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ + fontconfig \ +" -# qtwebkit gets terribly big when linking with all debug info, disable by default -QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0" -EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" +# gstreamer conflicts with qtmultimedia! +PACKAGECONFIG[gstreamer] = "-DUSE_GSTREAMER=ON,-DUSE_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[qtlocation] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,qtlocation" +PACKAGECONFIG[qtmultimedia] = "-DUSE_QT_MULTIMEDIA=ON,-DUSE_QT_MULTIMEDIA=OFF,qtmultimedia" +PACKAGECONFIG[qtsensors] = "-DENABLE_DEVICE_ORIENTATION=ON,-DENABLE_DEVICE_ORIENTATION=OFF,qtsensors" +PACKAGECONFIG[qtwebchannel] = "-DENABLE_QT_WEBCHANNEL=ON,-DENABLE_QT_WEBCHANNEL=OFF,qtwebchannel" +PACKAGECONFIG[libwebp] = ",,libwebp" +PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,libxcomposite libxrender" +PACKAGECONFIG[fontconfig] = "-DENABLE_TEST_SUPPORT=ON,-DENABLE_TEST_SUPPORT=OFF,fontconfig" +# hyphen is only in meta-office currently! +PACKAGECONFIG[hyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,hyphen" # 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" -# make sure rb files are used from sysroot, not from host -# ruby-1.9.3-always-use-i386.patch is doing target_cpu=`echo $target_cpu | sed s/i.86/i386/` -# we need to replace it too (a bit longer version without importing re) -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 = "dev" SRCREV = "beaeeb99881184fd368c121fcbb1a31c78b794a3" |