From fea884537f3e07181967544c4c785d3a58ca79bd Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 5 Jul 2017 11:15:52 +0000 Subject: Update all Qt components to latest (5.9.1) This is to fix build issues with GCC 7 in QtWebKit and QtIvi. Note that the GENIVI IVI shell patches were merged upstream in QtWayland commit f144f0f71f1b75df92 so we should no longer need to use a fork of that component. qtwebengine 5.9 requires GNU gzip to build -- the `grit` tool (Google Resource and Internationalization Tool) expects to be able to call `gzip --rsyncable` which is a feature only provided by GNU gzip. I used 'master' of gzip.git because otherwise the build of the embedded gnulib components fail with GCC 7 (due to warnings and -Werror). --- ivi/strata/qt5-ivi.morph | 12 ++++--- strata/qt5-tools-qtmultimedia.morph | 4 +-- strata/qt5-tools-qtwayland.morph | 4 +-- strata/qt5-tools-qtwebengine.morph | 17 +++++++-- strata/qt5-tools-qtwebkit.morph | 23 +++++++----- strata/qt5-tools.morph | 71 +++++++++++++++++++------------------ 6 files changed, 79 insertions(+), 52 deletions(-) diff --git a/ivi/strata/qt5-ivi.morph b/ivi/strata/qt5-ivi.morph index 360faa39..7032c290 100644 --- a/ivi/strata/qt5-ivi.morph +++ b/ivi/strata/qt5-ivi.morph @@ -4,14 +4,18 @@ description: Qt5 IVI stratum build-depends: - morph: strata/ruby.morph - morph: strata/qt5-tools.morph +- morph: strata/qt5-tools-qtmultimedia.morph chunks: - name: qtapplicationmanager morph: ivi/strata/qt5-ivi/qtapplicationmanager.morph repo: upstream:qt5/qtapplicationmanager - ref: fb9670e9e381aa391e5fe3eccd76db0f7b866abb - unpetrify-ref: "5.7" + ref: 3334cc42fcbc15dc75a0e247578e714399cd939f + unpetrify-ref: "5.9" - name: qtivi repo: upstream:qt5/qtivi - ref: 36616e36cb1f0b30aa9ca7977af7a5b682689f7a - unpetrify-ref: "5.7" + ref: 107832b9e27319e9104e3b68d76a4d0f326567f6 + unpetrify-ref: dev build-system: qmake + submodules: + src/3rdparty/qface: + url: upstream:qt5/qtivi-qface diff --git a/strata/qt5-tools-qtmultimedia.morph b/strata/qt5-tools-qtmultimedia.morph index a4830aff..4f3484cd 100644 --- a/strata/qt5-tools-qtmultimedia.morph +++ b/strata/qt5-tools-qtmultimedia.morph @@ -7,6 +7,6 @@ build-depends: chunks: - name: qtmultimedia repo: upstream:qt5/qtmultimedia - ref: 9985224a89b830dc182b428f491b6187d6f0e1ba - unpetrify-ref: v5.6.0 + ref: 631a6f6c38a5140e22c63b0840d9badb87851949 + unpetrify-ref: v5.9.1 build-system: qmake diff --git a/strata/qt5-tools-qtwayland.morph b/strata/qt5-tools-qtwayland.morph index 54dcf1e2..7042101a 100644 --- a/strata/qt5-tools-qtwayland.morph +++ b/strata/qt5-tools-qtwayland.morph @@ -8,5 +8,5 @@ chunks: - name: qtwayland morph: strata/qt5-tools-qtwayland/qtwayland.morph repo: upstream:qt5/qtwayland - ref: ebba84e70fe3610affc3974f51c8ed6d539377aa - unpetrify-ref: baserock/v5.6.0-15-gebba84e+ivi-shell + ref: ef4eeb4d243e0fd6f44f52be2c345ab450c70a49 + unpetrify-ref: v5.9.1 diff --git a/strata/qt5-tools-qtwebengine.morph b/strata/qt5-tools-qtwebengine.morph index 9c954f5f..cd51cc09 100644 --- a/strata/qt5-tools-qtwebengine.morph +++ b/strata/qt5-tools-qtwebengine.morph @@ -6,11 +6,24 @@ build-depends: - morph: strata/qt5-tools.morph - morph: strata/ruby.morph chunks: +- name: qtwebchannel + repo: upstream:qt5/qtwebchannel + ref: 392da2b649ce669bf329b49668a69007179e4726 + unpetrify-ref: 5.9.1 + build-system: qmake +- name: gzip + repo: upstream:gzip + ref: e360d3795658e14fb15705876393b9384843971e + unpetrify-ref: master + build-system: autotools - name: qtwebengine repo: upstream:qt5/qtwebengine - ref: 5c4ae298b0a3d75c4c5ea8aef0595914ab25607f - unpetrify-ref: v5.6.0 + ref: 0340d87b7c12a5e56966e61db156e4a299b57bd9 + unpetrify-ref: v5.9.1 build-system: qmake + build-depends: + - gzip + - qtwebchannel submodules: src/3rdparty: url: upstream:qt5/qtwebengine-chromium.git diff --git a/strata/qt5-tools-qtwebkit.morph b/strata/qt5-tools-qtwebkit.morph index 5d298e4d..012834ff 100644 --- a/strata/qt5-tools-qtwebkit.morph +++ b/strata/qt5-tools-qtwebkit.morph @@ -6,29 +6,36 @@ build-depends: - morph: strata/qt5-tools.morph - morph: strata/ruby.morph chunks: +- name: qtwebchannel + repo: upstream:qt5/qtwebchannel + ref: 392da2b649ce669bf329b49668a69007179e4726 + unpetrify-ref: 5.9.1 + build-system: qmake - name: qtwebkit repo: upstream:qt5/qtwebkit - ref: 7205faf1a546a690f68176989100109e9a3335b7 - unpetrify-ref: '5.6' + ref: d10511e0a3f655ab2b1dfebfd9c17ade151a7cfe + unpetrify-ref: '5.212' build-system: qmake + build-depends: + - qtwebchannel - name: qtwebkit-examples repo: upstream:qt5/qtwebkit-examples - ref: 1b9a0fc9d1ded4f4f11b04eb0bb7d1de82d6eb34 - unpetrify-ref: '5.6' + ref: f544b2eec0c18b7674ac4df629ae98e8cacce5c7 + unpetrify-ref: 5.9.1 build-system: qmake build-depends: - qtwebkit - name: qttools repo: upstream:qt5/qttools - ref: 9904992dc4eb9a5958fcfbac238374ff38498143 - unpetrify-ref: v5.6.0 + ref: dfda6f14b3e210a33b71ef1c6fa3c75a9c866cce + unpetrify-ref: v5.9.1 build-system: qmake build-depends: - qtwebkit - name: qttranslations repo: upstream:qt5/qttranslations - ref: 41d212290c3822b8eef151785d89ac5f5b246bde - unpetrify-ref: v5.6.0 + ref: ad5a9af215e2b1276893490c7fe92de39cc25005 + unpetrify-ref: v5.9.1 build-system: qmake build-depends: - qttools diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.morph index 7424a41c..87792a12 100644 --- a/strata/qt5-tools.morph +++ b/strata/qt5-tools.morph @@ -9,37 +9,37 @@ chunks: - name: qtbase morph: strata/qt5-tools/qtbase.morph repo: upstream:qt5/qtbase - ref: d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b - unpetrify-ref: v5.6.0 + ref: 160533328cae32c8647cecafad21233aa3529659 + unpetrify-ref: v5.9.1 - name: qtsvg repo: upstream:qt5/qtsvg - ref: 38777ea7451d55e9c3d32d88d46063016013f60c - unpetrify-ref: v5.6.0 + ref: 96d3cb055fe477aa2699682555c3c33c66e0e300 + unpetrify-ref: v5.9.1 build-system: qmake build-depends: - qtbase - name: qtscript repo: upstream:qt5/qtscript - ref: a70f6a1b9599931fccd13b15a1700e61137f7e72 - unpetrify-ref: v5.6.0 + ref: dc65e802cae6751b167ada36b45f5b7ec53a1865 + unpetrify-ref: v5.9.1 build-system: qmake build-depends: - qtbase - name: qtdeclarative repo: upstream:qt5/qtdeclarative - ref: de276ed0c8a715098245641285405b8a884ef898 - unpetrify-ref: baserock/v5.6.0 + ref: 525de4ff29cfefd9f676ba35a4e8d7494e5198c2 + unpetrify-ref: v5.9.1 build-system: qmake build-depends: - qtbase - qtscript submodules: - tests/manual/v4/test262: + tests/auto/qml/ecmascripttests/test262: url: upstream:qt5/qtdeclarative-testsuites.git - name: qt3d repo: upstream:qt5/qt3d - ref: 7a208d76ed96bb506899becfe680df06f95451c7 - unpetrify-ref: v5.6.0 + ref: 6310f055965f824f716ccc3fbc99e4209f667635 + unpetrify-ref: v5.9.1 build-system: qmake build-depends: - qtbase @@ -47,83 +47,86 @@ chunks: - qtdeclarative - name: qtquickcontrols repo: upstream:qt5/qtquickcontrols - ref: 85c2d2cce4c7d49bc425ccd0be2bbd9841b7e79b - unpetrify-ref: v5.6.0 + ref: 5362d2d12970e435cc03dbd354fdd781ae666101 + unpetrify-ref: v5.9.1 build-system: qmake build-depends: - qtbase - qtdeclarative - name: qtsensors repo: upstream:qt5/qtsensors - ref: 7197e7f4b385315cb241043495cbfad58deb911a - unpetrify-ref: v5.6.0 + ref: c67dbe9b0f853bd607fcdc29d8f7a128db7d9f0a + unpetrify-ref: v5.9.1 build-system: qmake build-depends: - qtbase - name: qtserialport repo: upstream:qt5/qtserialport - ref: 03d492e49e74eefa1c83e37e833d862f4b9f1e45 - unpetrify-ref: v5.6.0 + ref: 385eb5bcb9b230222a99dc8c125b3d13be978465 + unpetrify-ref: v5.9.1 build-system: qmake build-depends: - qtbase - name: qtx11extras repo: upstream:qt5/qtx11extras - ref: d64ee96f0df4d3baa6959b8552bc59d53cb0b451 - unpetrify-ref: v5.6.0 + ref: a4eef519a7524835c93f5658dbf7064c83e33bbc + unpetrify-ref: v5.9.1 build-system: qmake build-depends: - qtbase - name: qtxmlpatterns repo: upstream:qt5/qtxmlpatterns - ref: e9110eb0a0980aa7e49928a836e0b00c2c3f4120 - unpetrify-ref: baserock/v5.6.0 + ref: 55bf61b68b42a79548bf1bf1358981d40cf75911 + unpetrify-ref: v5.9.1 build-system: qmake build-depends: - qtbase submodules: - testsuites: + tests/auto/3rdparty/testsuites: url: upstream:qt5/qtxmlpatterns-testsuites.git - name: qtdoc repo: upstream:qt5/qtdoc - ref: 2ed0ac4bbb4d3bfe884f946eac89f71c44f3d27d - unpetrify-ref: v5.6.0 + ref: 77ba407df4dc4257f9df37305c25bb6c0f5fb886 + unpetrify-ref: v5.9.1 build-system: qmake build-depends: - qtbase - name: qtgraphicaleffects repo: upstream:qt5/qtgraphicaleffects - ref: 4b8e9a348ca379b203c26ff14dd236267dd60646 - unpetrify-ref: v5.6.0 + ref: ef26dd7c053c3a7a816e78a95898072a8f9b22ed + unpetrify-ref: v5.9.1 build-system: qmake build-depends: - qtbase - qtdeclarative - name: qtimageformats repo: upstream:qt5/qtimageformats - ref: 0bd46d5861fa7b48c87cd3a734d00671df929869 - unpetrify-ref: v5.6.0 + ref: 6a325512a8d50f68a650ec9822dcd918653567c4 + unpetrify-ref: v5.9.1 build-system: qmake build-depends: - qtbase - name: qtconnectivity repo: upstream:qt5/qtconnectivity - ref: 8b550f0a7508ed413cded71a20485e61010b0aa3 - unpetrify-ref: v5.6.0 + ref: a6772267d013bff5fbdf09634dc60977d83933b3 + unpetrify-ref: v5.9.1 build-system: qmake build-depends: - qtbase - name: qtlocation repo: upstream:qt5/qtlocation - ref: ca4bce553d03a64fa119650990083267ea9c8d31 - unpetrify-ref: v5.6.0 + ref: dc70a1ffdcb6ab5753773917642b4d89e68d21e7 + unpetrify-ref: v5.9.1 build-system: qmake build-depends: - qtbase + submodules: + src/3rdparty/mapbox-gl-native: + url: upstream:qt5/qtlocation-mapboxgl.git - name: qtwebsockets repo: upstream:qt5/qtwebsockets - ref: 88946bbe209cb6148b4a3284077bb9a06c7bc1ef - unpetrify-ref: v5.6.0 + ref: 2818cc3e3d1aeb739eb82d5636a8caf56f5cfaf2 + unpetrify-ref: v5.9.1 build-system: qmake build-depends: - qtbase -- cgit v1.2.1