package/qt5: bump version to 5.15.1
PATCH 1/3 package/qt5: bump version to 5.15.1
qt5base:
- remove 0005-evdevkeyboard-fix-input_event-time-related-compile.patch (upstream [1])
- remove 0006-evdevtouch-fix-input_event-time-related-compile.patch (upstream [2])
- remove 0007-qimage_conversions-arm-neon-draw-helper-only-availab.patch (upstream [3])
qt5declarative:
- remove 0002-examples-fix-parallel-install.patch (superseeded by upstream commit [4])
qt5imageformats:
- remove 0001-fix-build-on-Arch-Linux.patch
(upstream [5])
qt5tools:
- rebased 0001-Disable-designer-tool-fixes-configure-error.patch
[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=c5b8b662105cc5ced968da9f567fe1134c52d6b5
[2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=71fb4d081c7f3675939ac8c62063631a18175fd1
[3] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=2246f270ffd3875cad8c334fdf4878be48620514
[4] https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=1f0b3a54ffa2ab0dc0cdff1345980ea68d749d24
[5] https://code.qt.io/cgit/qt/qtimageformats.git/commit/?id=704868db61be1542c2d9e2b75ead00c45c56cc36
--- package/qt5/qt5.mk | 2 +- package/qt5/qt53d/qt53d.hash | 4 +- ...fix-input_event-time-related-compile.patch | 57 ------ ...fix-input_event-time-related-compile.patch | 57 ------ ...ns-arm-neon-draw-helper-only-availab.patch | 58 ------ package/qt5/qt5base/qt5base.hash | 4 +- package/qt5/qt5charts/qt5charts.hash | 4 +- .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- .../0002-examples-fix-parallel-install.patch | 190 ------------------ .../qt5/qt5declarative/qt5declarative.hash | 4 +- .../qt5graphicaleffects.hash | 4 +- .../0001-fix-build-on-Arch-Linux.patch | 37 ---- .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- package/qt5/qt5location/qt5location.hash | 4 +- package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- .../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- .../qt5quicktimeline/qt5quicktimeline.hash | 4 +- package/qt5/qt5script/qt5script.hash | 4 +- package/qt5/qt5scxml/qt5scxml.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 +- ...-designer-tool-fixes-configure-error.patch | 23 ++- package/qt5/qt5tools/qt5tools.hash | 4 +- .../qt5virtualkeyboard.hash | 4 +- package/qt5/qt5wayland/qt5wayland.hash | 4 +- package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- package/qt5/qt5webengine/qt5webengine.hash | 4 +- package/qt5/qt5websockets/qt5websockets.hash | 4 +- package/qt5/qt5webview/qt5webview.hash | 4 +- package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- 34 files changed, 69 insertions(+), 463 deletions(-) delete mode 100644 package/qt5/qt5base/0005-evdevkeyboard-fix-input_event-time-related-compile.patch delete mode 100644 package/qt5/qt5base/0006-evdevtouch-fix-input_event-time-related-compile.patch delete mode 100644 package/qt5/qt5base/0007-qimage_conversions-arm-neon-draw-helper-only-availab.patch delete mode 100644 package/qt5/qt5declarative/0002-examples-fix-parallel-install.patch delete mode 100644 package/qt5/qt5imageformats/0001-fix-build-on-Arch-Linux.patch
package/qt5/qt5.mk +1 -1
@@ -5,7 +5,7 @@ ################################################################################ QT5_VERSION_MAJOR = 5.15 -QT5_VERSION = $(QT5_VERSION_MAJOR).0 +QT5_VERSION = $(QT5_VERSION_MAJOR).1 QT5_SOURCE_TARBALL_PREFIX = everywhere-src QT5_SITE = https://download.qt.io/archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules
package/qt5/qt53d/qt53d.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qt3d-everywhere-src-5.15.0.tar.xz.sha256 -sha256 61856f0c453b79e98b7a1e65ea8f59976fa78230ffa8dec959b5f4b45383dffd qt3d-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qt3d-everywhere-src-5.15.1.tar.xz.sha256 +sha256 29aac2c38b6b2fb1e7d54829ff8b4c9aae12a70ffab9707c7388f1e134dd9411 qt3d-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL
package/qt5/qt5base/0005-evdevkeyboard-fix-input_event-time-related-compile.patch deleted +0 -57
57 lines not on this page · raw message
package/qt5/qt5base/0006-evdevtouch-fix-input_event-time-related-compile.patch deleted +0 -57
57 lines not on this page · raw message
package/qt5/qt5base/0007-qimage_conversions-arm-neon-draw-helper-only-availab.patch deleted +0 -58
58 lines not on this page · raw message
package/qt5/qt5base/qt5base.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz.sha256 -sha256 9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5 qtbase-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtbase-everywhere-src-5.15.1.tar.xz.sha256 +sha256 33960404d579675b7210de103ed06a72613bfc4305443e278e2d32a3eb1f3d8c qtbase-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5charts/qt5charts.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtcharts-everywhere-src-5.15.0.tar.xz.sha256 -sha256 44a24fc16abcaf9ae97ecf3215f6f3b44ebdb3b73bcb4ed3549a51519e4883a7 qtcharts-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtcharts-everywhere-src-5.15.1.tar.xz.sha256 +sha256 a59efbf095bf8a62c29f6fe90a3e943bbc7583d1d2fed16681675b923c45ef3b qtcharts-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
package/qt5/qt5connectivity/qt5connectivity.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtconnectivity-everywhere-src-5.15.0.tar.xz.sha256 -sha256 f911fb8f8bf3a9958785d0378d25ced8989047938b7138d619854a94fa0b27dd qtconnectivity-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtconnectivity-everywhere-src-5.15.1.tar.xz.sha256 +sha256 53c30039d4f2301a1a66c646690436e1f8cce0a3fd212ca0783f346a115d8016 qtconnectivity-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5declarative/0002-examples-fix-parallel-install.patch deleted +0 -190
190 lines not on this page · raw message
package/qt5/qt5declarative/qt5declarative.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtdeclarative-everywhere-src-5.15.0.tar.xz.sha256 -sha256 9c3c93fb7d340b2f7d738d12408c047318c78973cb45bfc5ff6b3a57e1fef699 qtdeclarative-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtdeclarative-everywhere-src-5.15.1.tar.xz.sha256 +sha256 7e30f0ccba61f9d71720b91d7f7523c23677f23cd96065cb71df1b0df329d768 qtdeclarative-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtgraphicaleffects-everywhere-src-5.15.0.tar.xz.sha256 -sha256 0d2ea4bc73b9df13a4b739dcbc1e3c7b298c7e682f7f9252b232e3bde7b63eda qtgraphicaleffects-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtgraphicaleffects-everywhere-src-5.15.1.tar.xz.sha256 +sha256 f4a4d3e1c6d8b0b200b6759ebb615344275957d56d2ef6a33641f853120466d1 qtgraphicaleffects-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5imageformats/0001-fix-build-on-Arch-Linux.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From 704868db61be1542c2d9e2b75ead00c45c56cc36 Mon Sep 17 00:00:00 2001 -From: "Evgeniy A. Dushistov" <[email protected]> -Date: Sat, 15 Aug 2020 15:09:08 +0300 -Subject: fix build on Arch Linux -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -qtimageformats/src/plugins/imageformats/jp2/qjp2handler.cpp:844:41: -error: no declaration of ?pow? - 844 | const double jasperRate = minRate + pow((double(quality) / double(maxQuality)), 2) * maxRate; - -Pick-to: 5.15 -Change-Id: I085996c2db2251903b2a3e52e6e648831637c8f9 -Reviewed-by: Shawn Rutledge <[email protected]> -[Retrieved from: -https://code.qt.io/cgit/qt/qtimageformats.git/commit/?id=704868db61be1542c2d9e2b75ead00c45c56cc36] -Signed-off-by: Fabrice Fontaine <[email protected]> ---- - src/plugins/imageformats/jp2/qjp2handler.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/plugins/imageformats/jp2/qjp2handler.cpp b/src/plugins/imageformats/jp2/qjp2handler.cpp -index 4311d26..05c7bc1 100644 ---- a/src/plugins/imageformats/jp2/qjp2handler.cpp -+++ b/src/plugins/imageformats/jp2/qjp2handler.cpp -@@ -45,6 +45,7 @@ - #include "qcolor.h" - - #include <jasper/jasper.h> -+#include <math.h> // for pow - - QT_BEGIN_NAMESPACE - --- -cgit v1.2.1 -
package/qt5/qt5imageformats/qt5imageformats.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtimageformats-everywhere-src-5.15.0.tar.xz.sha256 -sha256 83f32101b1a898fcb8ed6f11a657d1125484ac0c2223014b61849d9010efebc8 qtimageformats-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtimageformats-everywhere-src-5.15.1.tar.xz.sha256 +sha256 75e72b4c11df97af3ff64ed26df16864ce1220a1cc730e49074ab9d72f658568 qtimageformats-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
package/qt5/qt5location/qt5location.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtlocation-everywhere-src-5.15.0.tar.xz.sha256 -sha256 c68b0778a521e5522641c41b1778999dd408ebfda1e0de166a83743268be5f3f qtlocation-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtlocation-everywhere-src-5.15.1.tar.xz.sha256 +sha256 093af763a70d126c4b9f6a22ebf8218fe95dc0151e40666b2389fdf55c9f1a2c qtlocation-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5multimedia/qt5multimedia.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtmultimedia-everywhere-src-5.15.0.tar.xz.sha256 -sha256 0708d867697f392dd3600c5c1c88f5c61b772a5250a4d059dca67b844af0fbd7 qtmultimedia-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtmultimedia-everywhere-src-5.15.1.tar.xz.sha256 +sha256 ed6e75bec9c98559c0fbc91ff746185b1e1845139b2c7a5a843e1e8880697d99 qtmultimedia-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5quickcontrols/qt5quickcontrols.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtquickcontrols-everywhere-src-5.15.0.tar.xz.sha256 -sha256 7072cf4cd27e9f18b36b1c48dec7c79608cf87ba847d3fc3de133f220ec1acee qtquickcontrols-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtquickcontrols-everywhere-src-5.15.1.tar.xz.sha256 +sha256 0172f88779305aae57f3842538e91361ae9bc5ca2275ee5ce9d455309f0f2c7e qtquickcontrols-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtquickcontrols2-everywhere-src-5.15.0.tar.xz.sha256 -sha256 839abda9b58cd8656b2e5f46afbb484e63df466481ace43318c4c2022684648f qtquickcontrols2-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtquickcontrols2-everywhere-src-5.15.1.tar.xz.sha256 +sha256 e902b3baf9fe02a5bd675fc71118e282bb6a128c94f45be6f65d7d6db991f2af qtquickcontrols2-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3
package/qt5/qt5quicktimeline/qt5quicktimeline.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtquicktimeline-everywhere-src-5.15.0.tar.xz.sha256 -sha256 16ffeb733ba15815121fca5705ed5220ce0a0eb2ec0431ad0d55da9426a03c00 qtquicktimeline-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtquicktimeline-everywhere-src-5.15.1.tar.xz.sha256 +sha256 15665d489a6a29ff406a5fe2b4ac14ab102fb6e43864e115432be065da073cca qtquicktimeline-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
package/qt5/qt5script/qt5script.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtscript-everywhere-src-5.15.0.tar.xz.sha256 -sha256 02dc21b309621876a89671be27cea86a58e74a96aa28da65fe1b37a3aad29373 qtscript-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtscript-everywhere-src-5.15.1.tar.xz.sha256 +sha256 0a62152835363a9cc20558d0c2953ec03426324138578baa18fc2cc4d62b18ca qtscript-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
package/qt5/qt5scxml/qt5scxml.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtscxml-everywhere-src-5.15.0.tar.xz.sha256 -sha256 9c3a72bf5ebd07553b0049cc1943f04cff93b7e53bde8c81d652422dbf12ff72 qtscxml-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtscxml-everywhere-src-5.15.1.tar.xz.sha256 +sha256 2289f8c1b51ac368cc0ba8a6a987b44d2c97b43697b00e64582e43afedffcd2b qtscxml-everywhere-src-5.15.1.tar.xz # Hashes for license files:
package/qt5/qt5sensors/qt5sensors.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtsensors-everywhere-src-5.15.0.tar.xz.sha256 -sha256 12b17ed6cbe6c49c8ab71958bc5d8ad1c42bf20e2fa72613ede11001e98144da qtsensors-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtsensors-everywhere-src-5.15.1.tar.xz.sha256 +sha256 8096b9ffe737434f9564432048f622f6be795619da4e1ed362ce26dddb2cea00 qtsensors-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5serialbus/qt5serialbus.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtserialbus-everywhere-src-5.15.0.tar.xz.sha256 -sha256 cee067c84d025e221b83d109b58ea16c4d2dc0af0aea45cc6724acd33a1b7379 qtserialbus-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtserialbus-everywhere-src-5.15.1.tar.xz.sha256 +sha256 9ee220826032ae1f8e68d9ec7dddc10ddc4c2e0a771d34009ae307b07eeca751 qtserialbus-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
package/qt5/qt5serialport/qt5serialport.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtserialport-everywhere-src-5.15.0.tar.xz.sha256 -sha256 ba19369069a707dffddca8d9c477bb2bb4aa26630dfee6792254c4bf9bd57a67 qtserialport-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtserialport-everywhere-src-5.15.1.tar.xz.sha256 +sha256 3605130148936ec3fd632bc13c70873d74ef9a8a0b28b17f3be917d848cfb8d9 qtserialport-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5svg/qt5svg.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtsvg-everywhere-src-5.15.0.tar.xz.sha256 -sha256 ee4d287e2e205ca8c08921b9cbe0fc58bf46be080b5359ad4d7fbdee44aeee0d qtsvg-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtsvg-everywhere-src-5.15.1.tar.xz.sha256 +sha256 308160223c0bd7492d56fb5d7b7f705bfb130947ac065bf39280ec6d7cbe4f6a qtsvg-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch +14 -9
@@ -1,4 +1,4 @@ -From a70da8d731b969305096a0213b70659dc641591a Mon Sep 17 00:00:00 2001 +From 34894c12122b2026aa595b42fe84a4648a6b7992 Mon Sep 17 00:00:00 2001 From: Peter Seiderer <[email protected]> Date: Tue, 17 Dec 2019 11:01:59 +0100 Subject: [PATCH] Disable designer tool (fixes configure error).
@@ -11,10 +11,12 @@ Fixes: Signed-off-by: Peter Seiderer <[email protected]> [Rebased for Qt5.15.0] Signed-off-by: Peter Seiderer <[email protected]> +[Rebased for Qt5.15.1] +Signed-off-by: Peter Seiderer <[email protected]> --- src/linguist/linguist/linguist.pro | 2 +- - src/src.pro | 3 --- - 2 files changed, 1 insertion(+), 4 deletions(-) + src/src.pro | 5 +---- + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/linguist/linguist/linguist.pro b/src/linguist/linguist/linguist.pro index d083896..7d74cfc 100644
@@ -27,20 +29,23 @@ index d083896..7d74cfc 100644 DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII diff --git a/src/src.pro b/src/src.pro -index 5c256ea..6d079be 100644 +index 8ed567b..d784808 100644 --- a/src/src.pro +++ b/src/src.pro -@@ -7,10 +7,7 @@ qtHaveModule(widgets) { +@@ -6,12 +6,9 @@ qtHaveModule(widgets) { + } else { QT_FOR_CONFIG += widgets qtConfig(pushbutton):qtConfig(toolbutton) { - SUBDIRS = assistant \ -- designer \ - pixeltool +- SUBDIRS = designer \ +- pixeltool ++ SUBDIRS = pixeltool + + !static|contains(QT_PLUGINS, qtsqlite): SUBDIRS += assistant - - linguist.depends = designer } qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator } -- -2.26.2 +2.28.0
package/qt5/qt5tools/qt5tools.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qttools-everywhere-src-5.15.0.tar.xz.sha256 -sha256 ddbcb49aab3a2e3672582c6e2e7bec0058feff790f67472343c79e2895e0e437 qttools-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qttools-everywhere-src-5.15.1.tar.xz.sha256 +sha256 c98ee5f0f980bf68cbf0c94d62434816a92441733de50bd9adbe9b9055f03498 qttools-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz.sha256 -sha256 f22f9204ab65578d9c8aa832a8a39108f826e00a7d391c7884ff490c587f34be qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtvirtualkeyboard-everywhere-src-5.15.1.tar.xz.sha256 +sha256 8cf62c4f0662f3f4b52b32f9d2cf1845a636d3df663869a98d47dfe748eb1c3d qtvirtualkeyboard-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
package/qt5/qt5wayland/qt5wayland.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtwayland-everywhere-src-5.15.0.tar.xz.sha256 -sha256 084133e10bfbd32a28125639660c59975f23457bba6a79b30a25802cec76a9fb qtwayland-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtwayland-everywhere-src-5.15.1.tar.xz.sha256 +sha256 e2ff47b874f283a952efd6a8aaf5e8cdc462b5216dda1051b60fc6e80ac657b6 qtwayland-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5webchannel/qt5webchannel.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtwebchannel-everywhere-src-5.15.0.tar.xz.sha256 -sha256 ea80510b363e6f92ce99932f06d176e43459c4a5159fe97b5ef96fcfbab5ed4f qtwebchannel-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtwebchannel-everywhere-src-5.15.1.tar.xz.sha256 +sha256 7f3ef8e626d932bbc121810661a62ece3955ab982340676a19001417e2faf9fc qtwebchannel-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5webengine/qt5webengine.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtwebengine-everywhere-src-5.15.0.tar.xz.sha256 -sha256 c38e2fda7ed1b7d5a90f26abf231ec0715d78a5bc39a94673d8e39d75f04c5df qtwebengine-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtwebengine-everywhere-src-5.15.1.tar.xz.sha256 +sha256 f903e98fe3cd717161252710125fce011cf882ced96c24968b0c38811fbefdf2 qtwebengine-everywhere-src-5.15.1.tar.xz # Locally calculated sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium
package/qt5/qt5websockets/qt5websockets.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtwebsockets-everywhere-src-5.15.0.tar.xz.sha256 -sha256 87c2f6542778f9b65b3f208740c1d0db643fd0bede21404b9abb265355da5092 qtwebsockets-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtwebsockets-everywhere-src-5.15.1.tar.xz.sha256 +sha256 5f30053a0a794676ce7d7521f6b789409cc449a7e90cab547d871fc07a61dd7e qtwebsockets-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5webview/qt5webview.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtwebview-everywhere-src-5.15.0.tar.xz.sha256 -sha256 b87ea205ce79c6b438ebe596e91fa80ba11f6aac7e89ffbf52b337d0fc8d6660 qtwebview-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtwebview-everywhere-src-5.15.1.tar.xz.sha256 +sha256 426852a3f569da82aa84dfd7f06c6aeb06488a927b66342a612401b41392b260 qtwebview-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
package/qt5/qt5x11extras/qt5x11extras.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtx11extras-everywhere-src-5.15.0.tar.xz.sha256 -sha256 c72b6c188284facddcf82835af048240e721dc8d6d9e8a7bd71d76fd876881a1 qtx11extras-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtx11extras-everywhere-src-5.15.1.tar.xz.sha256 +sha256 f7cd7c475a41840209808bf8b1de1c6587c3c74e5ae3b0969760b9ed35159e59 qtx11extras-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtxmlpatterns-everywhere-src-5.15.0.tar.xz.sha256 -sha256 2752cf2aa25ebfda89c3736457e27b3d0c7c7ed290dcfd52c209f9f905998507 qtxmlpatterns-everywhere-src-5.15.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtxmlpatterns-everywhere-src-5.15.1.tar.xz.sha256 +sha256 6859d440ce662f3679ce483ebb5a552b619a32517cb1a52a38f967b377857745 qtxmlpatterns-everywhere-src-5.15.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
Signature · 1 line
2.28.0
PATCH 2/3 package/qt5webengine: needs libxkbcommon
Fixes:
subprocess.CalledProcessError: Command '['/home/seiderer/Work/Buildroot/build_rpi4_qt5_update_001/build/qt5webengine-5.15.1/src/core/pkg-config_wrapper.sh', '--variable=prefix', 'xkbcommon']' returned non-zero exit status 1
See //ui/events/keycodes/BUILD.gn:12:3: whence it was called.
pkg_config("xkbcommon") {
^------------------------
See //ui/events/ozone/layout/BUILD.gn:42:15: which caused the file to be included.
deps += [ "//ui/events/keycodes:xkb" ]
^-------------------------Project ERROR: GN run error!
---
Notes:
- send as extra patch as I am not sure if the failure is caused by the version bump and/or by a combination from my buildroot config
--- package/qt5/qt5webengine/Config.in | 1 + package/qt5/qt5webengine/qt5webengine.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
package/qt5/qt5webengine/Config.in +1 -0
@@ -41,6 +41,7 @@ config BR2_PACKAGE_QT5WEBENGINE select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBNSS select BR2_PACKAGE_LIBVPX + select BR2_PACKAGE_LIBXKBCOMMON select BR2_PACKAGE_OPUS select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX
package/qt5/qt5webengine/qt5webengine.mk +1 -1
@@ -7,7 +7,7 @@ QT5WEBENGINE_VERSION = $(QT5_VERSION) QT5WEBENGINE_SITE = $(QT5_SITE) QT5WEBENGINE_SOURCE = qtwebengine-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBENGINE_VERSION).tar.xz -QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx opus webp \ +QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx libxkbcommon opus webp \ qt5declarative qt5webchannel host-bison host-flex host-gperf \ host-pkgconf host-python QT5WEBENGINE_INSTALL_STAGING = YES
Signature · 1 line
2.28.0
PATCH 2/3 package/qt5webengine: needs libxkbcommon
Quoted 9 lines · On Tue, 15 Sep 2020 20:00:03 +0200 Peter Seiderer <[email protected]> wrote:
Fixes:
subprocess.CalledProcessError: Command '['/home/seiderer/Work/Buildroot/build_rpi4_qt5_update_001/build/qt5webengine-5.15.1/src/core/pkg-config_wrapper.sh', '--variable=prefix', 'xkbcommon']' returned non-zero exit status 1See //ui/events/keycodes/BUILD.gn:12:3: whence it was called.
pkg_config("xkbcommon") { ^------------------------ See //ui/events/ozone/layout/BUILD.gn:42:15: which caused the file to be included. deps += [ "//ui/events/keycodes:xkb" ] ^-------------------------
Quoted 7 lines
Project ERROR: GN run error!
Signed-off-by Peter Seiderer <[email protected]>---
Notes:
- send as extra patch as I am not sure if the failure is caused by the version bump and/or by a combination from my buildroot config
Unfortunately, I think we really need to understand if this is a change needed in relation to the bump or not, so that we know if it needs to go in a stable branch.
At least in a simple build of qt5webengine in v5.15.0 I have not encountered this particular build failure. But perhaps it occurs only when you have a bunch of other dependencies enabled.
The BUILD.gn file contains:
if (use_xkbcommon) {
pkg_config("xkbcommon") {
packages = [ "xkbcommon" ]
}
}
And src/buildtools/config/linux.pri seems to be defining the value of use_xkbcommon:
qtConfig(build-qtwebengine-core):qtConfig(webengine-system-xkbcommon) {
gn_args += use_xkbcommon=true
} else {
gn_args += use_xkbcommon=false
}I've never been familiar enough with the .pri syntax though to understand what this is doing.
Could you try to see if the problem really comes from the 5.15.1 bump ?
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 2/3 package/qt5webengine: needs libxkbcommon
Hello Thomas,
Quoted 45 lines · Thomas Petazzoni
Quoted 9 lines · On Tue, 15 Sep 2020 20:00:03 +0200 Peter Seiderer <[email protected]> wrote:
Fixes:
subprocess.CalledProcessError: Command '['/home/seiderer/Work/Buildroot/build_rpi4_qt5_update_001/build/qt5webengine-5.15.1/src/core/pkg-config_wrapper.sh', '--variable=prefix', 'xkbcommon']' returned non-zero exit status 1See //ui/events/keycodes/BUILD.gn:12:3: whence it was called.
pkg_config("xkbcommon") { ^------------------------ See //ui/events/ozone/layout/BUILD.gn:42:15: which caused the file to be included. deps += [ "//ui/events/keycodes:xkb" ] ^-------------------------Quoted 7 lines
Project ERROR: GN run error!
Signed-off-by Peter Seiderer <[email protected]>---
Notes:
- send as extra patch as I am not sure if the failure is caused by the version bump and/or by a combination from my buildroot configUnfortunately, I think we really need to understand if this is a change needed in relation to the bump or not, so that we know if it needs to go in a stable branch.
At least in a simple build of qt5webengine in v5.15.0 I have not encountered this particular build failure. But perhaps it occurs only when you have a bunch of other dependencies enabled.
The BUILD.gn file contains:
if (
use_xkbcommon) {
pkg_config("xkbcommon"){
packages = [ "xkbcommon" ]
}
}And src/buildtools/config/linux.pri seems to be defining the value of
use_xkbcommon:qtConfig(build-qtwebengine-core):qtConfig(webengine-system-xkbcommon) { gn_args += use_xkbcommon=true } else { gn_args += use_xkbcommon=false }
Quoted 4 lines
I've never been familiar enough with the .pri syntax though to understand what this is doing.
Could you try to see if the problem really comes from the 5.15.1 bump ?
qt5webengine-5.15.0 with the same buildroot config compiles fine without libxkbcommon, will try qt5webengine-5.15.1 with a striped down buildroot config to evaluate if some of my buildroot config options enable the need for libxkbcommon...
Regards,
Peter
Quoted 4 lines
Thanks!
Thomas
PATCH 3/3 package/qt5webkit: fix bison-3.7.1 related compile failure
In reply to Peter SeidererAdd gentoo patch to fix bison-3.7.1 related compile failure and an additional one doing a similare change for another bison call in Source/WebCore/DerivedSources.pri.
Fixes:
generated/XPathGrammar.tab.c:124:10: fatal error: XPathGrammar.tab.h: No such file or directory
--- ...te-the-header-directly-to-fix-build-.patch | 52 +++++++++++++++++++ ...te-the-header-directly-to-fix-build-.patch | 31 +++++++++++ 2 files changed, 83 insertions(+) create mode 100644 package/qt5/qt5webkit/0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch create mode 100644 package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch
package/qt5/qt5webkit/0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch new file +52 -0
@@ -0,0 +1,52 @@ +From 894a5448ee8ce0f134845c877b4c0a2a660e4ab3 Mon Sep 17 00:00:00 2001 +From: Dmitry Shachnev <[email protected]> +Date: Tue, 4 Aug 2020 21:04:06 +0300 +Subject: [PATCH] Let Bison generate the header directly, to fix build with + Bison 3.7 + +Starting with Bison 3.7, the generated C++ file #include's the header +by default, instead of duplicating it. So we should not delete it. + +Remove the code to add #ifdef guards to the header, since Bison adds +them itself since version 2.6.3. + +[Original patch taken from +https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch?id=69e618c88a9134f754264efc11aa0b1fdc028b88 +ported to qtwebkit-opensource-src-5.9.1] +Signed-off-by: Peter Seiderer <[email protected]> +--- + Source/WebCore/css/makegrammar.pl | 21 +-------------------- + 1 file changed, 1 insertion(+), 20 deletions(-) + +diff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl +index 4e0452ed..9ef32963 100644 +--- a/Source/WebCore/css/makegrammar.pl ++++ b/Source/WebCore/css/makegrammar.pl +@@ -73,23 +73,4 @@ if ($suffix eq ".y.in") { + } + + my $fileBase = File::Spec->join($outputDir, $filename); +-system("$bison -d -p $symbolsPrefix $grammarFilePath -o $fileBase.cpp"); +- +-open HEADER, ">$fileBase.h" or die; +-print HEADER << "EOF"; +-#ifndef CSSGRAMMAR_H +-#define CSSGRAMMAR_H +-EOF +- +-open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die; +-while (<HPP>) { +- print HEADER; +-} +-close HPP; +- +-print HEADER "#endif\n"; +-close HEADER; +- +-unlink("$fileBase.cpp.h"); +-unlink("$fileBase.hpp"); +- ++system("$bison --defines=$fileBase.h -p $symbolsPrefix $grammarFilePath -o $fileBase.cpp"); +-- +2.28.0 +
package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch new file +31 -0
@@ -0,0 +1,31 @@ +From 8959e226fac7f73b9a40e202610bd5e12334561b Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <[email protected]> +Date: Tue, 15 Sep 2020 19:11:18 +0200 +Subject: [PATCH] let bison generate the header directly, to fix build with + bison 3.7 + +Do the same as the patch taken from [1] for the bison call in +Source/WebCore/DerivedSources.pri to fix file generation +for bison 3.7. + +Signed-off-by: Peter Seiderer <[email protected]> +--- + Source/WebCore/DerivedSources.pri | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/WebCore/DerivedSources.pri b/Source/WebCore/DerivedSources.pri +index 57a6b0f7..e9f52614 100644 +--- a/Source/WebCore/DerivedSources.pri ++++ b/Source/WebCore/DerivedSources.pri +@@ -987,7 +987,7 @@ GENERATORS += pluginsresources + # GENERATOR 11: XPATH grammar + xpathbison.output = ${QMAKE_FILE_BASE}.cpp + xpathbison.input = XPATHBISON +-xpathbison.commands = bison -d -p xpathyy ${QMAKE_FILE_NAME} -o ${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.tab.c && $(MOVE) ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.c ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.cpp && $(MOVE) ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.h ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.h ++xpathbison.commands = bison --defines=${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.h -p xpathyy ${QMAKE_FILE_NAME} -o ${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.cpp + xpathbison.depends = ${QMAKE_FILE_NAME} + GENERATORS += xpathbison + +-- +2.28.0 +
Signature · 1 line
2.28.0
PATCH 3/3 package/qt5webkit: fix bison-3.7.1 related compile failure
Quoted 9 lines · On Tue, 15 Sep 2020 20:00:04 +0200 Peter Seiderer <[email protected]> wrote:
Add gentoo patch to fix bison-3.7.1 related compile failure and an additional one doing a similare change for another bison call in Source/WebCore/DerivedSources.pri.
Fixes:
generated/XPathGrammar.tab.c:124:10: fatal error:XPathGrammar.tab.h: No such file or directorySigned-off-by Peter Seiderer <[email protected]>
Here as well, it would be good to understand if this is also happened on 5.15.0 or only with 5.15.1. I assume the former, and I've started a test build to confirm it.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 3/3 package/qt5webkit: fix bison-3.7.1 related compile failure
Hello Thomas,
Quoted 9 lines · Thomas Petazzoni
Quoted 6 lines · On Tue, 15 Sep 2020 20:00:04 +0200 Peter Seiderer <[email protected]> wrote:
Add gentoo patch to fix bison-3.7.1 related compile failure and an additional one doing a similare change for another bison call in Source/WebCore/DerivedSources.pri.
Fixes:
Quoted 7 lines
Quoted 3 lines
generated/XPathGrammar.tab.c:124:10: fatal error:XPathGrammar.tab.h: No such file or directorySigned-off-by Peter Seiderer <[email protected]>Here as well, it would be good to understand if this is also happened on 5.15.0 or only with 5.15.1. I assume the former, and I've started a test build to confirm it.
Same patch is needed by qt5webkit-5.9.1/qt-5.15.0 (before qt version bump) combination, re-ordered the patch set accordingly...
Regards,
Peter
Quoted 4 lines
Thanks!
Thomas
PATCH 1/3 package/qt5: bump version to 5.15.1
In reply to Peter SeidererQuoted 19 lines · On Tue, 15 Sep 2020 20:00:02 +0200 Peter Seiderer <[email protected]> wrote:
qt5base:
- remove 0005-evdevkeyboard-fix-input_event-time-related-compile.patch (upstream [1])
- remove 0006-evdevtouch-fix-input_event-time-related-compile.patch (upstream [2])
- remove 0007-qimage_conversions-arm-neon-draw-helper-only-availab.patch (upstream [3])qt5declarative:
- remove 0002-examples-fix-parallel-install.patch (superseeded by upstream commit [4])qt5imageformats:
- remove 0001-fix-build-on-Arch-Linux.patch
(upstream [5])qt5tools:
- rebased 0001-Disable-designer-tool-fixes-configure-error.patch
Quoted 7 lines
[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=c5b8b662105cc5ced968da9f567fe1134c52d6b5
[2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=71fb4d081c7f3675939ac8c62063631a18175fd1
[3] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=2246f270ffd3875cad8c334fdf4878be48620514
[4] https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=1f0b3a54ffa2ab0dc0cdff1345980ea68d749d24
[5] https://code.qt.io/cgit/qt/qtimageformats.git/commit/?id=704868db61be1542c2d9e2b75ead00c45c56cc36Signed-off-by Peter Seiderer <[email protected]>
There is a small issue when applied, due to the 0002-fix-bison-3.7.patch recently added in qt5webengine, and which is part of 5.15.1 it seems.
Other than that, I did a legal-info on all qt5 packages, and it looked good.
Have you updated the package/qt5/qt5webengine/chromium-latest.inc file ? Perhaps it doesn't need any update, I'm just checking.
I will however not apply this patch, as I have some concerns about PATCH 2/3, which might impact this PATCH 1/3.
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/3 package/qt5: bump version to 5.15.1
Hello Thomas,
Quoted 28 lines · Thomas Petazzoni
Quoted 25 lines · On Tue, 15 Sep 2020 20:00:02 +0200 Peter Seiderer <[email protected]> wrote:
qt5base:
- remove 0005-evdevkeyboard-fix-input_event-time-related-compile.patch (upstream [1])
- remove 0006-evdevtouch-fix-input_event-time-related-compile.patch (upstream [2])
- remove 0007-qimage_conversions-arm-neon-draw-helper-only-availab.patch (upstream [3])qt5declarative:
- remove 0002-examples-fix-parallel-install.patch (superseeded by upstream commit [4])qt5imageformats:
- remove 0001-fix-build-on-Arch-Linux.patch
(upstream [5])qt5tools:
- rebased 0001-Disable-designer-tool-fixes-configure-error.patch[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=c5b8b662105cc5ced968da9f567fe1134c52d6b5
[2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=71fb4d081c7f3675939ac8c62063631a18175fd1
[3] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=2246f270ffd3875cad8c334fdf4878be48620514
[4] https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=1f0b3a54ffa2ab0dc0cdff1345980ea68d749d24
[5] https://code.qt.io/cgit/qt/qtimageformats.git/commit/?id=704868db61be1542c2d9e2b75ead00c45c56cc36
Quoted 5 lines
Quoted 1 line
Signed-off-by Peter Seiderer <[email protected]>There is a small issue when applied, due to the 0002-fix-bison-3.7.patch recently added in qt5webengine, and which is part of 5.15.1 it seems.
Fixed in v2...
Quoted 6 lines
Other than that, I did a legal-info on all qt5 packages, and it looked good.
Have you updated the package/qt5/qt5webengine/chromium-latest.inc file ? Perhaps it doesn't need any update, I'm just checking.
Yes, checked, but no update needed...
Regards,
Peter
Quoted 7 lines
I will however not apply this patch, as I have some concerns about PATCH 2/3, which might impact this PATCH 1/3.
Thanks,
Thomas