diff options
69 files changed, 160 insertions, 505 deletions
diff --git a/recipes-qt/qt5/qt3d-runtime_git.bb b/recipes-qt/qt5/qt3d-runtime_git.bb index 78f2aec1..2b017106 100644 --- a/recipes-qt/qt5/qt3d-runtime_git.bb +++ b/recipes-qt/qt5/qt3d-runtime_git.bb | |||
@@ -11,8 +11,8 @@ SRC_URI += "file://0001-runtime-Include-missing-QCoreApplication-header.patch" | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtdeclarative qt3d" | 12 | DEPENDS += "qtbase qtdeclarative qt3d" |
13 | 13 | ||
14 | QT_MODULE_BRANCH = "2.0" | 14 | QT_MODULE_BRANCH = "2.2" |
15 | QT_GIT_PROJECT = "qt3dstudio" | 15 | QT_GIT_PROJECT = "qt3dstudio" |
16 | PV = "2.0+git${SRCPV}" | 16 | PV = "2.2+git${SRCPV}" |
17 | 17 | ||
18 | SRCREV = "ed19232a75b371727c76a9ad8a56f211a0b827ec" | 18 | SRCREV = "8cdb99c910f2f57972b652c3fb8d520ba615f110" |
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 0189a9dc..144c9a78 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 @@ | |||
1 | From 72d96957995393312ad29920d67fa758d0e53ca5 Mon Sep 17 00:00:00 2001 | 1 | From d3053e33c76cdb41eeeec3c853fa88c7c7bfb8a5 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Fri, 17 Aug 2018 13:23:58 +0300 | 3 | Date: Fri, 17 Aug 2018 13:23:58 +0300 |
4 | Subject: [PATCH] Allow a tools-only build | 4 | Subject: [PATCH] Allow a tools-only build |
@@ -10,12 +10,12 @@ Subject: [PATCH] Allow a tools-only build | |||
10 | 3 files changed, 8 insertions(+), 3 deletions(-) | 10 | 3 files changed, 8 insertions(+), 3 deletions(-) |
11 | 11 | ||
12 | diff --git a/qt3d.pro b/qt3d.pro | 12 | diff --git a/qt3d.pro b/qt3d.pro |
13 | index 2cc347a1c..81cdeefb0 100644 | 13 | index 3fc7d1452..7311eff5b 100644 |
14 | --- a/qt3d.pro | 14 | --- a/qt3d.pro |
15 | +++ b/qt3d.pro | 15 | +++ b/qt3d.pro |
16 | @@ -1,4 +1,4 @@ | 16 | @@ -1,4 +1,4 @@ |
17 | -requires(qtConfig(opengl)) | 17 | -requires(qtConfig(opengl):!wasm) |
18 | +!tools-only:requires(qtConfig(opengl)) | 18 | +!tools-only:requires(qtConfig(opengl):!wasm) |
19 | 19 | ||
20 | CONFIG += examples_need_tools | 20 | CONFIG += examples_need_tools |
21 | load(qt_parts) | 21 | load(qt_parts) |
@@ -40,13 +40,13 @@ index 8ba2d9a41..e973d93dd 100644 | |||
40 | } else { | 40 | } else { |
41 | include(assimp.pri) | 41 | include(assimp.pri) |
42 | diff --git a/tools/tools.pro b/tools/tools.pro | 42 | diff --git a/tools/tools.pro b/tools/tools.pro |
43 | index c2f692034..24c49ad5a 100644 | 43 | index 121507613..24c49ad5a 100644 |
44 | --- a/tools/tools.pro | 44 | --- a/tools/tools.pro |
45 | +++ b/tools/tools.pro | 45 | +++ b/tools/tools.pro |
46 | @@ -1,5 +1,5 @@ | 46 | @@ -1,5 +1,5 @@ |
47 | TEMPLATE = subdirs | 47 | TEMPLATE = subdirs |
48 | QT_FOR_CONFIG += 3dcore-private | 48 | QT_FOR_CONFIG += 3dcore-private |
49 | -qtConfig(assimp):qtConfig(commandlineparser):!cross_compile: { | 49 | -qtConfig(assimp):qtConfig(commandlineparser): { |
50 | +tools-only|qtConfig(assimp):qtConfig(commandlineparser): { | 50 | +tools-only|qtConfig(assimp):qtConfig(commandlineparser): { |
51 | SUBDIRS += qgltf | 51 | SUBDIRS += qgltf |
52 | } | 52 | } |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index d455fef3..a5588840 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = " \ | |||
11 | DEPENDS += "qtbase" | 11 | DEPENDS += "qtbase" |
12 | DEPENDS_class-target += "qtdeclarative qt3d-native" | 12 | DEPENDS_class-target += "qtdeclarative qt3d-native" |
13 | 13 | ||
14 | # Patches from https://github.com/meta-qt5/qt3d/commits/b5.11 | 14 | # Patches from https://github.com/meta-qt5/qt3d/commits/b5.12 |
15 | # 5.11.meta-qt5.6 | 15 | # 5.12.meta-qt5.1 |
16 | SRC_URI += " \ | 16 | SRC_URI += " \ |
17 | file://0001-Allow-a-tools-only-build.patch \ | 17 | file://0001-Allow-a-tools-only-build.patch \ |
18 | " | 18 | " |
@@ -36,6 +36,6 @@ do_configure_prepend() { | |||
36 | ${S}/src/quick3d/imports/input/importsinput.pro | 36 | ${S}/src/quick3d/imports/input/importsinput.pro |
37 | } | 37 | } |
38 | 38 | ||
39 | SRCREV = "cd3e621ccf56bb8262f9c8cd967e05bf41934060" | 39 | SRCREV = "338addb5a79c32d5b7b3013746c6d5250e1581fe" |
40 | 40 | ||
41 | BBCLASSEXTEND += "native nativesdk" | 41 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 53a679fc..dcc102a9 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -59,7 +59,6 @@ XPLATFORM ?= "linux-oe-g++" | |||
59 | PACKAGECONFIG_CONFARGS = " \ | 59 | PACKAGECONFIG_CONFARGS = " \ |
60 | -sysroot ${STAGING_DIR_NATIVE} \ | 60 | -sysroot ${STAGING_DIR_NATIVE} \ |
61 | -no-gcc-sysroot \ | 61 | -no-gcc-sysroot \ |
62 | -system-zlib \ | ||
63 | -qt-pcre \ | 62 | -qt-pcre \ |
64 | -no-libjpeg \ | 63 | -no-libjpeg \ |
65 | -no-libpng \ | 64 | -no-libpng \ |
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 744bef61..b11e355f 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS = "qtdeclarative" | 12 | DEPENDS = "qtdeclarative" |
13 | 13 | ||
14 | SRCREV = "8726c86872134cf4b4396fa5e7ca8eba4ef37ed4" | 14 | SRCREV = "f0552b1eb14568fa6802191d13a1123effdbb636" |
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 9e99f4c1..db91b59f 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ | |||
8 | 8 | ||
9 | DEPENDS += "qtbase qtdeclarative qtmultimedia" | 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia" |
10 | 10 | ||
11 | SRCREV = "444aeb81f2555a37d94862ceaaa8295c5c7ddddd" | 11 | SRCREV = "b36af85eac67c2e92b35849b34d913ee0290cd2b" |
12 | 12 | ||
13 | # The same issue as in qtbase: | 13 | # The same issue as in qtbase: |
14 | # http://errors.yoctoproject.org/Errors/Details/152641/ | 14 | # http://errors.yoctoproject.org/Errors/Details/152641/ |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 0e13bfd5..edf93a9f 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb | |||
@@ -19,6 +19,6 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" | |||
19 | 19 | ||
20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
21 | 21 | ||
22 | SRCREV = "d1cf8dad0e6d8d08b5c6f2f08d85a0e75b0bcf8a" | 22 | SRCREV = "e9967647ffe20df0473a1fa9eb10957b4e32fbf3" |
23 | 23 | ||
24 | SRC_URI += "file://0001-Ignore-clang-warning-about-address-of-temp-in-config.patch" | 24 | SRC_URI += "file://0001-Ignore-clang-warning-about-address-of-temp-in-config.patch" |
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 8c2806a6..140be8a1 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb | |||
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ | |||
8 | 8 | ||
9 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" | 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" |
10 | 10 | ||
11 | SRCREV = "a04bbfd93159963aa505f96425e85a2a83b0b10a" | 11 | SRCREV = "20f42d4c87162992fc2322e65aee1a1e2b1f28a2" |
diff --git a/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch b/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch deleted file mode 100644 index a734f8a2..00000000 --- a/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 260e165993fe15a1668cfd36caee18a95b2d2f59 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Mon, 2 Jul 2018 13:32:44 +0300 | ||
4 | Subject: [PATCH] Always use commit sha1 for QML_COMPILE_HASH | ||
5 | |||
6 | git describe can produce different strings for the same sha1, depending | ||
7 | on the version of git (length of short hash) and whether release tag was | ||
8 | in place when build was done (v5.11.1-0- vs. v5.11.0-66-). | ||
9 | |||
10 | Instead use rev-parse to get the unambiguous commit sha1 which is also | ||
11 | what is used from the .tag file. | ||
12 | |||
13 | Change-Id: If378f03eb764e2d858bda5b662106aa4402d6559 | ||
14 | Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> | ||
15 | --- | ||
16 | src/qml/qml.pro | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/src/qml/qml.pro b/src/qml/qml.pro | ||
20 | index 940ebb325..a76a87b15 100644 | ||
21 | --- a/src/qml/qml.pro | ||
22 | +++ b/src/qml/qml.pro | ||
23 | @@ -31,7 +31,7 @@ DEFINES += QT_NO_FOREACH | ||
24 | !equals(tag, "$${LITERAL_DOLLAR}Format:%H$${LITERAL_DOLLAR}") { | ||
25 | QML_COMPILE_HASH = $$tag | ||
26 | } else:exists($$PWD/../../.git) { | ||
27 | - commit = $$system(git describe --tags --always --long --dirty) | ||
28 | + commit = $$system(git rev-parse HEAD) | ||
29 | QML_COMPILE_HASH = $$commit | ||
30 | } | ||
31 | compile_hash_contents = \ | ||
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 7c5490cb..b09e96e7 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -12,8 +12,6 @@ LIC_FILES_CHKSUM = " \ | |||
12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
13 | " | 13 | " |
14 | 14 | ||
15 | SRC_URI += "file://0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch" | ||
16 | |||
17 | DEPENDS += "qtbase" | 15 | DEPENDS += "qtbase" |
18 | 16 | ||
19 | PACKAGECONFIG ??= "qtxmlpatterns qml-debug qml-network ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)}" | 17 | PACKAGECONFIG ??= "qtxmlpatterns qml-debug qml-network ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)}" |
@@ -35,6 +33,6 @@ do_install_append_class-nativesdk() { | |||
35 | 33 | ||
36 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 34 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
37 | 35 | ||
38 | SRCREV = "e3c0bb7811407bad1f65ea55639a4b1d1d39be15" | 36 | SRCREV = "c401ae278b4bb91c70c6d7df974a241d7c68855b" |
39 | 37 | ||
40 | BBCLASSEXTEND =+ "native nativesdk" | 38 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 7708f433..b9b7c1cf 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb | |||
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" | |||
14 | 14 | ||
15 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 15 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
16 | 16 | ||
17 | SRCREV = "4005b78c2bde8fd9cf1cbe3155cbe6c33f576111" | 17 | SRCREV = "2d532f3d84654e75273af4a5a34310413555e00f" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index ef4d59b4..75056d98 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb | |||
@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = "" | |||
18 | # http://errors.yoctoproject.org/Errors/Build/44912/ | 18 | # http://errors.yoctoproject.org/Errors/Build/44912/ |
19 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 19 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
20 | 20 | ||
21 | SRCREV = "d560b79d050659715159d5f04b2e96fd38d0230c" | 21 | SRCREV = "5b24291329cdbd19b795b4c3d8aafc4ffd916a2d" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 09d52213..f466b75d 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb | |||
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = " \ | |||
11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | 11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ |
12 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ | 12 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ |
13 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | 13 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
14 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | ||
15 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 14 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
16 | " | 15 | " |
17 | 16 | ||
@@ -26,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" | |||
26 | 25 | ||
27 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
28 | 27 | ||
29 | SRCREV = "335dc6af7d24c1731cbd7e03a21e66c70d81760d" | 28 | SRCREV = "178b8572d71a34975ffd7ada87227e1b8ed7296e" |
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index 7a52bed9..94a991dc 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb | |||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | SRCREV = "dea2cde014f2a74390a444d9d59e6deb2801c40b" | 12 | SRCREV = "3c6e84d7b39014d5df6750f096bc31a5b24e164b" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 5373aaad..88dfa67c 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -31,7 +31,7 @@ SRC_URI += " \ | |||
31 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ | 31 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ |
32 | " | 32 | " |
33 | 33 | ||
34 | SRCREV_qtlocation = "ffac0dc5a60c93663f6a4ea5483422c58cdb52b6" | 34 | SRCREV_qtlocation = "a4442abdc034de7984e003c821939ce1b1976593" |
35 | SRCREV_qtlocation-mapboxgl = "b59b0450c60b3df9e0852f62f6c8a6024889cd9e" | 35 | SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" |
36 | 36 | ||
37 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 37 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index 23a450b0..6f05ac37 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb | |||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | SRCREV = "7e0587f9b4906976ec0397768b0378573fbf2fff" | 12 | SRCREV = "bf30507ef17445b464abe230f4bf349d732fbfd1" |
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 56c8e684..74e12360 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 @@ | |||
1 | From c5103b4f832be57759f475d05c98f946d150c39d Mon Sep 17 00:00:00 2001 | 1 | From d581392ff8c849a8773fc4ae784f78a885a658e1 Mon Sep 17 00:00:00 2001 |
2 | From: Wenlin Kang <wenlin.kang@windriver.com> | 2 | From: Wenlin Kang <wenlin.kang@windriver.com> |
3 | Date: Thu, 8 Sep 2016 12:18:13 +0800 | 3 | Date: Thu, 8 Sep 2016 12:18:13 +0800 |
4 | Subject: [PATCH] qtmultimedia: fix a conflicting declaration | 4 | Subject: [PATCH] qtmultimedia: fix a conflicting declaration |
@@ -67,7 +67,7 @@ index 00000000..24236976 | |||
67 | + | 67 | + |
68 | +#endif | 68 | +#endif |
69 | diff --git a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp | 69 | diff --git a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp |
70 | index 465ccfa7..40e7592b 100644 | 70 | index 4b68f47a..dade1382 100644 |
71 | --- a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp | 71 | --- a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp |
72 | +++ b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp | 72 | +++ b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp |
73 | @@ -37,8 +37,9 @@ | 73 | @@ -37,8 +37,9 @@ |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index ba7d1543..11de21f9 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -27,8 +27,8 @@ EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstream | |||
27 | 27 | ||
28 | CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}" | 28 | CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}" |
29 | 29 | ||
30 | # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.11 | 30 | # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.12 |
31 | # 5.11.meta-qt5.6 | 31 | # 5.12.meta-qt5.1 |
32 | SRC_URI += "\ | 32 | SRC_URI += "\ |
33 | file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ | 33 | file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ |
34 | " | 34 | " |
@@ -37,4 +37,4 @@ SRC_URI += "\ | |||
37 | # http://errors.yoctoproject.org/Errors/Build/44914/ | 37 | # http://errors.yoctoproject.org/Errors/Build/44914/ |
38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
39 | 39 | ||
40 | SRCREV = "6966a09c9a6a2c134a739446cc582e47d0c6ed6d" | 40 | SRCREV = "7b0b5bb0b9e15ad54b061ee39712ce86235535d5" |
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 2296a997..258fe10e 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb | |||
@@ -9,4 +9,4 @@ require qt5-git.inc | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | SRCREV = "90ae677b45570e45adc9d03ba9967065fdfa0432" | 12 | SRCREV = "71318ed079ddf7c0c3af9d70f64b9519e23b7499" |
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index 69f7ba61..b99c485b 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS += "qtbase" | 11 | DEPENDS += "qtbase" |
12 | 12 | ||
13 | SRCREV = "326bf6a1058d878b7891ee6d7078ed381c462df1" | 13 | SRCREV = "fd6f1d80aa501d8d003018359ce9c023e70732d5" |
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 9f6138bd..b5863bf5 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS += "qtbase qtdeclarative" | 11 | DEPENDS += "qtbase qtdeclarative" |
12 | 12 | ||
13 | SRCREV = "d11d7ff9eff2a68441ff6264b04f37bd862bdd64" | 13 | SRCREV = "2de8d672b596c6a67afc2a72a293a08d0a3912d8" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index b0ea42a9..6969c6ee 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS += "qtdeclarative qtdeclarative-native" | 11 | DEPENDS += "qtdeclarative qtdeclarative-native" |
12 | 12 | ||
13 | SRCREV = "431d605edb48321c71935fbd2bb82d33e231ea55" | 13 | SRCREV = "69f02184a9a71f3a5e2dd1ada12367ddccd29787" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index e66074e1..62efef89 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ | |||
17 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ | 17 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ |
18 | " | 18 | " |
19 | 19 | ||
20 | SRCREV = "6b7f91c097f7e47cf2683d08b5838fd061a872bd" | 20 | SRCREV = "5e2dfd09b3ace43c2f3dc75c56933c7c723b50fb" |
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 a43dbeba..10ebdac9 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 @@ | |||
1 | From cac05ba982e5047c11add015f6f6125863e5226d Mon Sep 17 00:00:00 2001 | 1 | From d278498bae51f730e77fee0c96eb2be8041fedda Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Wed, 7 Jun 2017 15:17:12 +0300 | 3 | Date: Wed, 7 Jun 2017 15:17:12 +0300 |
4 | Subject: [PATCH] Allow a tools-only build | 4 | Subject: [PATCH] Allow a tools-only build |
@@ -23,10 +23,10 @@ index 5e88bf8..6efd19e 100644 | |||
23 | # qtPrepareTool honors QT_TOOL.repc.binary if set | 23 | # qtPrepareTool honors QT_TOOL.repc.binary if set |
24 | qtPrepareTool(QMAKE_REPC, repc) | 24 | qtPrepareTool(QMAKE_REPC, repc) |
25 | diff --git a/qtremoteobjects.pro b/qtremoteobjects.pro | 25 | diff --git a/qtremoteobjects.pro b/qtremoteobjects.pro |
26 | index c2e2b6b..93c2bb5 100644 | 26 | index 454f0d1..7c1d2ee 100644 |
27 | --- a/qtremoteobjects.pro | 27 | --- a/qtremoteobjects.pro |
28 | +++ b/qtremoteobjects.pro | 28 | +++ b/qtremoteobjects.pro |
29 | @@ -2,3 +2,8 @@ CONFIG += examples_need_tools tests_need_tools | 29 | @@ -4,3 +4,8 @@ CONFIG += examples_need_tools tests_need_tools |
30 | load(qt_parts) | 30 | load(qt_parts) |
31 | 31 | ||
32 | SUBDIRS += mkspecs | 32 | SUBDIRS += mkspecs |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index c93463ee..0b177de1 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb | |||
@@ -11,8 +11,8 @@ require qt5-git.inc | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" | 12 | DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" |
13 | 13 | ||
14 | # Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.11 | 14 | # Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.12 |
15 | # 5.11.meta-qt5.6 | 15 | # 5.12.meta-qt5.1 |
16 | SRC_URI += " \ | 16 | SRC_URI += " \ |
17 | file://0001-Allow-a-tools-only-build.patch \ | 17 | file://0001-Allow-a-tools-only-build.patch \ |
18 | " | 18 | " |
@@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" | |||
24 | 24 | ||
25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
26 | 26 | ||
27 | SRCREV = "92ae729691f6db9fb06b0475509dc1141ac3d93c" | 27 | SRCREV = "5bc5f04be23237f9d55b2134ae55bd93bed342a0" |
28 | 28 | ||
29 | BBCLASSEXTEND += "native nativesdk" | 29 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch b/recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch deleted file mode 100644 index d724496e..00000000 --- a/recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From 028ec1bdce6dde67cc1486e5bee311b69354e41e Mon Sep 17 00:00:00 2001 | ||
2 | From: Alistair Francis <alistair.francis@wdc.com> | ||
3 | Date: Wed, 18 Jul 2018 14:26:21 -0700 | ||
4 | Subject: [PATCH] 3rdparty/javascriptcore: Add RISC-V support | ||
5 | |||
6 | Signed-off-by: Alistair Francis <alistair.francis@wdc.com> | ||
7 | Change-Id: I81f15084ef6b5b8d855c1f568cacca176af51b57 | ||
8 | Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> | ||
9 | |||
10 | Upstream-Status: Backport | ||
11 | --- | ||
12 | .../javascriptcore/JavaScriptCore/wtf/Platform.h | 14 ++++++++++++-- | ||
13 | 1 file changed, 12 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | ||
16 | index 00caa6d..96942c7 100644 | ||
17 | --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | ||
18 | +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | ||
19 | @@ -397,6 +397,16 @@ | ||
20 | #endif | ||
21 | #endif /* __mips__ */ | ||
22 | |||
23 | +/* CPU(RISCV64) - RISC-V 64-bit */ | ||
24 | +#if defined(__riscv) && __riscv_xlen == 64 | ||
25 | +#define WTF_CPU_RISCV64 1 | ||
26 | +#endif | ||
27 | + | ||
28 | +/* CPU(RISCV32) - RISC-V 32-bit */ | ||
29 | +#if defined(__riscv) && __riscv_xlen == 32 | ||
30 | +#define WTF_CPU_RISCV32 1 | ||
31 | +#endif | ||
32 | + | ||
33 | /* ==== OS() - underlying operating system; only to be used for mandated low-level services like | ||
34 | virtual memory, not to choose a GUI toolkit ==== */ | ||
35 | |||
36 | @@ -948,9 +958,9 @@ | ||
37 | #endif | ||
38 | |||
39 | #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) | ||
40 | -#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) | ||
41 | +#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) || CPU(RISCV64) | ||
42 | #define WTF_USE_JSVALUE64 1 | ||
43 | -#elif CPU(ARM) || CPU(PPC64) | ||
44 | +#elif CPU(ARM) || CPU(PPC64) || CPU(RISCV32) | ||
45 | #define WTF_USE_JSVALUE32 1 | ||
46 | #elif OS(WINDOWS) && COMPILER(MINGW) | ||
47 | /* Using JSVALUE32_64 causes padding/alignement issues for JITStubArg | ||
diff --git a/recipes-qt/qt5/qtscript/0002-Include-asm-sgidefs.h-on-non-glibc-systems.patch b/recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch index 3cb91726..287983c6 100644 --- a/recipes-qt/qt5/qtscript/0002-Include-asm-sgidefs.h-on-non-glibc-systems.patch +++ b/recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e9b8d8d23681cfef9efbb654ecea2eeb128a9d00 Mon Sep 17 00:00:00 2001 | 1 | From e60c7bff6556d9c36952de525a85c479a30f0030 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 23 Aug 2018 02:58:14 +0000 | 3 | Date: Thu, 23 Aug 2018 02:58:14 +0000 |
4 | Subject: [PATCH] Include asm/sgidefs.h on non-glibc systems | 4 | Subject: [PATCH] Include asm/sgidefs.h on non-glibc systems |
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index e172ba33..ed2f82ec 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb | |||
@@ -11,11 +11,10 @@ LIC_FILES_CHKSUM = " \ | |||
11 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ | 11 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ |
12 | " | 12 | " |
13 | 13 | ||
14 | # Patches from https://github.com/meta-qt5/qtscript/commits/b5.11 | 14 | # Patches from https://github.com/meta-qt5/qtscript/commits/b5.12 |
15 | # 5.11.meta-qt5.2 | 15 | # 5.12.meta-qt5.1 |
16 | SRC_URI += " \ | 16 | SRC_URI += " \ |
17 | file://0001-3rdparty-javascriptcore-Add-RISC-V-support.patch \ | 17 | file://0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch \ |
18 | file://0002-Include-asm-sgidefs.h-on-non-glibc-systems.patch \ | ||
19 | " | 18 | " |
20 | 19 | ||
21 | # qemuarm build fails with: | 20 | # qemuarm build fails with: |
@@ -37,4 +36,4 @@ DEPENDS += "qtbase" | |||
37 | # http://errors.yoctoproject.org/Errors/Build/44915/ | 36 | # http://errors.yoctoproject.org/Errors/Build/44915/ |
38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 37 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
39 | 38 | ||
40 | SRCREV = "cf09bc7285793d81a9755bf7e807c9d51d47d980" | 39 | SRCREV = "0be84da60090e9d20ec0066bcd3900ca5572df95" |
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 355cbe12..f04dec06 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 @@ | |||
1 | From ed4d6708cc72311f697d6d27556de7dfc77cfcd0 Mon Sep 17 00:00:00 2001 | 1 | From 3b1f1645e82aa1aa109a254f8ccfb789bff23ebf Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Tue, 10 Jan 2017 15:28:26 +0200 | 3 | Date: Tue, 10 Jan 2017 15:28:26 +0200 |
4 | Subject: [PATCH] Use external host bin path for cmake file | 4 | 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 dcb1113c..2eab9126 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb | |||
@@ -10,10 +10,10 @@ require qt5-git.inc | |||
10 | 10 | ||
11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" | 11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" |
12 | 12 | ||
13 | SRCREV = "b99d699a8e1fe1a2968edafa6f0154a2581c2143" | 13 | SRCREV = "1043e8abd566aa92f63acedbe188a51e83b9555c" |
14 | 14 | ||
15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.11 | 15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 |
16 | # 5.11.meta-qt5.6 | 16 | # 5.12.meta-qt5.1 |
17 | SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" | 17 | SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" |
18 | 18 | ||
19 | do_install_append_class-nativesdk() { | 19 | do_install_append_class-nativesdk() { |
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 5fdd6f97..473dee59 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase qtdeclarative" | 13 | DEPENDS += "qtbase qtdeclarative" |
14 | 14 | ||
15 | SRCREV = "0dab0ff3d33292bc1647ebb68dbeb8556707b5ad" | 15 | SRCREV = "36d12d57b0b291b660b2bdb9e1b3ae855e2fc4c0" |
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index c7d1fe8b..054f5bc8 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtserialport" | 12 | DEPENDS += "qtbase qtserialport" |
13 | 13 | ||
14 | SRCREV = "857ed94b55b59859f41c55076c51e92f163cb9f7" | 14 | SRCREV = "ce265ff81223bf7a5978e66dba59fb4b10469b9e" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 612571c2..1b7eb3cd 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
14 | 14 | ||
15 | SRCREV = "5e3f1365813079f1a9a9af284b6a40bd9df8e1c0" | 15 | SRCREV = "a15a7f1362454a575a4420cdd89498f42055fe48" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 0e77d635..f663e31d 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb | |||
@@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = " \ | |||
7 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ | 7 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ |
8 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ | 8 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ |
9 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | 9 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
10 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | ||
11 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
12 | " | 11 | " |
13 | 12 | ||
14 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
15 | 14 | ||
16 | SRCREV = "ab492718dec3b54fce736b642dc6975d9b0046af" | 15 | SRCREV = "aa7431fdabc0434bc30ae8af0753be8c1cb9b576" |
diff --git a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch index 37ab7dbf..de1b645f 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 @@ | |||
1 | From 9cdaa2696552e90bac815889bf6fe45bc9637ca1 Mon Sep 17 00:00:00 2001 | 1 | From 6bb830c68a7a530f0a18b9ceb4ef65eed0787fa5 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Wed, 4 Jun 2014 11:28:16 +0200 | 3 | Date: Wed, 4 Jun 2014 11:28:16 +0200 |
4 | Subject: [PATCH] add noqtwebkit configuration | 4 | Subject: [PATCH] add noqtwebkit configuration |
diff --git a/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch index 7be76a30..c1f14d4a 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 @@ | |||
1 | From 1b52ee8efd23b61cae9ab843efd75ced21fed04f Mon Sep 17 00:00:00 2001 | 1 | From cc5d0bc4434805fc78e9e7045810c1e0c323ad61 Mon Sep 17 00:00:00 2001 |
2 | From: Cody P Schafer <dev@codyps.com> | 2 | From: Cody P Schafer <dev@codyps.com> |
3 | Date: Thu, 9 Jul 2015 11:28:19 -0400 | 3 | Date: Thu, 9 Jul 2015 11:28:19 -0400 |
4 | Subject: [PATCH] linguist-tools cmake: allow overriding the location for | 4 | Subject: [PATCH] linguist-tools cmake: allow overriding the location for |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 2885d9e4..325535ad 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -14,8 +14,8 @@ LIC_FILES_CHKSUM = " \ | |||
14 | 14 | ||
15 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns" | 15 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns" |
16 | 16 | ||
17 | # Patches from https://github.com/meta-qt5/qttools/commits/b5.11 | 17 | # Patches from https://github.com/meta-qt5/qttools/commits/b5.12 |
18 | # 5.11.meta-qt5.6 | 18 | # 5.12.meta-qt5.1 |
19 | SRC_URI += " \ | 19 | SRC_URI += " \ |
20 | file://0001-add-noqtwebkit-configuration.patch \ | 20 | file://0001-add-noqtwebkit-configuration.patch \ |
21 | file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \ | 21 | file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \ |
@@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ | |||
32 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ | 32 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ |
33 | " | 33 | " |
34 | 34 | ||
35 | SRCREV = "ddc4fba789c21bd0ebca180fa9d7cde399a49e37" | 35 | SRCREV = "4e823c69ec36b648d6126ae5ec031f58d1372ab4" |
36 | 36 | ||
37 | BBCLASSEXTEND = "native nativesdk" | 37 | BBCLASSEXTEND = "native nativesdk" |
38 | 38 | ||
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 6689ab14..2fbf2344 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb | |||
@@ -103,4 +103,4 @@ FILES_${PN}-qthelp = " \ | |||
103 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ | 103 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ |
104 | " | 104 | " |
105 | 105 | ||
106 | SRCREV = "ed5110171ca294207f341f46610c716170c06282" | 106 | SRCREV = "074b73089a4d8e4966ddcab5cdd5e9ec0ac6181a" |
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 52d60ff5..1ea12ee5 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb | |||
@@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" | |||
49 | 49 | ||
50 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" | 50 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" |
51 | 51 | ||
52 | SRCREV = "a8cab520dc7bedff73ec60a5a189b21cdf01f083" | 52 | SRCREV = "5aaf55adcf3742e05283274ce1b8c721c7da7c8d" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 91bb1cd5..699eac02 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -37,7 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature | |||
37 | 37 | ||
38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
39 | 39 | ||
40 | SRCREV = "9ce3088d226fddc18bcac170fa5cc5be3c29e371" | 40 | SRCREV = "1dc85b95ab0adc1e805d059e2c35c671ef790011" |
41 | 41 | ||
42 | BBCLASSEXTEND =+ "native nativesdk" | 42 | BBCLASSEXTEND =+ "native nativesdk" |
43 | 43 | ||
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 7aa6cc63..a2922918 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtdeclarative qtwebsockets" | 13 | DEPENDS += "qtdeclarative qtwebsockets" |
14 | 14 | ||
15 | SRCREV = "94fee0eaa3a5ce98bae8e5d68c91c0366fa94cdc" | 15 | SRCREV = "a7bb269981ad50bd4e8140aa1d9af9e5abd0784d" |
diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch index 86f37e1a..b51c4c72 100644 --- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7c9b995ee8bc8798e41a14cb8007c06073006e64 Mon Sep 17 00:00:00 2001 | 1 | From a321d1b96ce0563a08d0bb44c39d24f86608f6ae Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 | 3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 |
4 | Subject: [PATCH] Force host toolchain configuration | 4 | Subject: [PATCH] Force host toolchain configuration |
@@ -57,10 +57,10 @@ index dd0d3e32..70161c82 100644 | |||
57 | " nm = \"$$which(nm)\" " \ | 57 | " nm = \"$$which(nm)\" " \ |
58 | " toolchain_args = { " \ | 58 | " toolchain_args = { " \ |
59 | diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri | 59 | diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri |
60 | index 4ade2827..cad3d7bf 100644 | 60 | index 85b948db..c529c641 100644 |
61 | --- a/src/core/config/linux.pri | 61 | --- a/src/core/config/linux.pri |
62 | +++ b/src/core/config/linux.pri | 62 | +++ b/src/core/config/linux.pri |
63 | @@ -92,7 +92,7 @@ contains(QT_ARCH, "mips") { | 63 | @@ -112,7 +112,7 @@ contains(QT_ARCH, "mips") { |
64 | 64 | ||
65 | host_build { | 65 | host_build { |
66 | gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" | 66 | gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" |
diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch b/recipes-qt/qt5/qtwebengine/0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch deleted file mode 100644 index 5ae32d59..00000000 --- a/recipes-qt/qt5/qtwebengine/0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | From 3eaf551ec5f68933c636404945e6404e2508160b Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sun, 10 Jun 2018 10:26:17 +0000 | ||
4 | Subject: [PATCH] chromium_overrides.cpp: Fix build with plugins and ozone | ||
5 | enabled | ||
6 | |||
7 | * otherwise it fails with: | ||
8 | | 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' | ||
9 | | creating linker version script QtWebEngineCore.version | ||
10 | | rm -f libQt5WebEngineCore.so.5.10.1 libQt5WebEngineCore.so libQt5WebEngineCore.so.5 libQt5WebEngineCore.so.5.10 | ||
11 | | linking ../../lib/libQt5WebEngineCore.so.5.10.1 | ||
12 | | /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> > > >*)' | ||
13 | | /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 | ||
14 | | /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> >*)' | ||
15 | | /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 | ||
16 | | collect2: error: ld returned 1 exit status | ||
17 | | Makefile.core_module:74: recipe for target '../../lib/libQt5WebEngineCore.so.5.10.1' failed | ||
18 | | make[3]: *** [../../lib/libQt5WebEngineCore.so.5.10.1] Error 1 | ||
19 | | 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' | ||
20 | | Makefile:122: recipe for target 'sub-core_module-pro-make_first' failed | ||
21 | | make[2]: *** [sub-core_module-pro-make_first] Error 2 | ||
22 | | 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' | ||
23 | | Makefile:78: recipe for target 'sub-core-make_first' failed | ||
24 | | make[1]: *** [sub-core-make_first] Error 2 | ||
25 | | 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' | ||
26 | | Makefile:46: recipe for target 'sub-src-make_first' failed | ||
27 | | make: *** [sub-src-make_first] Error 2 | ||
28 | | ERROR: oe_runmake failed | ||
29 | | 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' | ||
30 | | 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) | ||
31 | |||
32 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
33 | Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com> | ||
34 | --- | ||
35 | src/core/chromium_overrides.cpp | 2 +- | ||
36 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
37 | |||
38 | diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp | ||
39 | index 8f6687ff..994e2799 100644 | ||
40 | --- a/src/core/chromium_overrides.cpp | ||
41 | +++ b/src/core/chromium_overrides.cpp | ||
42 | @@ -159,7 +159,7 @@ std::unique_ptr<base::ListValue> GetFontList_SlowBlocking() | ||
43 | return std::move(font_list); | ||
44 | } | ||
45 | |||
46 | -#if BUILDFLAG(ENABLE_PLUGINS) | ||
47 | +#if BUILDFLAG(ENABLE_PLUGINS) && !defined(USE_OZONE) | ||
48 | // content/browser/renderer_host/pepper/pepper_truetype_font_list.h | ||
49 | void GetFontFamilies_SlowBlocking(std::vector<std::string> *font_families) | ||
50 | { | ||
diff --git a/recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch index a0a850d5..dbcf4b82 100644 --- a/recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From df92af3dd48877c6a58887de563e65279d213a50 Mon Sep 17 00:00:00 2001 | 1 | From 4b2ee08e04f3012ace2906879eadf0919a1c8d73 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Tue, 12 Dec 2017 16:06:14 +0200 | 3 | Date: Tue, 12 Dec 2017 16:06:14 +0200 |
4 | Subject: [PATCH] musl: don't use pvalloc as it's not available on musl | 4 | Subject: [PATCH] musl: don't use pvalloc as it's not available on musl |
diff --git a/recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch index 489971ae..0dc24557 100644 --- a/recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch +++ b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 0c440d91b394d13188803800b968db28309c1d82 Mon Sep 17 00:00:00 2001 | 1 | From 32960f61c4ab61dae79a94ea19d5dbdb43ac481b Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Thu, 14 Dec 2017 11:28:10 +0200 | 3 | Date: Thu, 14 Dec 2017 11:28:10 +0200 |
4 | Subject: [PATCH] musl: link against libexecinfo | 4 | Subject: [PATCH] musl: link against libexecinfo |
@@ -10,10 +10,10 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | |||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 11 | ||
12 | diff --git a/src/core/core_module.pro b/src/core/core_module.pro | 12 | diff --git a/src/core/core_module.pro b/src/core/core_module.pro |
13 | index d21985e6..eeebeb4f 100644 | 13 | index 3b5d37f2..0882d5fd 100644 |
14 | --- a/src/core/core_module.pro | 14 | --- a/src/core/core_module.pro |
15 | +++ b/src/core/core_module.pro | 15 | +++ b/src/core/core_module.pro |
16 | @@ -54,7 +54,7 @@ linux { | 16 | @@ -51,7 +51,7 @@ linux { |
17 | POST_TARGETDEPS += $$NINJA_TARGETDEPS | 17 | POST_TARGETDEPS += $$NINJA_TARGETDEPS |
18 | 18 | ||
19 | 19 | ||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch index 8bf2140b..d914a862 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a80fc13086a493cc543e29c5d10e976ac7f680d4 Mon Sep 17 00:00:00 2001 | 1 | From f430c2c9b3d38f9150588da6dc154aa2285584e6 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 | 3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 |
4 | Subject: [PATCH] chromium: Force host toolchain configuration | 4 | Subject: [PATCH] chromium: Force host toolchain configuration |
@@ -10,15 +10,15 @@ Upstream-Status: Inappropriate [OE specific] | |||
10 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | 10 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> |
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
12 | --- | 12 | --- |
13 | chromium/tools/gn/bootstrap/bootstrap.py | 6 +++--- | 13 | gn/build/gen.py | 6 +++--- |
14 | 1 file changed, 3 insertions(+), 3 deletions(-) | 14 | 1 file changed, 3 insertions(+), 3 deletions(-) |
15 | 15 | ||
16 | diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py | 16 | diff --git a/gn/build/gen.py b/gn/build/gen.py |
17 | index 93c6446f28c..0fe7e6737d2 100755 | 17 | index 87db4c26bcf..34c853b7f4a 100755 |
18 | --- a/chromium/tools/gn/bootstrap/bootstrap.py | 18 | --- a/gn/build/gen.py |
19 | +++ b/chromium/tools/gn/bootstrap/bootstrap.py | 19 | +++ b/gn/build/gen.py |
20 | @@ -352,10 +352,10 @@ def write_gn_ninja(path, root_gen_dir, options): | 20 | @@ -310,10 +310,10 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot): |
21 | ld = os.environ.get('LD', cxx) | 21 | ld = os.environ.get('LD', 'g++') |
22 | ar = os.environ.get('AR', 'ar -X64') | 22 | ar = os.environ.get('AR', 'ar -X64') |
23 | else: | 23 | else: |
24 | - cc = os.environ.get('CC', 'cc') | 24 | - cc = os.environ.get('CC', 'cc') |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch index 7879e99a..a61a9709 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3931af98b42c87ea474e0e6d0d27753e53d101ca Mon Sep 17 00:00:00 2001 | 1 | From 456ec2647f6af4361b81b2607cd51ebd77c0dea6 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:01:12 -0700 | 3 | Date: Fri, 7 Jul 2017 14:01:12 -0700 |
4 | Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not | 4 | Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/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 deleted file mode 100644 index f80f7b0a..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From 70c519aa0eb4da6565ad78914a8687b6f5bf1bb8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Thu, 30 Mar 2017 11:37:24 +0300 | ||
4 | Subject: [PATCH] chromium: workaround for too long .rps file name | ||
5 | |||
6 | Ninja may fail when the build directory is too long: | ||
7 | |||
8 | ninja: error: WriteFile(__third_party_WebKit_Source_bindings_modules_\ | ||
9 | interfaces_info_individual_modules__home_qt_work_build_build-nitrogen\ | ||
10 | 6x_tmp_work_cortexa9hf-neon-mx6qdl-poky-linux-gnueabi_qtwebengine_5.9\ | ||
11 | .0_gitAUTOINC_29afdb0a34_049134677a-r0_build_src_toolchain_target__ru\ | ||
12 | le.rsp): Unable to create file. File name too long | ||
13 | |||
14 | Task-number: QTBUG-59769 | ||
15 | Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1 | ||
16 | --- | ||
17 | chromium/tools/gn/ninja_action_target_writer.cc | 9 +++++++++ | ||
18 | 1 file changed, 9 insertions(+) | ||
19 | |||
20 | diff --git a/chromium/tools/gn/ninja_action_target_writer.cc b/chromium/tools/gn/ninja_action_target_writer.cc | ||
21 | index bab07c5d2bb..8f889aebc18 100644 | ||
22 | --- a/chromium/tools/gn/ninja_action_target_writer.cc | ||
23 | +++ b/chromium/tools/gn/ninja_action_target_writer.cc | ||
24 | @@ -117,9 +117,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() { | ||
25 | // strictly necessary for regular one-shot actions, but it's easier to | ||
26 | // just always define unique_name. | ||
27 | std::string rspfile = custom_rule_name; | ||
28 | + | ||
29 | + //quick workaround if filename length > 255 - ".rsp", just cut the dirs starting from the end | ||
30 | + //please note ".$unique_name" is not used at the moment | ||
31 | + int pos = 0; | ||
32 | + std::string delimiter("_"); | ||
33 | + while (rspfile.length() > 251 && (pos = rspfile.find_last_of(delimiter)) != std::string::npos) | ||
34 | + rspfile = rspfile.substr(0,pos); | ||
35 | + | ||
36 | if (!target_->sources().empty()) | ||
37 | rspfile += ".$unique_name"; | ||
38 | rspfile += ".rsp"; | ||
39 | + | ||
40 | out_ << " rspfile = " << rspfile << std::endl; | ||
41 | |||
42 | // Response file contents. | ||
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 deleted file mode 100644 index 5323a0f1..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | From ad0dd667c3459538149de4479d18c1793af91d43 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Tue, 5 Jun 2018 13:58:16 +0000 | ||
4 | Subject: [PATCH] chromium: Fix build with gcc8 | ||
5 | |||
6 | --- | ||
7 | chromium/mojo/public/c/system/buffer.h | 2 +- | ||
8 | chromium/mojo/public/c/system/data_pipe.h | 2 +- | ||
9 | chromium/mojo/public/c/system/message_pipe.h | 2 +- | ||
10 | 3 files changed, 3 insertions(+), 3 deletions(-) | ||
11 | |||
12 | diff --git a/chromium/mojo/public/c/system/buffer.h b/chromium/mojo/public/c/system/buffer.h | ||
13 | index 09f6d285f3e..e516a09e498 100644 | ||
14 | --- a/chromium/mojo/public/c/system/buffer.h | ||
15 | +++ b/chromium/mojo/public/c/system/buffer.h | ||
16 | @@ -35,7 +35,7 @@ const MojoCreateSharedBufferOptionsFlags | ||
17 | ((MojoCreateSharedBufferOptionsFlags)0) | ||
18 | #endif | ||
19 | |||
20 | -MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); | ||
21 | +MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); | ||
22 | struct MOJO_ALIGNAS(8) MojoCreateSharedBufferOptions { | ||
23 | uint32_t struct_size; | ||
24 | MojoCreateSharedBufferOptionsFlags flags; | ||
25 | diff --git a/chromium/mojo/public/c/system/data_pipe.h b/chromium/mojo/public/c/system/data_pipe.h | ||
26 | index 62adbea1ea6..76225858ba8 100644 | ||
27 | --- a/chromium/mojo/public/c/system/data_pipe.h | ||
28 | +++ b/chromium/mojo/public/c/system/data_pipe.h | ||
29 | @@ -46,7 +46,7 @@ const MojoCreateDataPipeOptionsFlags MOJO_CREATE_DATA_PIPE_OPTIONS_FLAG_NONE = | ||
30 | ((MojoCreateDataPipeOptionsFlags)0) | ||
31 | #endif | ||
32 | |||
33 | -MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); | ||
34 | +MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); | ||
35 | struct MOJO_ALIGNAS(8) MojoCreateDataPipeOptions { | ||
36 | MOJO_ALIGNAS(4) uint32_t struct_size; | ||
37 | MOJO_ALIGNAS(4) MojoCreateDataPipeOptionsFlags flags; | ||
38 | diff --git a/chromium/mojo/public/c/system/message_pipe.h b/chromium/mojo/public/c/system/message_pipe.h | ||
39 | index f0f69d1025f..364a02971e2 100644 | ||
40 | --- a/chromium/mojo/public/c/system/message_pipe.h | ||
41 | +++ b/chromium/mojo/public/c/system/message_pipe.h | ||
42 | @@ -44,7 +44,7 @@ const MojoCreateMessagePipeOptionsFlags | ||
43 | ((MojoCreateMessagePipeOptionsFlags)0) | ||
44 | #endif | ||
45 | |||
46 | -MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); | ||
47 | +MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); | ||
48 | struct MOJO_ALIGNAS(8) MojoCreateMessagePipeOptions { | ||
49 | uint32_t struct_size; | ||
50 | MojoCreateMessagePipeOptionsFlags flags; | ||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-musl-include-fcntl.h-for-loff_t.patch index 1f9af27e..90440c6c 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-include-fcntl.h-for-loff_t.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-musl-include-fcntl.h-for-loff_t.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 87d8eeb36da32940a57ecf9a94c61f7d749e1058 Mon Sep 17 00:00:00 2001 | 1 | From df12cb20b3e5209cd458835dc105327a13e8e9fe Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:37:49 -0700 | 3 | Date: Fri, 7 Jul 2017 14:37:49 -0700 |
4 | Subject: [PATCH] chromium: musl: include fcntl.h for loff_t | 4 | Subject: [PATCH] chromium: musl: include fcntl.h for loff_t |
@@ -9,10 +9,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
9 | 1 file changed, 1 insertion(+) | 9 | 1 file changed, 1 insertion(+) |
10 | 10 | ||
11 | 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 | 11 | 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 |
12 | index b29ec2d29a7..91f77dd88d4 100644 | 12 | index 13aa415e250..9d1309b836f 100644 |
13 | --- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 13 | --- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h |
14 | +++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 14 | +++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h |
15 | @@ -150,6 +150,7 @@ extern "C" { | 15 | @@ -154,6 +154,7 @@ extern "C" { |
16 | #include <stddef.h> | 16 | #include <stddef.h> |
17 | #include <stdint.h> | 17 | #include <stdint.h> |
18 | #include <string.h> | 18 | #include <string.h> |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-musl-use-off64_t-instead-of-the-internal-__.patch index e7dba73b..9909563a 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-musl-use-off64_t-instead-of-the-internal-__.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 081561227fb55b9a419632b1f6187d9d7bedd8f9 Mon Sep 17 00:00:00 2001 | 1 | From 5dd17cac121ff55167f8fd049e1935b5f80d5b33 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:38:37 -0700 | 3 | Date: Fri, 7 Jul 2017 14:38:37 -0700 |
4 | Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t | 4 | Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t |
@@ -12,19 +12,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
12 | 1 file changed, 5 insertions(+), 5 deletions(-) | 12 | 1 file changed, 5 insertions(+), 5 deletions(-) |
13 | 13 | ||
14 | 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 | 14 | 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 |
15 | index 715c045f66c..edc8cf2db70 100644 | 15 | index 2f6116fa45c..7486a05a272 100755 |
16 | --- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 16 | --- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h |
17 | +++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 17 | +++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h |
18 | @@ -77,7 +77,7 @@ typedef off64_t __off64_t; | 18 | @@ -60,7 +60,7 @@ |
19 | 19 | ||
20 | static inline void* do_mmap64(void *start, size_t length, | 20 | static inline void* do_mmap64(void *start, size_t length, |
21 | int prot, int flags, | 21 | int prot, int flags, |
22 | - int fd, __off64_t offset) __THROW { | 22 | - int fd, __off64_t offset) __THROW { |
23 | + int fd, off64_t offset) __THROW { | 23 | + int fd, off64_t offset) __THROW { |
24 | // The original gperftools uses sys_mmap() here. But, it is not allowed by | 24 | return sys_mmap(start, length, prot, flags, fd, offset); |
25 | // Chromium's sandbox. | 25 | } |
26 | return (void *)syscall(SYS_mmap, start, length, prot, flags, fd, offset); | 26 | |
27 | @@ -90,7 +90,7 @@ static inline void* do_mmap64(void *start, size_t length, | 27 | @@ -71,7 +71,7 @@ static inline void* do_mmap64(void *start, size_t length, |
28 | 28 | ||
29 | static inline void* do_mmap64(void *start, size_t length, | 29 | static inline void* do_mmap64(void *start, size_t length, |
30 | int prot, int flags, | 30 | int prot, int flags, |
@@ -33,7 +33,7 @@ index 715c045f66c..edc8cf2db70 100644 | |||
33 | void *result; | 33 | void *result; |
34 | 34 | ||
35 | // Try mmap2() unless it's not supported | 35 | // Try mmap2() unless it's not supported |
36 | @@ -161,7 +161,7 @@ static inline void* do_mmap64(void *start, size_t length, | 36 | @@ -142,7 +142,7 @@ static inline void* do_mmap64(void *start, size_t length, |
37 | 37 | ||
38 | extern "C" { | 38 | extern "C" { |
39 | void* mmap64(void *start, size_t length, int prot, int flags, | 39 | void* mmap64(void *start, size_t length, int prot, int flags, |
@@ -42,7 +42,7 @@ index 715c045f66c..edc8cf2db70 100644 | |||
42 | ATTRIBUTE_SECTION(malloc_hook); | 42 | ATTRIBUTE_SECTION(malloc_hook); |
43 | void* mmap(void *start, size_t length,int prot, int flags, | 43 | void* mmap(void *start, size_t length,int prot, int flags, |
44 | int fd, off_t offset) __THROW | 44 | int fd, off_t offset) __THROW |
45 | @@ -178,7 +178,7 @@ extern "C" { | 45 | @@ -157,7 +157,7 @@ extern "C" { |
46 | } | 46 | } |
47 | 47 | ||
48 | extern "C" void* mmap64(void *start, size_t length, int prot, int flags, | 48 | extern "C" void* mmap64(void *start, size_t length, int prot, int flags, |
@@ -51,7 +51,7 @@ index 715c045f66c..edc8cf2db70 100644 | |||
51 | MallocHook::InvokePreMmapHook(start, length, prot, flags, fd, offset); | 51 | MallocHook::InvokePreMmapHook(start, length, prot, flags, fd, offset); |
52 | void *result; | 52 | void *result; |
53 | if (!MallocHook::InvokeMmapReplacement( | 53 | if (!MallocHook::InvokeMmapReplacement( |
54 | @@ -189,7 +189,7 @@ extern "C" void* mmap64(void *start, size_t length, int prot, int flags, | 54 | @@ -168,7 +168,7 @@ extern "C" void* mmap64(void *start, size_t length, int prot, int flags, |
55 | return result; | 55 | return result; |
56 | } | 56 | } |
57 | 57 | ||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-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 deleted file mode 100644 index 68eaf23e..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +++ /dev/null | |||
@@ -1,67 +0,0 @@ | |||
1 | From 5532d00e7dcec5529b7510386530cc44bf0b094c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Jul 2017 14:09:06 -0700 | ||
4 | Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | chromium/base/process/process_metrics_posix.cc | 4 ++-- | ||
9 | chromium/base/trace_event/malloc_dump_provider.cc | 3 ++- | ||
10 | chromium/content/child/content_child_helpers.cc | 2 +- | ||
11 | 3 files changed, 5 insertions(+), 4 deletions(-) | ||
12 | |||
13 | diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc | ||
14 | index 73a52d6210d..4867198a503 100644 | ||
15 | --- a/chromium/base/process/process_metrics_posix.cc | ||
16 | +++ b/chromium/base/process/process_metrics_posix.cc | ||
17 | @@ -94,14 +94,14 @@ size_t ProcessMetrics::GetMallocUsage() { | ||
18 | malloc_statistics_t stats = {0}; | ||
19 | malloc_zone_statistics(nullptr, &stats); | ||
20 | return stats.size_in_use; | ||
21 | -#elif defined(OS_LINUX) || defined(OS_ANDROID) | ||
22 | +#elif defined(__GLIBC__) || defined(OS_ANDROID) | ||
23 | struct mallinfo minfo = mallinfo(); | ||
24 | #if defined(USE_TCMALLOC) | ||
25 | return minfo.uordblks; | ||
26 | #else | ||
27 | return minfo.hblkhd + minfo.arena; | ||
28 | #endif | ||
29 | -#elif defined(OS_FUCHSIA) | ||
30 | +#else | ||
31 | // TODO(fuchsia): Not currently exposed. https://crbug.com/735087. | ||
32 | return 0; | ||
33 | #endif | ||
34 | diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc | ||
35 | index ffd519133c2..0c9131e98e4 100644 | ||
36 | --- a/chromium/base/trace_event/malloc_dump_provider.cc | ||
37 | +++ b/chromium/base/trace_event/malloc_dump_provider.cc | ||
38 | @@ -197,6 +197,7 @@ MallocDumpProvider::~MallocDumpProvider() = default; | ||
39 | // the current process. | ||
40 | bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, | ||
41 | ProcessMemoryDump* pmd) { | ||
42 | +#if defined(__GLIBC__) | ||
43 | { | ||
44 | base::AutoLock auto_lock(emit_metrics_on_memory_dump_lock_); | ||
45 | if (!emit_metrics_on_memory_dump_) | ||
46 | @@ -322,7 +323,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, | ||
47 | pmd->DumpHeapUsage(metrics_by_context, overhead, "malloc"); | ||
48 | } | ||
49 | tid_dumping_heap_ = kInvalidThreadId; | ||
50 | - | ||
51 | +#endif // __GLIBC__ | ||
52 | return true; | ||
53 | } | ||
54 | |||
55 | diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc | ||
56 | index 7ddeb4d16a9..b8c73b09c5a 100644 | ||
57 | --- a/chromium/content/child/content_child_helpers.cc | ||
58 | +++ b/chromium/content/child/content_child_helpers.cc | ||
59 | @@ -25,7 +25,7 @@ namespace content { | ||
60 | // though, this provides only a partial and misleading value. | ||
61 | // Unfortunately some telemetry benchmark rely on it and these need to | ||
62 | // be refactored before getting rid of this. See crbug.com/581365 . | ||
63 | -#if defined(OS_LINUX) || defined(OS_ANDROID) | ||
64 | +#if defined(__GLIBC__) || defined(OS_ANDROID) | ||
65 | size_t GetMemoryUsageKB() { | ||
66 | struct mallinfo minfo = mallinfo(); | ||
67 | uint64_t mem_usage = | ||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-linux-glibc-make-the-distinction.patch index c3069593..9b4a0027 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-linux-glibc-make-the-distinction.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-linux-glibc-make-the-distinction.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 0bba2d9a7bbcc97126b1440db71364ff5aa8c5f8 Mon Sep 17 00:00:00 2001 | 1 | From a64b55c98bf45d66c3c99172c32b2c282d61168e Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:54:38 -0700 | 3 | Date: Fri, 7 Jul 2017 14:54:38 -0700 |
4 | Subject: [PATCH] chromium: musl: linux != glibc, make the distinction | 4 | Subject: [PATCH] chromium: musl: linux != glibc, make the distinction |
@@ -9,7 +9,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | 9 | 1 file changed, 1 insertion(+), 1 deletion(-) |
10 | 10 | ||
11 | diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc | 11 | diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc |
12 | index 9cd5d2207de..1e700956483 100644 | 12 | index a17ff217331..9f6175ad1de 100644 |
13 | --- a/chromium/base/allocator/allocator_check.cc | 13 | --- a/chromium/base/allocator/allocator_check.cc |
14 | +++ b/chromium/base/allocator/allocator_check.cc | 14 | +++ b/chromium/base/allocator/allocator_check.cc |
15 | @@ -27,7 +27,7 @@ bool IsAllocatorInitialized() { | 15 | @@ -27,7 +27,7 @@ bool IsAllocatorInitialized() { |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch index 009e41fd..d75e50eb 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 922a3f82d7810d23b4f735f5af4574993bde2974 Mon Sep 17 00:00:00 2001 | 1 | From 50da3cf54f9056fc1179f8a5d796d84ec7661f40 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 15:09:02 -0700 | 3 | Date: Fri, 7 Jul 2017 15:09:02 -0700 |
4 | Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols | 4 | Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols |
@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 11 | ||
12 | diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc | 12 | diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc |
13 | index 4b7de5e1a32..fe565223f2b 100644 | 13 | index e919f094c37..414a21d32ad 100644 |
14 | --- a/chromium/base/allocator/allocator_shim.cc | 14 | --- a/chromium/base/allocator/allocator_shim.cc |
15 | +++ b/chromium/base/allocator/allocator_shim.cc | 15 | +++ b/chromium/base/allocator/allocator_shim.cc |
16 | @@ -302,7 +302,7 @@ ALWAYS_INLINE void ShimFreeDefiniteSize(void* ptr, size_t size, void* context) { | 16 | @@ -302,7 +302,7 @@ ALWAYS_INLINE void ShimFreeDefiniteSize(void* ptr, size_t size, void* context) { |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-Use-correct-member-name-__si_fields-fr.patch index 65bf1965..a268341c 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-Use-correct-member-name-__si_fields-fr.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c3dddfccc66fdceb730674838e1676febc66587c Mon Sep 17 00:00:00 2001 | 1 | From 7dc628cc6e211d8daec144bb507e0bd32b0d5a27 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 15:12:39 -0700 | 3 | Date: Fri, 7 Jul 2017 15:12:39 -0700 |
4 | Subject: [PATCH] chromium: musl: Use correct member name __si_fields from | 4 | Subject: [PATCH] chromium: musl: Use correct member name __si_fields from |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch index 8582607c..72ed02c5 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7638d64991e35b688aa9e1385925bc45f8589246 Mon Sep 17 00:00:00 2001 | 1 | From 59c29ca6e9fb63e4a0362d98bb858a282226dc50 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 15:27:50 -0700 | 3 | Date: Fri, 7 Jul 2017 15:27:50 -0700 |
4 | Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc | 4 | Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc |
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
13 | create mode 100644 chromium/net/dns/resolv_compat.h | 13 | create mode 100644 chromium/net/dns/resolv_compat.h |
14 | 14 | ||
15 | diff --git a/chromium/net/dns/dns_config_service_posix.cc b/chromium/net/dns/dns_config_service_posix.cc | 15 | diff --git a/chromium/net/dns/dns_config_service_posix.cc b/chromium/net/dns/dns_config_service_posix.cc |
16 | index f2e66331e33..6fe84dd66af 100644 | 16 | index 06e9d7969c0..8e18a297a96 100644 |
17 | --- a/chromium/net/dns/dns_config_service_posix.cc | 17 | --- a/chromium/net/dns/dns_config_service_posix.cc |
18 | +++ b/chromium/net/dns/dns_config_service_posix.cc | 18 | +++ b/chromium/net/dns/dns_config_service_posix.cc |
19 | @@ -27,6 +27,10 @@ | 19 | @@ -27,6 +27,10 @@ |
@@ -28,7 +28,7 @@ index f2e66331e33..6fe84dd66af 100644 | |||
28 | #include "net/dns/dns_config_watcher_mac.h" | 28 | #include "net/dns/dns_config_watcher_mac.h" |
29 | #endif | 29 | #endif |
30 | diff --git a/chromium/net/dns/dns_reloader.cc b/chromium/net/dns/dns_reloader.cc | 30 | diff --git a/chromium/net/dns/dns_reloader.cc b/chromium/net/dns/dns_reloader.cc |
31 | index 322c8a5f0f7..72ff40dbe15 100644 | 31 | index ad96f681ccd..334ff59ad75 100644 |
32 | --- a/chromium/net/dns/dns_reloader.cc | 32 | --- a/chromium/net/dns/dns_reloader.cc |
33 | +++ b/chromium/net/dns/dns_reloader.cc | 33 | +++ b/chromium/net/dns/dns_reloader.cc |
34 | @@ -9,6 +9,10 @@ | 34 | @@ -9,6 +9,10 @@ |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-Do-not-define-__sbrk-on-musl.patch index 5db4834b..41e8c5e2 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-Do-not-define-__sbrk-on-musl.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 2a49b947ad8e586229411bdd2a00bd496c9e3d0e Mon Sep 17 00:00:00 2001 | 1 | From 100d52256a2b46154fd376276347d6998a146b68 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 15:39:57 -0700 | 3 | Date: Fri, 7 Jul 2017 15:39:57 -0700 |
4 | Subject: [PATCH] chromium: musl: Do not define __sbrk on musl | 4 | Subject: [PATCH] chromium: musl: Do not define __sbrk on musl |
@@ -12,15 +12,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
13 | 13 | ||
14 | 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 | 14 | 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 |
15 | index edc8cf2db70..a868b50d30f 100644 | 15 | index 7486a05a272..610a10b659a 100755 |
16 | --- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 16 | --- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h |
17 | +++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 17 | +++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h |
18 | @@ -233,7 +233,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size, | 18 | @@ -206,7 +206,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size, |
19 | return result; | ||
19 | } | 20 | } |
20 | 21 | ||
21 | // Don't hook sbrk() in Android, since it doesn't expose __sbrk. | 22 | -#ifndef __UCLIBC__ |
22 | -#if !defined(__ANDROID__) | 23 | +#if !defined(__UCLIBC__) && defined(__GLIBC__) |
23 | +#if !defined(__ANDROID__) && defined(__GLIBC__) | ||
24 | // libc's version: | 24 | // libc's version: |
25 | extern "C" void* __sbrk(ptrdiff_t increment); | 25 | extern "C" void* __sbrk(intptr_t increment); |
26 | 26 | ||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-Adjust-default-pthread-stack-size.patch new file mode 100644 index 00000000..71198fba --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-Adjust-default-pthread-stack-size.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | From 257f7ee2b5b562b59a55ef7838eac4103573a632 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Jul 2017 16:41:23 -0700 | ||
4 | Subject: [PATCH] chromium: musl: Adjust default pthread stack size | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | chromium/base/threading/platform_thread_linux.cc | 3 ++- | ||
9 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc | ||
12 | index 190acedf7c5..343e1a8c61d 100644 | ||
13 | --- a/chromium/base/threading/platform_thread_linux.cc | ||
14 | +++ b/chromium/base/threading/platform_thread_linux.cc | ||
15 | @@ -173,7 +173,8 @@ void TerminateOnThread() {} | ||
16 | |||
17 | size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { | ||
18 | #if !defined(THREAD_SANITIZER) | ||
19 | - return 0; | ||
20 | + // use 8mb like glibc to avoid running out of space | ||
21 | + return (1 << 23); | ||
22 | #else | ||
23 | // ThreadSanitizer bloats the stack heavily. Evidence has been that the | ||
24 | // default stack size isn't enough for some browser tests. | ||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch index c11a7ce8..bceb39be 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b9a0991d31f2c88525022690640b5f30a42821b3 Mon Sep 17 00:00:00 2001 | 1 | From 2f27dfef9e38aecca7a2884182003cab939a820a Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 17:15:34 -0700 | 3 | Date: Fri, 7 Jul 2017 17:15:34 -0700 |
4 | Subject: [PATCH] chromium: musl: include asm-generic/ioctl.h for TCGETS2 | 4 | Subject: [PATCH] chromium: musl: include asm-generic/ioctl.h for TCGETS2 |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch index 12bea67f..75752760 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3b87874627418a66bb082ba7825849c073b2c19d Mon Sep 17 00:00:00 2001 | 1 | From 8e38388b652eda083f4d695e34e29ce0fad9e39b Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 25 Sep 2018 12:35:07 -0700 | 3 | Date: Tue, 25 Sep 2018 12:35:07 -0700 |
4 | Subject: [PATCH] chromium: musl: Use _fpstate instead of _libc_fpstate on | 4 | Subject: [PATCH] chromium: musl: Use _fpstate instead of _libc_fpstate on |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch deleted file mode 100644 index c0750a31..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From 98af1531d71359612bbaa2a8619520ca4b6814bc Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Jul 2017 16:41:23 -0700 | ||
4 | Subject: [PATCH] chromium: musl: Adjust default pthread stack size | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | chromium/base/threading/platform_thread_linux.cc | 3 ++- | ||
9 | chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp | 4 ++-- | ||
10 | 2 files changed, 4 insertions(+), 3 deletions(-) | ||
11 | |||
12 | diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc | ||
13 | index 9917a7b1fd6..cb406659b90 100644 | ||
14 | --- a/chromium/base/threading/platform_thread_linux.cc | ||
15 | +++ b/chromium/base/threading/platform_thread_linux.cc | ||
16 | @@ -173,7 +173,8 @@ void TerminateOnThread() {} | ||
17 | |||
18 | size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { | ||
19 | #if !defined(THREAD_SANITIZER) | ||
20 | - return 0; | ||
21 | + // use 8mb like glibc to avoid running out of space | ||
22 | + return (1 << 23); | ||
23 | #else | ||
24 | // ThreadSanitizer bloats the stack heavily. Evidence has been that the | ||
25 | // default stack size isn't enough for some browser tests. | ||
26 | diff --git a/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp | ||
27 | index 13c3f907f8e..07308e08351 100644 | ||
28 | --- a/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp | ||
29 | +++ b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp | ||
30 | @@ -28,7 +28,7 @@ size_t GetUnderestimatedStackSize() { | ||
31 | // FIXME: On Mac OSX and Linux, this method cannot estimate stack size | ||
32 | // correctly for the main thread. | ||
33 | |||
34 | -#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ | ||
35 | +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ | ||
36 | defined(OS_FUCHSIA) | ||
37 | // pthread_getattr_np() can fail if the thread is not invoked by | ||
38 | // pthread_create() (e.g., the main thread of webkit_unit_tests). | ||
39 | @@ -96,7 +96,7 @@ size_t GetUnderestimatedStackSize() { | ||
40 | } | ||
41 | |||
42 | void* GetStackStart() { | ||
43 | -#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ | ||
44 | +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ | ||
45 | defined(OS_FUCHSIA) | ||
46 | pthread_attr_t attr; | ||
47 | int error; | ||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch index 0ff26e51..49106762 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c1a7511a323997411728689078946122d176551b Mon Sep 17 00:00:00 2001 | 1 | From e6ff3e4d84b459a0d74818d0c9d842d6d485f5c4 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 25 Sep 2018 12:59:05 -0700 | 3 | Date: Tue, 25 Sep 2018 12:59:05 -0700 |
4 | Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to get | 4 | Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to get |
@@ -13,7 +13,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
13 | 3 files changed, 4 insertions(+), 2 deletions(-) | 13 | 3 files changed, 4 insertions(+), 2 deletions(-) |
14 | 14 | ||
15 | diff --git a/chromium/third_party/breakpad/breakpad/configure.ac b/chromium/third_party/breakpad/breakpad/configure.ac | 15 | diff --git a/chromium/third_party/breakpad/breakpad/configure.ac b/chromium/third_party/breakpad/breakpad/configure.ac |
16 | index ec194ddd203..767c2af11ee 100644 | 16 | index 9cca5aa069c..04139a728cc 100644 |
17 | --- a/chromium/third_party/breakpad/breakpad/configure.ac | 17 | --- a/chromium/third_party/breakpad/breakpad/configure.ac |
18 | +++ b/chromium/third_party/breakpad/breakpad/configure.ac | 18 | +++ b/chromium/third_party/breakpad/breakpad/configure.ac |
19 | @@ -72,7 +72,7 @@ AC_ARG_ENABLE(m32, | 19 | @@ -72,7 +72,7 @@ AC_ARG_ENABLE(m32, |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-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 deleted file mode 100644 index 1ec4dd2b..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | From db18f880b833041e3151a3dc8541f7d35d43a4b5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 8 Jul 2017 09:08:23 -0700 | ||
4 | Subject: [PATCH] chromium: musl: tcmalloc: Use off64_t insread of __off64_t | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | .../tcmalloc/chromium/src/base/linux_syscall_support.h | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | 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 | ||
12 | index 91f77dd88d4..bb84a0b3058 100644 | ||
13 | --- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | ||
14 | +++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | ||
15 | @@ -1929,7 +1929,7 @@ typedef unsigned long int ulong; | ||
16 | #if defined(__x86_64__) | ||
17 | /* Need to make sure __off64_t isn't truncated to 32-bits under x32. */ | ||
18 | LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d, | ||
19 | - __off64_t o) { | ||
20 | + off64_t o) { | ||
21 | LSS_BODY(6, void*, mmap, LSS_SYSCALL_ARG(s), LSS_SYSCALL_ARG(l), | ||
22 | LSS_SYSCALL_ARG(p), LSS_SYSCALL_ARG(f), | ||
23 | LSS_SYSCALL_ARG(d), (uint64_t)(o)); | ||
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 7b157096..63c281a6 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -3,7 +3,6 @@ SUMMARY = "QtWebEngine combines the power of Chromium and Qt" | |||
3 | # Read http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ | 3 | # Read http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ |
4 | LICENSE = "BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( LGPL-3.0 | The-Qt-Company-Commercial )" | 4 | LICENSE = "BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( LGPL-3.0 | The-Qt-Company-Commercial )" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://src/core/browser_context_qt.cpp;md5=b5193b7d68699260f3b40b201365c8d2;beginline=1;endline=38 \ | ||
7 | file://src/3rdparty/chromium/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \ | 6 | file://src/3rdparty/chromium/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \ |
8 | file://LICENSE.LGPL3;md5=8211fde12cc8a4e2477602f5953f5b71 \ | 7 | file://LICENSE.LGPL3;md5=8211fde12cc8a4e2477602f5953f5b71 \ |
9 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | 8 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
@@ -134,47 +133,42 @@ RDEPENDS_${PN}-examples += " \ | |||
134 | qtdeclarative-qmlplugins \ | 133 | qtdeclarative-qmlplugins \ |
135 | " | 134 | " |
136 | 135 | ||
137 | QT_MODULE_BRANCH_CHROMIUM = "65-based" | 136 | QT_MODULE_BRANCH_CHROMIUM = "69-based" |
138 | 137 | ||
139 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.11 | 138 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.12 |
140 | # 5.11.meta-qt5.8 | 139 | # 5.12.meta-qt5.1 |
141 | SRC_URI += " \ | 140 | SRC_URI += " \ |
142 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ | 141 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ |
143 | file://0001-Force-host-toolchain-configuration.patch \ | 142 | file://0001-Force-host-toolchain-configuration.patch \ |
144 | file://0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch \ | ||
145 | " | 143 | " |
146 | SRC_URI_append_libc-musl = "\ | 144 | SRC_URI_append_libc-musl = "\ |
147 | file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ | 145 | file://0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ |
148 | file://0004-musl-link-against-libexecinfo.patch \ | 146 | file://0003-musl-link-against-libexecinfo.patch \ |
149 | " | 147 | " |
150 | 148 | ||
151 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/65-based | 149 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/69-based |
152 | # 65-based.meta-qt5.7 | 150 | # 69-based.meta-qt5.1 |
153 | SRC_URI += " \ | 151 | SRC_URI += " \ |
154 | file://chromium/0001-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ | 152 | file://chromium/0001-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ |
155 | file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ | ||
156 | file://chromium/0003-chromium-Fix-build-with-gcc8.patch;patchdir=src/3rdparty \ | ||
157 | " | 153 | " |
158 | 154 | ||
159 | SRC_URI_append_libc-musl = "\ | 155 | SRC_URI_append_libc-musl = "\ |
160 | file://chromium/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ | 156 | file://chromium/0002-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ |
161 | file://chromium/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ | 157 | file://chromium/0003-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ |
162 | file://chromium/0006-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ | 158 | file://chromium/0004-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ |
163 | file://chromium/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ | 159 | file://chromium/0005-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ |
164 | file://chromium/0008-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ | 160 | file://chromium/0006-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ |
165 | file://chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ | 161 | file://chromium/0007-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \ |
166 | file://chromium/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \ | 162 | file://chromium/0008-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ |
167 | file://chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ | 163 | file://chromium/0009-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ |
168 | file://chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ | 164 | file://chromium/0010-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ |
169 | file://chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ | 165 | file://chromium/0011-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \ |
170 | file://chromium/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \ | 166 | file://chromium/0012-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch;patchdir=src/3rdparty \ |
171 | file://chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ | 167 | file://chromium/0013-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch;patchdir=src/3rdparty \ |
172 | file://chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch;patchdir=src/3rdparty \ | ||
173 | file://chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch;patchdir=src/3rdparty \ | ||
174 | " | 168 | " |
175 | 169 | ||
176 | SRCREV_qtwebengine = "18412af977d658f243eb5b25b62284924cfa362f" | 170 | SRCREV_qtwebengine = "4f1e0003d98116e33a847360e0e95c46daae25fc" |
177 | SRCREV_chromium = "2095a35f300bcbe82e968e9a547dff7c79be29d8" | 171 | SRCREV_chromium = "323b45aa242e0b4e75689d67418ec124ba1ca815" |
178 | SRCREV = "${SRCREV_qtwebengine}" | 172 | SRCREV = "${SRCREV_qtwebengine}" |
179 | 173 | ||
180 | SRCREV_FORMAT = "qtwebengine_chromium" | 174 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index 993ad3ff..7e5a8b2d 100644 --- a/recipes-qt/qt5/qtwebglplugin_git.bb +++ b/recipes-qt/qt5/qtwebglplugin_git.bb | |||
@@ -18,4 +18,4 @@ do_configure_prepend() { | |||
18 | 18 | ||
19 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" | 19 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" |
20 | 20 | ||
21 | SRCREV = "b57a3ce9d95f36ca0f1b1d1e9cf1e20030e882d8" | 21 | SRCREV = "d0c4de38ddc18792c7a8a90ef2d0091b51736dd3" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index f5dcfb05..e79ada8c 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtdeclarative" | 12 | DEPENDS += "qtbase qtdeclarative" |
13 | 13 | ||
14 | SRCREV = "395c1f1aed90f740f079d8f980c93f459b44733a" | 14 | SRCREV = "a53a28b971e3ae1a4a2baf7320ba60f5077f5596" |
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 10d5f13f..f7f52588 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb | |||
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" | |||
19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" | 19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" |
20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" | 20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" |
21 | 21 | ||
22 | SRCREV = "779bf9c3f24365df3f681a029cafd78c7991e929" | 22 | SRCREV = "a14a1174cdc7ee2142abd33f85ea820eca90c968" |
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index f768f75b..986c1109 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
14 | 14 | ||
15 | SRCREV = "877c585bc474934e3bb1044293a62c72cb01b9cf" | 15 | SRCREV = "12bfa3cb74b0fb3b9e793dbb2f67cac647e7157c" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index e562bd1c..1957fafd 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ | |||
14 | 14 | ||
15 | DEPENDS += "qtbase" | 15 | DEPENDS += "qtbase" |
16 | 16 | ||
17 | SRCREV = "657995db766faa48084024e780c4cd02fa05c527" | 17 | SRCREV = "274f162fd41c4de88df7efda9e6ec16a1ca968bc" |
18 | 18 | ||
19 | BBCLASSEXTEND =+ "native nativesdk" | 19 | BBCLASSEXTEND =+ "native nativesdk" |
20 | 20 | ||