From patchwork Thu Oct 12 21:23:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 825117 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yCkQR3Zsyz9s82 for ; Fri, 13 Oct 2017 08:25:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id EB5FC892ED; Thu, 12 Oct 2017 21:25:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KpKwti9E1Zrg; Thu, 12 Oct 2017 21:24:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 1D3F3892CF; Thu, 12 Oct 2017 21:24:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 45E501C03BA for ; Thu, 12 Oct 2017 21:24:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3E6F38863F for ; Thu, 12 Oct 2017 21:24:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id baIa3WQVgdpE for ; Thu, 12 Oct 2017 21:24:39 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by whitealder.osuosl.org (Postfix) with ESMTPS id 88F2188632 for ; Thu, 12 Oct 2017 21:24:38 +0000 (UTC) Received: from localhost.localdomain ([188.110.62.71]) by mail.gmx.com (mrgmx001 [212.227.17.190]) with ESMTPSA (Nemesis) id 0MBVwM-1e9wDX0Ryo-00AYuS; Thu, 12 Oct 2017 23:23:46 +0200 From: Peter Seiderer To: buildroot@buildroot.org Date: Thu, 12 Oct 2017 23:23:42 +0200 Message-Id: <20171012212342.19443-1-ps.report@gmx.net> X-Mailer: git-send-email 2.14.2 MIME-Version: 1.0 X-Provags-ID: V03:K0:k6SI5OAq61IDMgUxhsbwsT1Bv8CoDZeF6sSFVFrRRA8bJ7Y5D82 8dZ+MSfThSe3Gjy2HKN5+NAbMx3+mGAJNtClkZHZNsfjrhIXSxIbE6Aa+X8a+Yt424oMtGR i1tUJtfs43Op6h7w97Uoe5WZmI3n5DI4bG9fwyljHNwTveIVeF9K3rw9PHOg6E4zQ7/nAPG GKMOAO3AFv7vvnp3u6jtQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:Vq4cqoBQlDU=:WDkXQo3BuIhHUmciiMcFWm cTQkaz7x0qfeg5PO1f65Uyi1udMJg9bzCFUKrbRvxDwXrGkVdysP8HC0BbeALPjssvIPGnjtR Ny/8hCBCw+RradBu1aqkOlUP/XVZa97E7W9lzWXGpb5POtN1T2iuERHAKTMooF7cLbxP6ScIc N7Q7nB2MQrh0OX03miLHZxDtOG69S9x5Bi39fzkIEyQvwo0keya/zIAPOpdft0I5mECPviVDL rXlP/v7IJcpapo/+SVnZpXqZJdw0tpf2u9L/wNn4y/+9A+dBCozTackJtRIbQAj3cgouBZqqk 6VjDy/Cl54IJ2n88th+aLtBWldbmCRI/w7moiy7HYdSTCKbeiva2fKwN+DO/HeezLz4cZPQvG Hn+K6TGUIqZJGDElTcHPki09AxkldiJ2FyBnEm1fVkBVp0GzsnpZbtiW7Ofc3ToHfoWJnrAB3 VgYnHH2Xu4FP25AXUL4tsw6gyaPRIziezeQAElXJTGsTCliXcxBBYAkRiEONgPQjXwlmBqzW2 cpmpUsjkUB8tba1kWAbi5fZblc2gqqez4545HMCpGUaR2ss7Js90+zvUDSBdpH7haAXOra87s k/HxhfGoH9I3+BhGtKJBmti6QeQTa2yZ5yJQCyc2XikZOOosLgo5wS6vvL77wSgoNNN+KeynB j5FRlk/XhZsGajBnGZY5nSPVawpt34ChqRnwf/yrQeB4GuCHlBnYzjZ30rhAHL4rRVFDMcFe4 F5P8AaZ2xNWwa9NahI+PdrfxYrqN5cqTJ+APzD4mC1SqJTWjtmco68s7tOY2i7aldqf6DPxf6 BjFq6FgH2Frevk2LmsFMWruUYR9zUaMMbCoKPQUUfVLpxhyuB4= Cc: =?utf-8?q?Ga=C3=ABl_Portay?= , Joshua Henderson Subject: [Buildroot] [PATCH v1] qt5: bump latest version to 5.9.2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" qt5base: - removed 0001-Fix-error-attribute-target-crc-is-unknown.patch (upstream committed, see [1]) - removed 0002-examples-fix-compile-without-opengl-support.patch (upstream committed, see [2]) qt5declarative: - removed 0001-Fix-alignment-issue-on-ARMv7.patch (upstream committed, see [3]) - moved 0001-examples-photoviewer-needs-widgets-support.patch to 5.6.2 only (upstream 5.9.2 committed, see [4]) - moved 0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch to 5.6.2 only (similare patch upstream committed, see [5]) qt5location: - 0001-Fix-plugins-build-dependency.patch (upstream committed, see [6]) qt5webengine: - 0001-Always-compile-QWebEnginePage-print.patch (upstream committed, see [7]) - keep 0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch (upstream committed, see [8], but reverted afterwards, see [9]) qt5webkit: - fall back to 5.9.1 (no 5.9.2 package provided, see [10] and [11]). [1] http://code.qt.io/cgit/qt/qtbase.git/commit/?id=b7722c251c3a0938c7c71fc3da47fdbe920060b7 [2] http://code.qt.io/cgit/qt/qtbase.git/commit/?id=6ce4b680cdde7827a6ed4d00dbeb7e7e91569433 [3] http://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=03c2661b1243cc529fc3d8cfa65073f1da420307 [4] http://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=452a78d0ac4a1579733a8ab641be24c9b7c0dd96 [5] http://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=fa52bb665d6beb77a951c14c8edcba3541850afc [6] http://code.qt.io/cgit/qt/qtlocation.git/commit/?id=3ac051c4549575634cecc706175b019f4ed4c3bf [7] http://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=085c2c529473bbe9dd7c8c5698a45053520cc423 [8] http://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=d4c621f6a6b87f2a86069fa393b9f7c4f9e7b9ad [9] http://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=c11c2c8981e647c1eb2c6753ce77d436b92fff87 [10] https://blog.qt.io/blog/2017/10/06/qt-5-9-2-released/#comment-1200724 [11] https://blog.qt.io/blog/2017/10/06/qt-5-9-2-released/#comment-1200746 Signed-off-by: Peter Seiderer Tested-by: Joshua Henderson --- package/qt5/qt5.mk | 2 +- package/qt5/qt53d/qt53d.hash | 4 +- ...uickviewcomparison-and-quickwidget-needs-.patch | 0 ...Fix-error-attribute-target-crc-is-unknown.patch | 47 ---- ...amples-fix-compile-without-opengl-support.patch | 33 --- package/qt5/qt5base/qt5base.hash | 4 +- package/qt5/qt5canvas3d/qt5canvas3d.hash | 4 +- package/qt5/qt5connectivity/qt5connectivity.hash | 4 +- ...xamples-photoviewer-needs-widgets-support.patch | 0 .../5.9.1/0001-Fix-alignment-issue-on-ARMv7.patch | 37 ---- package/qt5/qt5declarative/qt5declarative.hash | 4 +- .../qt5graphicaleffects/qt5graphicaleffects.hash | 4 +- package/qt5/qt5imageformats/qt5imageformats.hash | 4 +- .../5.9.1/0001-Fix-plugins-build-dependency.patch | 42 ---- package/qt5/qt5location/qt5location.hash | 4 +- package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 4 +- .../qt5/qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- package/qt5/qt5script/qt5script.hash | 4 +- package/qt5/qt5sensors/qt5sensors.hash | 4 +- package/qt5/qt5serialbus/qt5serialbus.hash | 4 +- package/qt5/qt5serialport/qt5serialport.hash | 4 +- package/qt5/qt5svg/qt5svg.hash | 4 +- package/qt5/qt5tools/qt5tools.hash | 4 +- .../qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash | 4 +- package/qt5/qt5wayland/qt5wayland.hash | 4 +- package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- .../0001-Always-compile-QWebEnginePage-print.patch | 246 --------------------- ...ad-libEGL-and-libGLES2-symbols-implicitly.patch | 0 package/qt5/qt5webengine/qt5webengine.hash | 4 +- package/qt5/qt5webkit/qt5webkit.mk | 7 + package/qt5/qt5websockets/qt5websockets.hash | 4 +- package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- 34 files changed, 56 insertions(+), 454 deletions(-) rename package/qt5/{qt5declarative => qt5base/5.6.2}/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch (100%) delete mode 100644 package/qt5/qt5base/5.9.1/0001-Fix-error-attribute-target-crc-is-unknown.patch delete mode 100644 package/qt5/qt5base/5.9.1/0002-examples-fix-compile-without-opengl-support.patch rename package/qt5/qt5declarative/{ => 5.6.2}/0001-examples-photoviewer-needs-widgets-support.patch (100%) delete mode 100644 package/qt5/qt5declarative/5.9.1/0001-Fix-alignment-issue-on-ARMv7.patch delete mode 100644 package/qt5/qt5location/5.9.1/0001-Fix-plugins-build-dependency.patch delete mode 100644 package/qt5/qt5webengine/5.9.1/0001-Always-compile-QWebEnginePage-print.patch rename package/qt5/qt5webengine/{5.9.1 => 5.9.2}/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch (100%) diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 55b16e0dac..a0cfef9b7e 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -6,7 +6,7 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5_VERSION_MAJOR = 5.9 -QT5_VERSION = $(QT5_VERSION_MAJOR).1 +QT5_VERSION = $(QT5_VERSION_MAJOR).2 QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules else QT5_VERSION_MAJOR = 5.6 diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 5616dcba73..5567843986 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,5 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qt3d-opensource-src-5.6.2.tar.xz.mirrorlist sha256 a21786db6e0f5c6c70213fe1a3530ed3d7f28f28401a0f793970e9bc860ce941 qt3d-opensource-src-5.6.2.tar.xz -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qt3d-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 4f1fe5b812d78987341b854e7f2907f0375dc188cfa6cf9db101b26e9dfd4996 qt3d-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qt3d-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 c955a92fe2f3f2f03493ae0e9d973ebe1c4b1e037b58f18092fa2040f5b50783 qt3d-opensource-src-5.9.2.tar.xz diff --git a/package/qt5/qt5declarative/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch b/package/qt5/qt5base/5.6.2/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch similarity index 100% rename from package/qt5/qt5declarative/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch rename to package/qt5/qt5base/5.6.2/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch diff --git a/package/qt5/qt5base/5.9.1/0001-Fix-error-attribute-target-crc-is-unknown.patch b/package/qt5/qt5base/5.9.1/0001-Fix-error-attribute-target-crc-is-unknown.patch deleted file mode 100644 index 69b1bd40f5..0000000000 --- a/package/qt5/qt5base/5.9.1/0001-Fix-error-attribute-target-crc-is-unknown.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f0c02fb22bc277e2015a18e562b551ec7b3eed9e Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sun, 16 Jul 2017 00:05:44 +0200 -Subject: [PATCH] Fix error attribute(target("+crc")) is unknown - -Task-number: QTBUG-61975 -Change-Id: I0b1b55c0737dad485b5ace8e6eb7cb842589453d - -Upstream: https://codereview.qt-project.org/200171 -Signed-off-by: Peter Seiderer ---- - src/corelib/tools/qhash.cpp | 2 ++ - src/corelib/tools/qsimd_p.h | 3 +++ - 2 files changed, 5 insertions(+) - -diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp -index 1f9c05c..bbf6efb 100644 ---- a/src/corelib/tools/qhash.cpp -+++ b/src/corelib/tools/qhash.cpp -@@ -144,7 +144,9 @@ static inline bool hasFastCrc32() - } - - template -+#if defined(__aarch64__) - QT_FUNCTION_TARGET(CRC32) -+#endif - static uint crc32(const Char *ptr, size_t len, uint h) - { - // The crc32[whbd] instructions on Aarch64/Aarch32 calculate a 32-bit CRC32 checksum -diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h -index 023a4b0..a85d572 100644 ---- a/src/corelib/tools/qsimd_p.h -+++ b/src/corelib/tools/qsimd_p.h -@@ -326,7 +326,10 @@ - #endif - // AArch64/ARM64 - #if defined(Q_PROCESSOR_ARM_V8) && defined(__ARM_FEATURE_CRC32) -+#if defined(__aarch64__) -+// only available on aarch64 - #define QT_FUNCTION_TARGET_STRING_CRC32 "+crc" -+#endif - # include - #endif - --- -2.7.4 - diff --git a/package/qt5/qt5base/5.9.1/0002-examples-fix-compile-without-opengl-support.patch b/package/qt5/qt5base/5.9.1/0002-examples-fix-compile-without-opengl-support.patch deleted file mode 100644 index 6735ab63e0..0000000000 --- a/package/qt5/qt5base/5.9.1/0002-examples-fix-compile-without-opengl-support.patch +++ /dev/null @@ -1,33 +0,0 @@ -From adacb2d6701b12511c5a0e58072236da91ebf810 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 7 Aug 2017 22:54:11 +0200 -Subject: [PATCH] examples: fix compile without opengl support - -Compile examples/opengl only in case opengl support is available. - -Task-number: QTBUG-62372 -Change-Id: I742a1eb7b7639a5a722c4d5e9b4ee070b629b02e - -Upstream: https://codereview.qt-project.org/201947 -Signed-off-by: Peter Seiderer ---- - examples/examples.pro | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/examples/examples.pro b/examples/examples.pro -index a3851c6d81..d87fa2da88 100644 ---- a/examples/examples.pro -+++ b/examples/examples.pro -@@ -14,7 +14,8 @@ qtHaveModule(concurrent): SUBDIRS += qtconcurrent - qtHaveModule(sql): SUBDIRS += sql - qtHaveModule(widgets): SUBDIRS += widgets - qtHaveModule(xml): SUBDIRS += xml --qtHaveModule(gui): SUBDIRS += gui opengl -+qtHaveModule(gui): SUBDIRS += gui -+qtHaveModule(gui):qtConfig(opengl): SUBDIRS += opengl - - aggregate.files = aggregate/examples.pro - aggregate.path = $$[QT_INSTALL_EXAMPLES] --- -2.11.0 - diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 5d8670159a..6a77d667fb 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtbase-opensource-src-5.6.2.tar.xz.mirrorlist sha256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 qtbase-opensource-src-5.6.2.tar.xz -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtbase-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6 qtbase-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtbase-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b qtbase-opensource-src-5.9.2.tar.xz diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.hash b/package/qt5/qt5canvas3d/qt5canvas3d.hash index 81386e0fdd..94bf94439b 100644 --- a/package/qt5/qt5canvas3d/qt5canvas3d.hash +++ b/package/qt5/qt5canvas3d/qt5canvas3d.hash @@ -1,5 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtcanvas3d-opensource-src-5.6.2.tar.xz.mirrorlist sha256 d7584d006b03f99692ccabce922e755a6f12bb1ed1fbc99c2b84842b9e0aa0ad qtcanvas3d-opensource-src-5.6.2.tar.xz -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtcanvas3d-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 4b8bf09330f03d2b3998f5447991546704715478c54f4f8d82d00bee3047de81 qtcanvas3d-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtcanvas3d-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 84a8d66c2c35b67af84376037cac71fe77a105df09ffef7906a9cb1aeafb3eea qtcanvas3d-opensource-src-5.9.2.tar.xz diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index b6762f4272..4d5f3d64ef 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,5 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtconnectivity-opensource-src-5.6.2.tar.xz.mirrorlist sha256 1b672923e0703d62f605ccec97b454b1a04c1f0db47f54b687d009e84eabedf9 qtconnectivity-opensource-src-5.6.2.tar.xz -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtconnectivity-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 40638b715517bff8509fe9fe1e6a4e45e0f66e68920605048e080dd023ae7fd5 qtconnectivity-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtconnectivity-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 2c759597ec959d54f29a3f628896d9208cf1f4e2269d8e01a9d3036f6995f3cc qtconnectivity-opensource-src-5.9.2.tar.xz diff --git a/package/qt5/qt5declarative/0001-examples-photoviewer-needs-widgets-support.patch b/package/qt5/qt5declarative/5.6.2/0001-examples-photoviewer-needs-widgets-support.patch similarity index 100% rename from package/qt5/qt5declarative/0001-examples-photoviewer-needs-widgets-support.patch rename to package/qt5/qt5declarative/5.6.2/0001-examples-photoviewer-needs-widgets-support.patch diff --git a/package/qt5/qt5declarative/5.9.1/0001-Fix-alignment-issue-on-ARMv7.patch b/package/qt5/qt5declarative/5.9.1/0001-Fix-alignment-issue-on-ARMv7.patch deleted file mode 100644 index 1d36b805f2..0000000000 --- a/package/qt5/qt5declarative/5.9.1/0001-Fix-alignment-issue-on-ARMv7.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 03c2661b1243cc529fc3d8cfa65073f1da420307 Mon Sep 17 00:00:00 2001 -From: Simon Hausmann -Date: Thu, 22 Jun 2017 13:34:09 +0200 -Subject: [PATCH 1/1] Fix alignment issue on ARMv7 - -As analyzed in the bug report, it appears that we may get -QV4::CompiledData::Function pointers for writing that are not aligned -for the 64-bit fields at the beginning. - -[ChangeLog][QtQml] Fix crash due to misaligned data structures on ARMv7 - -Task-number: QTBUG-61552 -Change-Id: I6b2c166b725496150c8850475577628ccd811d65 -Reviewed-by: Erik Verbruggen -commit: https://codereview.qt-project.org/#/c/198278/ - -Signed-off-by: Petar Koretic ---- - src/qml/compiler/qv4compiler.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/qml/compiler/qv4compiler.cpp b/src/qml/compiler/qv4compiler.cpp -index e32749bbf7..c32e1685a0 100644 ---- a/src/qml/compiler/qv4compiler.cpp -+++ b/src/qml/compiler/qv4compiler.cpp -@@ -406,6 +406,8 @@ QV4::CompiledData::Unit QV4::Compiler::JSUnitGenerator::generateHeader(QV4::Comp - *jsClassDataOffset = nextOffset; - nextOffset += jsClassData.size(); - -+ nextOffset = (nextOffset + 7) & ~quint32(0x7); -+ - for (int i = 0; i < irModule->functions.size(); ++i) { - QV4::IR::Function *f = irModule->functions.at(i); - functionOffsets[i] = nextOffset; --- -2.13.3 - diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index 76f3f0227c..28c2534a82 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtdeclarative-opensource-src-5.6.2.tar.xz.mirrorlist sha256 0086a986bc36b398ba518c404d08cdff0a0d7978c30aa3fa2ab73d71654209da qtdeclarative-opensource-src-5.6.2.tar.xz -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtdeclarative-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 d2fe6c9c1a9f19af6e96553c6d75366ab8f397bc232acd67d31476955fee94ff qtdeclarative-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtdeclarative-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 0d40fd4de9c73b9173d8308c0dc37952bf5c747d87ff221962dd2f848d820b08 qtdeclarative-opensource-src-5.9.2.tar.xz diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 816186ba5b..a0e32ef8a0 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,5 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtgraphicaleffects-opensource-src-5.6.2.tar.xz.mirrorlist sha256 1e9f0fac2c72a812d396db74b2d9d12f513d2ec9135d5982ca85aee7f00be75e qtgraphicaleffects-opensource-src-5.6.2.tar.xz -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtgraphicaleffects-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 5f86c38e36d9553049cfbe56d4869e73cf8ab920905402cbcafb56dd8a1a59ff qtgraphicaleffects-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtgraphicaleffects-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 14594e7eb4b704dd69bf336828306fe8e6537c321d49ee0b701b3b1cdd8bfb76 qtgraphicaleffects-opensource-src-5.9.2.tar.xz diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index 6e0448a425..517dfa9258 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,5 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtimageformats-opensource-src-5.6.2.tar.xz.mirrorlist sha256 4fb153be62dac393cbcebab65040b3b9d6edecd1ebbe5e543401b0e45bd147e4 qtimageformats-opensource-src-5.6.2.tar.xz -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtimageformats-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 79fee307310a66100bd3d907ea69bd039dcd727c15f27e990167e7a27d1b8a47 qtimageformats-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtimageformats-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 3a626ca0ac7ffc56b59c4b3f66aac6bc76954054cedb6938b961562228eb9df3 qtimageformats-opensource-src-5.9.2.tar.xz diff --git a/package/qt5/qt5location/5.9.1/0001-Fix-plugins-build-dependency.patch b/package/qt5/qt5location/5.9.1/0001-Fix-plugins-build-dependency.patch deleted file mode 100644 index 7db2027600..0000000000 --- a/package/qt5/qt5location/5.9.1/0001-Fix-plugins-build-dependency.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3ac051c4549575634cecc706175b019f4ed4c3bf Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sat, 22 Jul 2017 22:47:05 +0200 -Subject: Fix plugins build dependency - -Do not build the plugins before the dependency on module positioning for -the plugin subdir position is available. - -Task-number: QTBUG-62098 -Change-Id: Ic7473db937359f3dad47aef0ffa3671be8cbd349 -Reviewed-by: Alex Blasche - -Upstream: https://code.qt.io/cgit/qt/qtlocation.git/patch/?id=3ac051c4549575634cecc706175b019f4ed4c3bf -Signed-off-by: Peter Seiderer ---- - src/src.pro | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/src.pro b/src/src.pro -index d0a1ee4e7..0c0bf50b1 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -7,8 +7,6 @@ SUBDIRS += positioning - positioning.depends = 3rdparty/clip2tri - - qtHaveModule(quick) { -- plugins.depends += positioning -- - SUBDIRS += location - location.depends += positioning 3rdparty/clip2tri - -@@ -18,6 +16,7 @@ qtHaveModule(quick) { - imports.depends += positioning location - } - -+plugins.depends += positioning - SUBDIRS += plugins - - !android:contains(QT_CONFIG, private_tests) { --- -cgit v1.1-6-g87c4 - diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index 40460600b7..3214d62e73 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,5 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtlocation-opensource-src-5.6.2.tar.xz.mirrorlist sha256 7a8995206ed0220f943a33c037527a1a8243d5386f5ca77bf88152675c28d23a qtlocation-opensource-src-5.6.2.tar.xz -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtlocation-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 4bc43c1df69c5322f982588711d4a65f8408b71a36e43ba19b39d1aae87e1515 qtlocation-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtlocation-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 c81a42e44ebd4e9c33f7195e86af3deab9fde72ef0ad8dcb04acee250d356b0c qtlocation-opensource-src-5.9.2.tar.xz diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index 3e852726ab..6762a50621 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,5 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtmultimedia-opensource-src-5.6.2.tar.xz.mirrorlist sha256 cb9a70a7c6c0eb5be4a3fcaf9590863479e95a255308bbf07d5b7aa303bb8caf qtmultimedia-opensource-src-5.6.2.tar.xz -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtmultimedia-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 e48fbe71b4418eb7caba5ef5aa422483fb28d0e894cbc41f3d8b73b3d7fee6e4 qtmultimedia-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtmultimedia-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 c9a62700024871f204e5f107894c3a339bd645bf6dbac2bcf1bff8ce46842520 qtmultimedia-opensource-src-5.9.2.tar.xz diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index aecc142a99..29fb0b30a8 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,5 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtquickcontrols-opensource-src-5.6.2.tar.xz.mirrorlist sha256 5ed0f2292be10222dfb1b57a05472798fd759279f65455d91c02ef4fb746102c qtquickcontrols-opensource-src-5.6.2.tar.xz -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 520ed0e110f9d0977eb873ea0e05a3d205c9c1b1ad2dd606875708848b21ec2e qtquickcontrols-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtquickcontrols-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 5f09ecf8648acd8abed20d727b8517e0c53cf945e83a992ee58d4baadd84bd1f qtquickcontrols-opensource-src-5.9.2.tar.xz diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index fefaba807e..f20c306411 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,5 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtquickcontrols2-opensource-src-5.6.2.tar.xz.mirrorlist sha256 09dc1710aa4701aebe145829eb99bab94d0870cf578f7dddcec0af92286dfec1 qtquickcontrols2-opensource-src-5.6.2.tar.xz -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols2-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 203be0321112d1513b722fce463f9e30d7d00befb33349901d9517f4f13408ff qtquickcontrols2-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtquickcontrols2-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 2b55dd3dd53b4a6abb0ceb74b7fb98a5e52e9056c71a6cdbaead5cdf9d1ac8d2 qtquickcontrols2-opensource-src-5.9.2.tar.xz diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index 5177d68625..c73ec65fa8 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,5 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtscript-opensource-src-5.6.2.tar.xz.mirrorlist sha256 e06ef6b271cae2187b57cd4ffdd6759428fd47f94a060e2ed2af024a8c14110e qtscript-opensource-src-5.6.2.tar.xz -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtscript-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 176a08865d5f66437b0f279fc5d7f381f359f20bafbffcebdcac61e86415188f qtscript-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtscript-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 47807db5c2684609a0252601fda0a153530a2c97abb8c96df30f4e7897cd40f1 qtscript-opensource-src-5.9.2.tar.xz diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index 4abf6310c8..e1176df65f 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,5 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtsensors-opensource-src-5.6.2.tar.xz.mirrorlist sha256 a7809081aab4f2f0d7a4f40c3abb02e1690bb390d1dd410d7c6c5019a5053427 qtsensors-opensource-src-5.6.2.tar.xz -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtsensors-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 5af19397aa8ccd88c1fbb7cda4ee2a583f05bdf8ae090eb616bb276ff2e9e29c qtsensors-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtsensors-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 79441588c9c8bd1b34b91481441614077ea335a0005e79a1dc68ad964284b5d3 qtsensors-opensource-src-5.9.2.tar.xz diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index c56cfb51d5..28bf6817e0 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,5 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtserialbus-opensource-src-5.6.2.tar.xz.mirrorlist sha256 b39260091691532382935ed51de9ead8e66cfb5f7a6e5410c17cd0695ccaf826 qtserialbus-opensource-src-5.6.2.tar.xz -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtserialbus-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 caa9feefbf1d51b38d6bc923428009d524c0c5eb77f30e4b6d84fec1ce19f3c3 qtserialbus-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtserialbus-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 bbc24bdafd0191fc808e08b19f378e74bedbb79faf4e396b66ba7ca9fed9be08 qtserialbus-opensource-src-5.9.2.tar.xz diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index 7851cd1a2e..3118b6eeec 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,5 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtserialport-opensource-src-5.6.2.tar.xz.mirrorlist sha256 af76281bad2c2bd283189635316b46091f6712134b845ae1b9e3016eec94f376 qtserialport-opensource-src-5.6.2.tar.xz -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtserialport-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 e1fe85bf292929c3a62cb4d21efaaa4e89f70f48ea10914da07d0670ec617a69 qtserialport-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtserialport-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 50ed9cc22db1615bc00267d24b0819813b854af3651ab6e5ffaa7f7c7e62cd42 qtserialport-opensource-src-5.9.2.tar.xz diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index c954efde6c..e18a95c259 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,5 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtsvg-opensource-src-5.6.2.tar.xz.mirrorlist sha256 f7a361bf661b31ae7779513559dd0b774171911bc57f5cfb6bed6878ddc8bc4e qtsvg-opensource-src-5.6.2.tar.xz -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtsvg-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 99f294f874b13553e4ed49cd9465580ad0c9b92e29cdfa47b2e4096835c1e2e5 qtsvg-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtsvg-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 ba96ebfbb60d2793547295b7122a127d21ba44cf586bfd3c8212c59d68661108 qtsvg-opensource-src-5.9.2.tar.xz diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index ae8513f065..4a809031e8 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,5 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qttools-opensource-src-5.6.2.tar.xz.mirrorlist sha256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 qttools-opensource-src-5.6.2.tar.xz -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qttools-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 c4eb56cf24a75661b8317b566be37396c90357b4f6730ef12b8c97a7079ca0e8 qttools-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qttools-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a qttools-opensource-src-5.9.2.tar.xz diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 4e66dc708f..22ce33e6a1 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtvirtualkeyboard-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 6b746a6dc3ab54edf3007d0f6a2f8f31281aed03629830f59acfbc8514d6e94c qtvirtualkeyboard-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtvirtualkeyboard-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 e836ca0348b21df28635e541713726444abed7b53a0acf3358cc90532e64c6fc qtvirtualkeyboard-opensource-src-5.9.2.tar.xz diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index 95b88241b3..36ef13c68d 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ # hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtwayland-opensource-src-5.6.2.tar.xz.mirrorlist sha256 035c3199f4719627b64b7020f0f4574da2b4cb78c6981aba75f27b872d8e6c86 qtwayland-opensource-src-5.6.2.tar.xz -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwayland-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 cf0cb1982a7b748bfec8c7834691f13072f104884c61809d0bbd1a01ebda3ffa qtwayland-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtwayland-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 f6434d03f933867dfb219abec2cf19e2c1d1ef23d46d12cb9333c8066027f6c6 qtwayland-opensource-src-5.9.2.tar.xz diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index 27c3b0a60a..b9be44e811 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,5 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtwebchannel-opensource-src-5.6.2.tar.xz.mirrorlist sha256 700efdef5f51bdb77093f4db212afe275ad35a710ea08ba0e9e9cbc8f09f1a52 qtwebchannel-opensource-src-5.6.2.tar.xz -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebchannel-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 80425f5a6df8784f5221809ffd664486ed38427f514ab4ec174e20456b027000 qtwebchannel-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtwebchannel-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 9c1b4defecadd7f9ee15d5815d464abef0961fc565cc7831720fc7c0c0d13a26 qtwebchannel-opensource-src-5.9.2.tar.xz diff --git a/package/qt5/qt5webengine/5.9.1/0001-Always-compile-QWebEnginePage-print.patch b/package/qt5/qt5webengine/5.9.1/0001-Always-compile-QWebEnginePage-print.patch deleted file mode 100644 index 5e863231ac..0000000000 --- a/package/qt5/qt5webengine/5.9.1/0001-Always-compile-QWebEnginePage-print.patch +++ /dev/null @@ -1,246 +0,0 @@ -From 085c2c529473bbe9dd7c8c5698a45053520cc423 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?J=C3=BCri=20Valdmann?= -Date: Tue, 20 Jun 2017 15:36:43 +0200 -Subject: [PATCH 1/1] Always compile QWebEnginePage::print - -- Remove two out of five layers of ifdefs around and inside this method. -- Now always compiled but will yield an error if printing is disabled. -- Remove printing-related ifdefs from demobrowser. - -Task-number: QTBUG-61510 -Change-Id: I79781189d3d3fb62db0a2216b2b989e3fa1d1f86 -Reviewed-by: Allan Sandfeld Jensen -Reviewed-by: Rolf Eike Beer -Upstream-Status: Merged -Signed-off-by: Gaël PORTAY ---- - examples/webenginewidgets/demobrowser/browsermainwindow.cpp | 12 ------------ - examples/webenginewidgets/demobrowser/browsermainwindow.h | 6 ------ - examples/webenginewidgets/demobrowser/printtopdfdialog.cpp | 7 ------- - src/webenginewidgets/api/qwebenginepage.cpp | 10 ++-------- - src/webenginewidgets/api/qwebenginepage.h | 8 -------- - 5 files changed, 2 insertions(+), 41 deletions(-) - -diff --git a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp -index 327d7a9d..14d49f7f 100644 ---- a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp -+++ b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp -@@ -109,9 +109,7 @@ BrowserMainWindow::BrowserMainWindow(QWidget *parent, Qt::WindowFlags flags) - , m_historyForward(0) - , m_stop(0) - , m_reload(0) --#ifndef QT_NO_PRINTER - , m_currentPrinter(nullptr) --#endif - { - setToolButtonStyle(Qt::ToolButtonFollowStyle); - setAttribute(Qt::WA_DeleteOnClose, true); -@@ -312,9 +310,7 @@ void BrowserMainWindow::setupMenu() - #if defined(QWEBENGINEPAGE_PRINT) - fileMenu->addAction(tr("P&rint Preview..."), this, SLOT(slotFilePrintPreview())); - #endif --#ifndef QT_NO_PRINTER - fileMenu->addAction(tr("&Print..."), this, SLOT(slotFilePrint()), QKeySequence::Print); --#endif - fileMenu->addAction(tr("&Print to PDF..."), this, SLOT(slotFilePrintToPDF())); - fileMenu->addSeparator(); - -@@ -702,23 +698,19 @@ void BrowserMainWindow::slotFileOpen() - - void BrowserMainWindow::slotFilePrintPreview() - { --#ifndef QT_NO_PRINTPREVIEWDIALOG - if (!currentTab()) - return; - QPrintPreviewDialog *dialog = new QPrintPreviewDialog(this); - connect(dialog, SIGNAL(paintRequested(QPrinter*)), - currentTab(), SLOT(print(QPrinter*))); - dialog->exec(); --#endif - } - - void BrowserMainWindow::slotFilePrint() - { --#ifndef QT_NO_PRINTER - if (!currentTab()) - return; - printRequested(currentTab()->page()); --#endif - } - - void BrowserMainWindow::slotHandlePdfPrinted(const QByteArray& result) -@@ -751,7 +743,6 @@ void BrowserMainWindow::slotFilePrintToPDF() - currentTab()->page()->printToPdf(invoke(this, &BrowserMainWindow::slotHandlePdfPrinted), dialog->pageLayout()); - } - --#ifndef QT_NO_PRINTER - void BrowserMainWindow::slotHandlePagePrinted(bool result) - { - Q_UNUSED(result); -@@ -763,7 +754,6 @@ void BrowserMainWindow::slotHandlePagePrinted(bool result) - - void BrowserMainWindow::printRequested(QWebEnginePage *page) - { --#ifndef QT_NO_PRINTDIALOG - if (m_currentPrinter) - return; - m_currentPrinter = new QPrinter(); -@@ -774,9 +764,7 @@ void BrowserMainWindow::printRequested(QWebEnginePage *page) - return; - } - page->print(m_currentPrinter, invoke(this, &BrowserMainWindow::slotHandlePagePrinted)); --#endif - } --#endif - - void BrowserMainWindow::slotPrivateBrowsing() - { -diff --git a/examples/webenginewidgets/demobrowser/browsermainwindow.h b/examples/webenginewidgets/demobrowser/browsermainwindow.h -index 91e1c1d2..5bbbb292 100644 ---- a/examples/webenginewidgets/demobrowser/browsermainwindow.h -+++ b/examples/webenginewidgets/demobrowser/browsermainwindow.h -@@ -56,9 +56,7 @@ - #include - - QT_BEGIN_NAMESPACE --#ifndef QT_NO_PRINTER - class QPrinter; --#endif - class QWebEnginePage; - QT_END_NAMESPACE - -@@ -142,10 +140,8 @@ private slots: - void slotSwapFocus(); - void slotHandlePdfPrinted(const QByteArray&); - --#ifndef QT_NO_PRINTER - void slotHandlePagePrinted(bool result); - void printRequested(QWebEnginePage *page); --#endif - void geometryChangeRequested(const QRect &geometry); - void updateToolbarActionText(bool visible); - void updateBookmarksToolbarActionText(bool visible); -@@ -180,9 +176,7 @@ private: - QAction *m_restoreLastSession; - QAction *m_addBookmark; - --#ifndef QT_NO_PRINTER - QPrinter *m_currentPrinter; --#endif - - QIcon m_reloadIcon; - QIcon m_stopIcon; -diff --git a/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp b/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp -index 0f3b1765..50a8bb91 100644 ---- a/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp -+++ b/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp -@@ -52,10 +52,8 @@ - #include "ui_printtopdfdialog.h" - - #include --#ifndef QT_NO_PRINTER - #include - #include --#endif // QT_NO_PRINTER - #include - - PrintToPdfDialog::PrintToPdfDialog(const QString &filePath, QWidget *parent) : -@@ -66,11 +64,8 @@ PrintToPdfDialog::PrintToPdfDialog(const QString &filePath, QWidget *parent) : - ui->setupUi(this); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - connect(ui->chooseFilePathButton, &QToolButton::clicked, this, &PrintToPdfDialog::onChooseFilePathButtonClicked); --#ifndef QT_NO_PRINTER - connect(ui->choosePageLayoutButton, &QToolButton::clicked, this, &PrintToPdfDialog::onChoosePageLayoutButtonClicked); --#else - ui->choosePageLayoutButton->hide(); --#endif // QT_NO_PRINTER - updatePageLayoutLabel(); - setFilePath(filePath); - } -@@ -82,7 +77,6 @@ PrintToPdfDialog::~PrintToPdfDialog() - - void PrintToPdfDialog::onChoosePageLayoutButtonClicked() - { --#ifndef QT_NO_PRINTER - QPrinter printer; - printer.setPageLayout(currentPageLayout); - -@@ -92,7 +86,6 @@ void PrintToPdfDialog::onChoosePageLayoutButtonClicked() - currentPageLayout.setPageSize(printer.pageLayout().pageSize()); - currentPageLayout.setOrientation(printer.pageLayout().orientation()); - updatePageLayoutLabel(); --#endif // QT_NO_PRINTER - } - - void PrintToPdfDialog::onChooseFilePathButtonClicked() -diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp -index 2cdb0116..6042b9fd 100644 ---- a/src/webenginewidgets/api/qwebenginepage.cpp -+++ b/src/webenginewidgets/api/qwebenginepage.cpp -@@ -80,11 +80,9 @@ - #include - #include - #include --#if defined(QT_PRINTSUPPORT_LIB) --#ifndef QT_NO_PRINTER -+#ifdef ENABLE_PRINTING - #include --#endif //QT_NO_PRINTER --#endif //QT_PRINTSUPPORT_LIB -+#endif - #include - #include - #include -@@ -2051,8 +2049,6 @@ void QWebEnginePage::printToPdf(const QWebEngineCallback &res - #endif // if defined(ENABLE_PDF) - } - --#if defined(QT_PRINTSUPPORT_LIB) --#ifndef QT_NO_PRINTER - /*! - \fn void QWebEnginePage::print(QPrinter *printer, FunctorOrLambda resultCallback) - Renders the current content of the page into a temporary PDF document, then prints it using \a printer. -@@ -2089,8 +2085,6 @@ void QWebEnginePage::print(QPrinter *printer, const QWebEngineCallback &re - d->m_callbacks.invokeDirectly(resultCallback, false); - #endif // if defined(ENABLE_PDF) - } --#endif // if defined(QT_NO_PRINTER) --#endif // if defined(QT_PRINTSUPPORT_LIB) - - /*! - \since 5.7 -diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h -index c7d5a19e..5619639c 100644 ---- a/src/webenginewidgets/api/qwebenginepage.h -+++ b/src/webenginewidgets/api/qwebenginepage.h -@@ -55,11 +55,7 @@ - - QT_BEGIN_NAMESPACE - class QMenu; --#if defined(QT_PRINTSUPPORT_LIB) --#ifndef QT_NO_PRINTER - class QPrinter; --#endif // QT_NO_PRINTER --#endif // QT_PRINTSUPPORT_LIB - - class QWebChannel; - class QWebEngineContextMenuData; -@@ -294,15 +290,11 @@ public: - void printToPdf(const QWebEngineCallback &resultCallback, const QPageLayout &layout = QPageLayout(QPageSize(QPageSize::A4), QPageLayout::Portrait, QMarginsF())); - #endif - --#if defined(QT_PRINTSUPPORT_LIB) --#ifndef QT_NO_PRINTER - #ifdef Q_QDOC - void print(QPrinter *printer, FunctorOrLambda resultCallback); - #else - void print(QPrinter *printer, const QWebEngineCallback &resultCallback); - #endif // QDOC --#endif // QT_NO_PRINTER --#endif // QT_PRINTSUPPORT_LIB - - const QWebEngineContextMenuData &contextMenuData() const; - --- -2.13.2 - diff --git a/package/qt5/qt5webengine/5.9.1/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch b/package/qt5/qt5webengine/5.9.2/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch similarity index 100% rename from package/qt5/qt5webengine/5.9.1/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch rename to package/qt5/qt5webengine/5.9.2/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash index d45500c441..918f7edb3a 100644 --- a/package/qt5/qt5webengine/qt5webengine.hash +++ b/package/qt5/qt5webengine/qt5webengine.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebengine-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 f6a37eeb9188474a16d29ede498fce959396ab80329a0a83eaeb925251686401 qtwebengine-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtwebengine-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 cab069e4589f806640bebe4077c70e5cd5ffeb146c6e8caca6c4454fc0c4a108 qtwebengine-opensource-src-5.9.2.tar.xz diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 7e9db767f8..6e982e6bc7 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -4,8 +4,15 @@ # ################################################################################ +# no 5.9.2 package available, fall back to 5.9.1 version +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +QT5WEBKIT_VERSION = 5.9.1 +QT5WEBKIT_SITE = http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules +else QT5WEBKIT_VERSION = $(QT5_VERSION) QT5WEBKIT_SITE = $(QT5_SITE) +endif + QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz QT5WEBKIT_DEPENDENCIES = \ host-bison host-flex host-gperf host-python host-ruby \ diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index c95027b509..56679bef39 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,5 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtwebsockets-opensource-src-5.6.2.tar.xz.mirrorlist sha256 3cd9d4bbff8e6be5e252f00fc9ecb9ac2d8a193020288c7d1e82583daeb5ba35 qtwebsockets-opensource-src-5.6.2.tar.xz -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebsockets-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 01277362430b5a75c19a16ded8cf4c53a3bccddcc0ba2f50648e0f2985f23464 qtwebsockets-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtwebsockets-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 afddc1bd915ea47ccbec968a7af02e2a5405c717830e4671924fe35b55e81674 qtwebsockets-opensource-src-5.9.2.tar.xz diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index a1ac2b74b9..420ce9fb8b 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,5 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtx11extras-opensource-src-5.6.2.tar.xz.mirrorlist sha256 71ffde1cfaeec310677b69ecd16cb5992e8885cf3e73b4cec7d6e7a115b40ced qtx11extras-opensource-src-5.6.2.tar.xz -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtx11extras-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 a63d0e28958331d672dbd0f8c554bdaddbc974a27be37601f7f221a2ef1ad601 qtx11extras-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtx11extras-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 db85450ad4851816a4fade1ffc10d078d28f2cca174cffa6cbd6d1220b395ac5 qtx11extras-opensource-src-5.9.2.tar.xz diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index bf8c04af52..4cde0f8794 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,5 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtxmlpatterns-opensource-src-5.6.2.tar.xz.mirrorlist sha256 7c6df3eebf188d8ce6822a22cebbc63da5ac27047cf1bd7236d5b988244782cc qtxmlpatterns-opensource-src-5.6.2.tar.xz -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtxmlpatterns-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 b584686496ad1b1b3426d642bd705cab3fc02313b067a33d1b826a27aee29c24 qtxmlpatterns-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtxmlpatterns-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 0aa6aa83087d5754cfefaa3d119454009fc2dd5f266c1eb2ea7a434cef22d34e qtxmlpatterns-opensource-src-5.9.2.tar.xz