package/qt5: bump version to 5.13.2
RFC v4 1/3 package/qt5: bump version to 5.13.2
qt5canvas3d:
- removed with 5.13 according to [1]
qt5webengine:
- remove 0001-pkg_config-Fixes-when-use_sysroot-false.patch (taken from upstream [2])
- update 3rdparty license hash list and chromium-latest.inc file
[1] https://doc.qt.io/qt-5/whatsnew513.html
[2] https://chromium.googlesource.com/chromium/src/+/a8c8396fd20d98666d517c45b358c63736e345ef
---
Changes v1 -> v2:
- remove spurious qt5base commit log entry (leftover from some early draft, suggested by Thomas Petazzoni)
- fix qt5scxml vs. qt5canvas3d typo, reword comment message and fix indent, remove unneeded license condition (suggested by Thomas Petazzoni)
Changes v2 -> v3:
- remove newly added qt5webengine patch
Changes v3 -> v4:
- rebased
--- package/qt5/Config.in | 1 - package/qt5/qt5.mk | 4 +- package/qt5/qt53d/qt53d.hash | 4 +- package/qt5/qt5base/qt5base.hash | 4 +- package/qt5/qt5canvas3d/Config.in | 18 ---- package/qt5/qt5canvas3d/qt5canvas3d.hash | 8 -- package/qt5/qt5canvas3d/qt5canvas3d.mk | 16 --- package/qt5/qt5charts/qt5charts.hash | 4 +- .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- .../qt5/qt5declarative/qt5declarative.hash | 4 +- .../qt5graphicaleffects.hash | 4 +- .../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 +- 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 +- package/qt5/qt5tools/qt5tools.hash | 4 +- .../qt5virtualkeyboard.hash | 4 +- package/qt5/qt5wayland/qt5wayland.hash | 4 +- package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- ..._config-Fixes-when-use_sysroot-false.patch | 57 ---------- package/qt5/qt5webengine/chromium-latest.inc | 86 +++++++++++---- package/qt5/qt5webengine/qt5webengine.hash | 100 +++++++++++++----- package/qt5/qt5websockets/qt5websockets.hash | 4 +- package/qt5/qt5webview/qt5webview.hash | 4 +- package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- 33 files changed, 187 insertions(+), 203 deletions(-) delete mode 100644 package/qt5/qt5canvas3d/Config.in delete mode 100644 package/qt5/qt5canvas3d/qt5canvas3d.hash delete mode 100644 package/qt5/qt5canvas3d/qt5canvas3d.mk delete mode 100644 package/qt5/qt5webengine/0001-pkg_config-Fixes-when-use_sysroot-false.patch
package/qt5/Config.in +0 -1
@@ -38,7 +38,6 @@ menuconfig BR2_PACKAGE_QT5 if BR2_PACKAGE_QT5 source "package/qt5/qt53d/Config.in" source "package/qt5/qt5base/Config.in" -source "package/qt5/qt5canvas3d/Config.in" source "package/qt5/qt5charts/Config.in" source "package/qt5/qt5connectivity/Config.in" source "package/qt5/qt5declarative/Config.in"
package/qt5/qt5.mk +2 -2
@@ -4,8 +4,8 @@ # ################################################################################ -QT5_VERSION_MAJOR = 5.12 -QT5_VERSION = $(QT5_VERSION_MAJOR).7 +QT5_VERSION_MAJOR = 5.13 +QT5_VERSION = $(QT5_VERSION_MAJOR).2 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.12/5.12.7/submodules/qt3d-everywhere-src-5.12.7.tar.xz.sha256 -sha256 2030de3dc93fd4062f677f61938229af9cd7aa4c3d2932cdda2ccb663d681126 qt3d-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qt3d-everywhere-src-5.13.2.tar.xz.sha256 +sha256 d1b9fc0be82264b5f76c3a5330901dff95c1f2bcb67916c3fac6bad4ff69adc9 qt3d-everywhere-src-5.13.2.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL
package/qt5/qt5base/qt5base.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtbase-everywhere-src-5.12.7.tar.xz.sha256 -sha256 b18939cb25d90aef8721fb12ec34c3632d3490ced958e41f6c7a52064643665d qtbase-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtbase-everywhere-src-5.13.2.tar.xz.sha256 +sha256 26b6b686d66a7ad28eaca349e55e2894e5a735f3831e45f2049e93b1daa92121 qtbase-everywhere-src-5.13.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5canvas3d/Config.in deleted +0 -18
@@ -1,18 +0,0 @@ -config BR2_PACKAGE_QT5CANVAS3D - bool "qt5canvas3d" - depends on BR2_PACKAGE_QT5_GL_AVAILABLE - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - select BR2_PACKAGE_QT5DECLARATIVE - select BR2_PACKAGE_QT5DECLARATIVE_QUICK - help - Qt is a cross-platform application and UI framework for - developers using C++. - - Qt Canvas 3D module provides a way to make WebGL-like - 3D drawing calls from Qt Quick JavaScript. - - http://doc.qt.io/qt-5/qtcanvas3d-index.html - -comment "qt5canvas3d needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
package/qt5/qt5canvas3d/qt5canvas3d.hash deleted +0 -8
@@ -1,8 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtcanvas3d-everywhere-src-5.12.7.tar.xz.sha256 -sha256 b63a513a2ee11548b122e0fd640b1fa22d3eb83cdc51ddfdf3b97c2ecd0d0c50 qtcanvas3d-everywhere-src-5.12.7.tar.xz - -# Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
package/qt5/qt5canvas3d/qt5canvas3d.mk deleted +0 -16
@@ -1,16 +0,0 @@ -################################################################################ -# -# qt5canvas3d -# -################################################################################ - -QT5CANVAS3D_VERSION = $(QT5_VERSION) -QT5CANVAS3D_SITE = $(QT5_SITE) -QT5CANVAS3D_SOURCE = qtcanvas3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CANVAS3D_VERSION).tar.xz -QT5CANVAS3D_DEPENDENCIES = qt5declarative -QT5CANVAS3D_INSTALL_STAGING = YES - -QT5CANVAS3D_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) -QT5CANVAS3D_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 - -$(eval $(qmake-package))
package/qt5/qt5charts/qt5charts.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtcharts-everywhere-src-5.12.7.tar.xz.sha256 -sha256 434065526d0b1d8921e96cc1827b1a3579e073b930fe536455c4c1da2f15cf5f qtcharts-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtcharts-everywhere-src-5.13.2.tar.xz.sha256 +sha256 3bad81c3cfb32cf72fb0ce2ac2794d031cf78a3902b4715f89c09b2d0e041e87 qtcharts-everywhere-src-5.13.2.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.12/5.12.7/submodules/qtconnectivity-everywhere-src-5.12.7.tar.xz.sha256 -sha256 647148b9b1a0d3e54f788b66797b81bb87434faf6fb12ac481f9165eda0d071a qtconnectivity-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtconnectivity-everywhere-src-5.13.2.tar.xz.sha256 +sha256 644e234eb64f602ef5cdeb8802ef9b58e75478f1124f001937275d62ed692e17 qtconnectivity-everywhere-src-5.13.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5declarative/qt5declarative.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtdeclarative-everywhere-src-5.12.7.tar.xz.sha256 -sha256 5cdc05a035f240ab73b6b37dd3831c1350cd80e5799da47929974085f6eae9bd qtdeclarative-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtdeclarative-everywhere-src-5.13.2.tar.xz.sha256 +sha256 d9a524f45fe9e136cda2252f9d7013ec17046d907e3f39606db920987c22d1fd qtdeclarative-everywhere-src-5.13.2.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.12/5.12.7/submodules/qtgraphicaleffects-everywhere-src-5.12.7.tar.xz.sha256 -sha256 02f0328420c623da8f9ae949fec01e99ba84213dd2ad559cb00c204502bbcace qtgraphicaleffects-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtgraphicaleffects-everywhere-src-5.13.2.tar.xz.sha256 +sha256 297a89bb6c771f849c4ce866e5c98dadf665163b3dab03bc48a58f51424e7e66 qtgraphicaleffects-everywhere-src-5.13.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5imageformats/qt5imageformats.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtimageformats-everywhere-src-5.12.7.tar.xz.sha256 -sha256 9bd19ee24fb85f249d01c78e637c95377dd738feb61da0deeee6b770fa62f70b qtimageformats-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtimageformats-everywhere-src-5.13.2.tar.xz.sha256 +sha256 6968649fdccc7d633cf9ada25f1bdaf0a2fb45a214d58c2c47896166d4553ac0 qtimageformats-everywhere-src-5.13.2.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.12/5.12.7/submodules/qtlocation-everywhere-src-5.12.7.tar.xz.sha256 -sha256 d1e905b80befda3c9aaad92ea984e6dbf722568b5c91e8d15b027bc5bc22781f qtlocation-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtlocation-everywhere-src-5.13.2.tar.xz.sha256 +sha256 5fe4b824d3dc6c800682ff986333ec09edb9c27582066e928b1862b4d58212e3 qtlocation-everywhere-src-5.13.2.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.12/5.12.7/submodules/qtmultimedia-everywhere-src-5.12.7.tar.xz.sha256 -sha256 28bdaa81371f922223775ae5171c4d589a2c07f255abbe5ccf130ecbbdb4db1d qtmultimedia-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtmultimedia-everywhere-src-5.13.2.tar.xz.sha256 +sha256 5f885459d46ea2f2bb24597678befd4913d8f88029730d01984f51f9c367b9f4 qtmultimedia-everywhere-src-5.13.2.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.12/5.12.7/submodules/qtquickcontrols-everywhere-src-5.12.7.tar.xz.sha256 -sha256 1038bbc76bba53f9634f40cd9c8ebf0ed8ae82e791f727b228bd81bdcf1859e5 qtquickcontrols-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtquickcontrols-everywhere-src-5.13.2.tar.xz.sha256 +sha256 d6e64d8db13ada55fcb0d5e8ca26097085680087d931435c6c6db859d87493ea qtquickcontrols-everywhere-src-5.13.2.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.12/5.12.7/submodules/qtquickcontrols2-everywhere-src-5.12.7.tar.xz.sha256 -sha256 3a9526e5ad01edbfb796a6631983c391ea1b7e22ae6e07840048156a9e92a237 qtquickcontrols2-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtquickcontrols2-everywhere-src-5.13.2.tar.xz.sha256 +sha256 90ee8be7b66cc65f3f22e71a0b35adab5c169ac4f8ebc6f9e7685228bf8a7d70 qtquickcontrols2-everywhere-src-5.13.2.tar.xz # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3
package/qt5/qt5script/qt5script.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtscript-everywhere-src-5.12.7.tar.xz.sha256 -sha256 ca1dbc66d4125a678638dd0c9c030b72fdfc4ec2c229b9316a8bc80a86104019 qtscript-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtscript-everywhere-src-5.13.2.tar.xz.sha256 +sha256 3d92691c25577fbf7511d40253de0cd9d31444ea5a0aa860f65efb9fa0f3ce70 qtscript-everywhere-src-5.13.2.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.12/5.12.7/submodules/qtscxml-everywhere-src-5.12.7.tar.xz.sha256 -sha256 afa950bc95f881c90eea564511f3e9918d53fddf0823afb641d20dc6f794fbb6 qtscxml-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtscxml-everywhere-src-5.13.2.tar.xz.sha256 +sha256 e489dff21e18c1e7f72ffd31af82404f845bd90824c6b978140591366398a9d9 qtscxml-everywhere-src-5.13.2.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.12/5.12.7/submodules/qtsensors-everywhere-src-5.12.7.tar.xz.sha256 -sha256 2b9aea9f4e2f681b4067f2b9d97c5073c135e41d26601c71f18f199bc980e740 qtsensors-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtsensors-everywhere-src-5.13.2.tar.xz.sha256 +sha256 46f73bbfddfd78a419c6424d6839318774b84c955a7f7a96c12c590f6d8fb177 qtsensors-everywhere-src-5.13.2.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.12/5.12.7/submodules/qtserialbus-everywhere-src-5.12.7.tar.xz.sha256 -sha256 82201edf971e957d849b041ab2914f7497226939c62884ec2906b37576987eae qtserialbus-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtserialbus-everywhere-src-5.13.2.tar.xz.sha256 +sha256 48159393b1368976b5324eac48424e2a6e5d63c783194d0576a978151f882da3 qtserialbus-everywhere-src-5.13.2.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.12/5.12.7/submodules/qtserialport-everywhere-src-5.12.7.tar.xz.sha256 -sha256 224c282ebed750f46b72dfe18260c3d26fbb74e928dec64bd8c51e7beed8721f qtserialport-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtserialport-everywhere-src-5.13.2.tar.xz.sha256 +sha256 7677ffc1dce3b75c0a98d07d215588a8dccb5c276c55b4ecd60c35ed1c89cb34 qtserialport-everywhere-src-5.13.2.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.12/5.12.7/submodules/qtsvg-everywhere-src-5.12.7.tar.xz.sha256 -sha256 4bf60916d4e398d9609f1b3a17fc7345a0e13c7c1cc407298df20da4c7c67bb8 qtsvg-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtsvg-everywhere-src-5.13.2.tar.xz.sha256 +sha256 849e2e357e1333b64ecb728352f652cd8d916f029ed848f775b15d0b500cb7d7 qtsvg-everywhere-src-5.13.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5tools/qt5tools.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qttools-everywhere-src-5.12.7.tar.xz.sha256 -sha256 860a97114d518f83c0a9ab3742071da16bb018e6eb387179d5764a8dcca03948 qttools-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qttools-everywhere-src-5.13.2.tar.xz.sha256 +sha256 919a2713b6d2d7873a09ad85bd93cf4282606e5bf84d5884250f665a253ec06e qttools-everywhere-src-5.13.2.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.12/5.12.7/submodules/qtvirtualkeyboard-everywhere-src-5.12.7.tar.xz.sha256 -sha256 aaa52aaff923df22de8472d71843dadb80f3f6fe0312122e64ffe5436db40daa qtvirtualkeyboard-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtvirtualkeyboard-everywhere-src-5.13.2.tar.xz.sha256 +sha256 8e368dde237d21666f6cc8512a060e205388e519a4d7559c0505cc75224ed62b qtvirtualkeyboard-everywhere-src-5.13.2.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.12/5.12.7/submodules/qtwayland-everywhere-src-5.12.7.tar.xz.sha256 -sha256 fc1ab8e25461580e37090e4f82422411dee71a3de48a54be1f4b6569e00f66c5 qtwayland-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtwayland-everywhere-src-5.13.2.tar.xz.sha256 +sha256 3c9b2358d9cee02552b875db93b56f3b9bc3b0f4df7a2ff7e8b72f2a8f2ca952 qtwayland-everywhere-src-5.13.2.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.12/5.12.7/submodules/qtwebchannel-everywhere-src-5.12.7.tar.xz.sha256 -sha256 b0ae72e5957aa4b281a37d2e169fcf91f92382bc36bd0cf09c80b2bb961bce75 qtwebchannel-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtwebchannel-everywhere-src-5.13.2.tar.xz.sha256 +sha256 f452d419d8b19b566835f316bbf282dabc8b1c2a74c9c98c1aec4184465e9c13 qtwebchannel-everywhere-src-5.13.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5webengine/0001-pkg_config-Fixes-when-use_sysroot-false.patch deleted +0 -57
57 lines not on this page · raw message
package/qt5/qt5webengine/chromium-latest.inc +64 -22
245 lines not on this page · raw message
package/qt5/qt5webengine/qt5webengine.hash +71 -29
268 lines not on this page · raw message
package/qt5/qt5websockets/qt5websockets.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtwebsockets-everywhere-src-5.12.7.tar.xz.sha256 -sha256 6fd13c2558f532a32f20d977b44c0146107a0e93861df84978e4fd72af283b17 qtwebsockets-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtwebsockets-everywhere-src-5.13.2.tar.xz.sha256 +sha256 fc11236c8bf69b27a4e237a27b9ea27fc90d8c25d81d1d451ce3a0b63cbc02d3 qtwebsockets-everywhere-src-5.13.2.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.12/5.12.7/submodules/qtwebview-everywhere-src-5.12.7.tar.xz.sha256 -sha256 d3f82d2ceab59dc4dee3b6f54f4b70869c199d63f4534b299d900cdacc9b7be7 qtwebview-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtwebview-everywhere-src-5.13.2.tar.xz.sha256 +sha256 394cc7a9cb29b7883816ff3137b022f30568151aada0739fc99a23789c21c015 qtwebview-everywhere-src-5.13.2.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.12/5.12.7/submodules/qtx11extras-everywhere-src-5.12.7.tar.xz.sha256 -sha256 23895f4b1e84f3783526b9e17680df38c587601d4dfa6ff1b81ace432c480b96 qtx11extras-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtx11extras-everywhere-src-5.13.2.tar.xz.sha256 +sha256 95a7c5c30f42e9575c3a17a2c0eb0cdbdd2d89dbcb3ee1426cd41bb07e28c51c qtx11extras-everywhere-src-5.13.2.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.12/5.12.7/submodules/qtxmlpatterns-everywhere-src-5.12.7.tar.xz.sha256 -sha256 9002014129a1f2a44700df333a7776e23bdfd689e7a619c3540fd9f6819b417b qtxmlpatterns-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtxmlpatterns-everywhere-src-5.13.2.tar.xz.sha256 +sha256 1e87d8c004ec0beea3b29d13f0964c563aa9fae51c392c998750ca4e386374e2 qtxmlpatterns-everywhere-src-5.13.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
Signature · 1 line
2.26.0
RFC v4 2/3 package/qt5: bump version to 5.14.2
qt5base:
- rebased 0002-double-conversion-enable-for-microblaze.patch
- rebased 0004-double-conversion-enable-for-xtensa.patch
qt5declarative:
- rebased 0001-qsgtexture-fix-debug-build-with-uclibc.patch
qt5enginio:
- add 0001-Do-not-use-deprecated-QLinkedList.patch
qt5tools:
- add 0001-Disable-designer-tool-fixes-configure-error.patch
ToDo: add proper fix/workaround
qt5webengine:
- update 3rdparty license hash list and chromium-latest.inc file
qt5webkit:
- add 0006-configure-remove-legacy-reference-to-qtConfig-mircli.patch
---
Changes v1 -> v2:
- no changes
Changes v2 -> v3:
- add qt5webkit configure fix patch
Changes v3 -> v4:
- rebased and updated to 5.14.2
- add qt5enginio patch to fix compile failure
--- package/qt5/qt5.mk | 2 +- package/qt5/qt53d/qt53d.hash | 4 +- ...ble-conversion-enable-for-microblaze.patch | 24 +- ...-double-conversion-enable-for-xtensa.patch | 20 +- package/qt5/qt5base/qt5base.hash | 4 +- package/qt5/qt5charts/qt5charts.hash | 4 +- .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- ...gtexture-fix-debug-build-with-uclibc.patch | 20 +- .../qt5/qt5declarative/qt5declarative.hash | 4 +- ...01-Do-not-use-deprecated-QLinkedList.patch | 39 ++++ .../qt5graphicaleffects.hash | 4 +- .../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 +- 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 | 44 ++++ package/qt5/qt5tools/qt5tools.hash | 4 +- .../qt5virtualkeyboard.hash | 4 +- package/qt5/qt5wayland/qt5wayland.hash | 4 +- package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- package/qt5/qt5webengine/chromium-latest.inc | 143 ++++++------ package/qt5/qt5webengine/qt5webengine.hash | 209 ++++++++++-------- ...-legacy-reference-to-qtConfig-mircli.patch | 34 +++ 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, 391 insertions(+), 244 deletions(-) create mode 100644 package/qt5/qt5enginio/0001-Do-not-use-deprecated-QLinkedList.patch create mode 100644 package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch create mode 100644 package/qt5/qt5webkit/0006-configure-remove-legacy-reference-to-qtConfig-mircli.patch
package/qt5/qt5.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -QT5_VERSION_MAJOR = 5.13 +QT5_VERSION_MAJOR = 5.14 QT5_VERSION = $(QT5_VERSION_MAJOR).2 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.13/5.13.2/submodules/qt3d-everywhere-src-5.13.2.tar.xz.sha256 -sha256 d1b9fc0be82264b5f76c3a5330901dff95c1f2bcb67916c3fac6bad4ff69adc9 qt3d-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qt3d-everywhere-src-5.14.2.tar.xz.sha256 +sha256 9da82f1cc4b7d416d31ec96224c59d221473a48f6e579eef978f7d2e3932c674 qt3d-everywhere-src-5.14.2.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL
package/qt5/qt5base/0002-double-conversion-enable-for-microblaze.patch +12 -12
@@ -1,4 +1,4 @@ -From 014958d2d17045dd63d93cb3061d1e40b15725b7 Mon Sep 17 00:00:00 2001 +From a02b5e3bb41026ca6031d01942a093e9ce54edf3 Mon Sep 17 00:00:00 2001 From: Peter Seiderer <[email protected]> Date: Tue, 21 Aug 2018 21:11:40 +0200 Subject: [PATCH] double-conversion: enable for microblaze
@@ -6,24 +6,24 @@ Subject: [PATCH] double-conversion: enable for microblaze Signed-off-by: Peter Seiderer <[email protected]> [Rebased for Qt5.12.0] Signed-off-by: Peter Seiderer <[email protected]> +[Rebased for Qt5.14.0] +Signed-off-by: Peter Seiderer <[email protected]> --- - .../double-conversion/include/double-conversion/utils.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + src/3rdparty/double-conversion/include/double-conversion/utils.h | 1 + + 1 file changed, 1 insertion(+) diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h -index 7622fe6162..d29de95094 100644 +index 70e697ca..2bb8e389 100644 --- a/src/3rdparty/double-conversion/include/double-conversion/utils.h +++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h -@@ -94,7 +94,8 @@ int main(int argc, char** argv) { - defined(_MIPS_ARCH_MIPS32R2) || \ +@@ -102,6 +102,7 @@ int main(int argc, char** argv) { defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ - defined(__riscv) || defined(__EMSCRIPTEN__) || \ -- defined(__or1k__) -+ defined(__or1k__) || \ -+ defined(__microblaze__) + defined(__riscv) || \ + defined(__or1k__) || defined(__arc__) || \ ++ defined(__microblaze__) || \ + defined(__EMSCRIPTEN__) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #elif defined(__mc68000__) || \ - defined(__pnacl__) || defined(__native_client__) -- -2.19.2 +2.23.0
package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch +11 -9
@@ -1,27 +1,29 @@ -From cfac9a39658906b06f28208ee1d129f042760416 Mon Sep 17 00:00:00 2001 +From f423f160b984c47d831b10447af046bfbd6a3ba1 Mon Sep 17 00:00:00 2001 From: Peter Seiderer <[email protected]> Date: Tue, 10 Mar 2020 09:01:31 +0100 Subject: [PATCH] double-conversion: enable for xtensa [Upstream: https://github.com/google/double-conversion/commit/a54561be5588ac9b16d3c20760b9b554168bb8aa] Signed-off-by: Peter Seiderer <[email protected]> +[Rebased for qtbase-everywhere-src-5.14.0] +Signed-off-by: Peter Seiderer <[email protected]> --- .../double-conversion/include/double-conversion/utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h -index 55ca5bf5..95b08a4e 100644 +index 89ab1a31..001ce55f 100644 --- a/src/3rdparty/double-conversion/include/double-conversion/utils.h +++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h -@@ -96,7 +96,7 @@ int main(int argc, char** argv) { +@@ -103,7 +103,7 @@ int main(int argc, char** argv) { defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ - defined(__riscv) || defined(__EMSCRIPTEN__) || \ - defined(__or1k__) || \ -- defined(__microblaze__) -+ defined(__microblaze__) || defined(__XTENSA__) + defined(__riscv) || \ + defined(__or1k__) || defined(__arc__) || \ +- defined(__microblaze__) || \ ++ defined(__microblaze__) || defined(__XTENSA__) || \ + defined(__EMSCRIPTEN__) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #elif defined(__mc68000__) || \ - defined(__pnacl__) || defined(__native_client__) -- -2.25.1 +2.26.0
package/qt5/qt5base/qt5base.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtbase-everywhere-src-5.13.2.tar.xz.sha256 -sha256 26b6b686d66a7ad28eaca349e55e2894e5a735f3831e45f2049e93b1daa92121 qtbase-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtbase-everywhere-src-5.14.2.tar.xz.sha256 +sha256 48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a qtbase-everywhere-src-5.14.2.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.13/5.13.2/submodules/qtcharts-everywhere-src-5.13.2.tar.xz.sha256 -sha256 3bad81c3cfb32cf72fb0ce2ac2794d031cf78a3902b4715f89c09b2d0e041e87 qtcharts-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtcharts-everywhere-src-5.14.2.tar.xz.sha256 +sha256 adb25203ea748d886cc3d8993c20def702115eccea311594592058134ba83bb7 qtcharts-everywhere-src-5.14.2.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.13/5.13.2/submodules/qtconnectivity-everywhere-src-5.13.2.tar.xz.sha256 -sha256 644e234eb64f602ef5cdeb8802ef9b58e75478f1124f001937275d62ed692e17 qtconnectivity-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtconnectivity-everywhere-src-5.14.2.tar.xz.sha256 +sha256 abe67b3e3a775e2a2e27c62a5391f37007ffbe72bce58b96116995616cfcbc28 qtconnectivity-everywhere-src-5.14.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5declarative/0001-qsgtexture-fix-debug-build-with-uclibc.patch +11 -9
@@ -1,4 +1,4 @@ -From 2a5711651bee9d021733da19126a71aeda45e646 Mon Sep 17 00:00:00 2001 +From dfa9555010535003eac69788597f53d3ff44168f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine <[email protected]> Date: Thu, 29 Nov 2018 23:33:10 +0100 Subject: [PATCH] qsgtexture: fix debug build with uclibc
@@ -23,17 +23,19 @@ Fixes: Signed-off-by: Fabrice Fontaine <[email protected]> [Upstream status: https://github.com/qt/qtdeclarative/pull/4] +[Rebased for Qt5.14.0] +Signed-off-by: Peter Seiderer <[email protected]> --- - src/quick/scenegraph/util/qsgtexture.cpp | 2 +- + src/quick/scenegraph/coreapi/qsgtexture.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp -index fea92a512..a26191006 100644 ---- a/src/quick/scenegraph/util/qsgtexture.cpp -+++ b/src/quick/scenegraph/util/qsgtexture.cpp -@@ -53,7 +53,7 @@ - #endif +diff --git a/src/quick/scenegraph/coreapi/qsgtexture.cpp b/src/quick/scenegraph/coreapi/qsgtexture.cpp +index dfbe4d3f..6a7bc79b 100644 +--- a/src/quick/scenegraph/coreapi/qsgtexture.cpp ++++ b/src/quick/scenegraph/coreapi/qsgtexture.cpp +@@ -46,7 +46,7 @@ #include <private/qsgmaterialshader_p.h> + #include <QtGui/private/qrhi_p.h> -#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && defined(__GLIBC__) +#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && defined(__GLIBC__) && !defined(__UCLIBC__)
@@ -41,5 +43,5 @@ index fea92a512..a26191006 100644 #endif -- -2.14.1 +2.23.0
package/qt5/qt5declarative/qt5declarative.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtdeclarative-everywhere-src-5.13.2.tar.xz.sha256 -sha256 d9a524f45fe9e136cda2252f9d7013ec17046d907e3f39606db920987c22d1fd qtdeclarative-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtdeclarative-everywhere-src-5.14.2.tar.xz.sha256 +sha256 a3c4617adc9760347c93d2eb6c25d22f620cd22f44afa0494eb499a805831650 qtdeclarative-everywhere-src-5.14.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5enginio/0001-Do-not-use-deprecated-QLinkedList.patch new file +39 -0
@@ -0,0 +1,39 @@ +From ca81a62bb3f8ce67d564631bb8d4e11619acf430 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <[email protected]> +Date: Fri, 3 Apr 2020 19:59:47 +0200 +Subject: [PATCH] Do not use deprecated QLinkedList +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Do not use (internally already by QT_NO_LINKED_LIST) deprecated QLinkeList, +use QList instead. + +Fixes: + + ../../include/Enginio/1.6.3/Enginio/private/../../../../../src/enginio_client/enginioclient_p.h:293:5: error: ?QLinkedList? does not name a type + +Signed-off-by: Peter Seiderer <[email protected]> +--- + src/enginio_client/enginioclient_p.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/enginio_client/enginioclient_p.h b/src/enginio_client/enginioclient_p.h +index 6b5dc53..f3fe68e 100644 +--- a/src/enginio_client/enginioclient_p.h ++++ b/src/enginio_client/enginioclient_p.h +@@ -290,7 +290,11 @@ public: + QByteArray _backendId; + EnginioIdentity *_identity; + ++#if defined(QT_NO_LINKED_LIST) ++ QList<QMetaObject::Connection> _connections; ++#else + QLinkedList<QMetaObject::Connection> _connections; ++#endif + QVarLengthArray<QMetaObject::Connection, 4> _identityConnections; + QUrl _serviceUrl; + QSharedPointer<QNetworkAccessManager> _networkManager; +-- +2.26.0 +
package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtgraphicaleffects-everywhere-src-5.13.2.tar.xz.sha256 -sha256 297a89bb6c771f849c4ce866e5c98dadf665163b3dab03bc48a58f51424e7e66 qtgraphicaleffects-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtgraphicaleffects-everywhere-src-5.14.2.tar.xz.sha256 +sha256 487a7f858244a08264363733055a8cf8b00e77c658c5608cc462817d15e4b50f qtgraphicaleffects-everywhere-src-5.14.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5imageformats/qt5imageformats.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtimageformats-everywhere-src-5.13.2.tar.xz.sha256 -sha256 6968649fdccc7d633cf9ada25f1bdaf0a2fb45a214d58c2c47896166d4553ac0 qtimageformats-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtimageformats-everywhere-src-5.14.2.tar.xz.sha256 +sha256 733eca0165c15e046b106039c989dac7f6bc2ecf215396d965ed065369264f8c qtimageformats-everywhere-src-5.14.2.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.13/5.13.2/submodules/qtlocation-everywhere-src-5.13.2.tar.xz.sha256 -sha256 5fe4b824d3dc6c800682ff986333ec09edb9c27582066e928b1862b4d58212e3 qtlocation-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtlocation-everywhere-src-5.14.2.tar.xz.sha256 +sha256 c37708bc396f6dac397b49a6a268d5edb39e1c8296ca2337ce9e80bde04775cc qtlocation-everywhere-src-5.14.2.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.13/5.13.2/submodules/qtmultimedia-everywhere-src-5.13.2.tar.xz.sha256 -sha256 5f885459d46ea2f2bb24597678befd4913d8f88029730d01984f51f9c367b9f4 qtmultimedia-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtmultimedia-everywhere-src-5.14.2.tar.xz.sha256 +sha256 7acd8ede6835314206e407b35b668f0add67544577fb51fe67afb03137fb9fe9 qtmultimedia-everywhere-src-5.14.2.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.13/5.13.2/submodules/qtquickcontrols-everywhere-src-5.13.2.tar.xz.sha256 -sha256 d6e64d8db13ada55fcb0d5e8ca26097085680087d931435c6c6db859d87493ea qtquickcontrols-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtquickcontrols-everywhere-src-5.14.2.tar.xz.sha256 +sha256 d55def1dd4ee1250bd6a4e76849f4e362368b6411c2216d5f669c761216d4461 qtquickcontrols-everywhere-src-5.14.2.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.13/5.13.2/submodules/qtquickcontrols2-everywhere-src-5.13.2.tar.xz.sha256 -sha256 90ee8be7b66cc65f3f22e71a0b35adab5c169ac4f8ebc6f9e7685228bf8a7d70 qtquickcontrols2-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtquickcontrols2-everywhere-src-5.14.2.tar.xz.sha256 +sha256 faf7d349d8f4a8db36cd3c62a5724bcf689300f2fdb7dc1ea034392aab981560 qtquickcontrols2-everywhere-src-5.14.2.tar.xz # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3
package/qt5/qt5script/qt5script.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtscript-everywhere-src-5.13.2.tar.xz.sha256 -sha256 3d92691c25577fbf7511d40253de0cd9d31444ea5a0aa860f65efb9fa0f3ce70 qtscript-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtscript-everywhere-src-5.14.2.tar.xz.sha256 +sha256 e9fd487ccb3cbf00e86b0b803aa79e9f6bbe7a337b8e97d069e040c3e0789bfe qtscript-everywhere-src-5.14.2.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.13/5.13.2/submodules/qtscxml-everywhere-src-5.13.2.tar.xz.sha256 -sha256 e489dff21e18c1e7f72ffd31af82404f845bd90824c6b978140591366398a9d9 qtscxml-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtscxml-everywhere-src-5.14.2.tar.xz.sha256 +sha256 030cea352a56074f577200f967ef37c959b2767127de61f766f59b0d99763790 qtscxml-everywhere-src-5.14.2.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.13/5.13.2/submodules/qtsensors-everywhere-src-5.13.2.tar.xz.sha256 -sha256 46f73bbfddfd78a419c6424d6839318774b84c955a7f7a96c12c590f6d8fb177 qtsensors-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtsensors-everywhere-src-5.14.2.tar.xz.sha256 +sha256 bccfca6910b0383d8f65823496ff5011abed2fa8fd446b4b27333d0fd7bb8c61 qtsensors-everywhere-src-5.14.2.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.13/5.13.2/submodules/qtserialbus-everywhere-src-5.13.2.tar.xz.sha256 -sha256 48159393b1368976b5324eac48424e2a6e5d63c783194d0576a978151f882da3 qtserialbus-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtserialbus-everywhere-src-5.14.2.tar.xz.sha256 +sha256 0b7762175a649a40c4dd619c5de61d772235dc86099343278e2c3229d0836a91 qtserialbus-everywhere-src-5.14.2.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.13/5.13.2/submodules/qtserialport-everywhere-src-5.13.2.tar.xz.sha256 -sha256 7677ffc1dce3b75c0a98d07d215588a8dccb5c276c55b4ecd60c35ed1c89cb34 qtserialport-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtserialport-everywhere-src-5.14.2.tar.xz.sha256 +sha256 a6d977dd723ad4d3368b5163691405b8852f809974a96ec54103494e834aea21 qtserialport-everywhere-src-5.14.2.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.13/5.13.2/submodules/qtsvg-everywhere-src-5.13.2.tar.xz.sha256 -sha256 849e2e357e1333b64ecb728352f652cd8d916f029ed848f775b15d0b500cb7d7 qtsvg-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtsvg-everywhere-src-5.14.2.tar.xz.sha256 +sha256 c7d7faa01a3e7a6e4d38fafcec5529a488258218749779e6fa0e09a21173b5a1 qtsvg-everywhere-src-5.14.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch new file +44 -0
44 lines not on this page · raw message
package/qt5/qt5tools/qt5tools.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qttools-everywhere-src-5.13.2.tar.xz.sha256 -sha256 919a2713b6d2d7873a09ad85bd93cf4282606e5bf84d5884250f665a253ec06e qttools-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qttools-everywhere-src-5.14.2.tar.xz.sha256 +sha256 5bb0cf7832b88eb6bc9d4289f98307eb14b16a453ad6cf42cca13c4fe1a053c5 qttools-everywhere-src-5.14.2.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.13/5.13.2/submodules/qtvirtualkeyboard-everywhere-src-5.13.2.tar.xz.sha256 -sha256 8e368dde237d21666f6cc8512a060e205388e519a4d7559c0505cc75224ed62b qtvirtualkeyboard-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz.sha256 +sha256 364f3338563e617e7c964a37170b415b546c5f82965e781271f9dada3e3868d7 qtvirtualkeyboard-everywhere-src-5.14.2.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.13/5.13.2/submodules/qtwayland-everywhere-src-5.13.2.tar.xz.sha256 -sha256 3c9b2358d9cee02552b875db93b56f3b9bc3b0f4df7a2ff7e8b72f2a8f2ca952 qtwayland-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtwayland-everywhere-src-5.14.2.tar.xz.sha256 +sha256 d31633ca718fb407cf70870613d45d0ed80aa04c058586ac3036bae1aff7832a qtwayland-everywhere-src-5.14.2.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.13/5.13.2/submodules/qtwebchannel-everywhere-src-5.13.2.tar.xz.sha256 -sha256 f452d419d8b19b566835f316bbf282dabc8b1c2a74c9c98c1aec4184465e9c13 qtwebchannel-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtwebchannel-everywhere-src-5.14.2.tar.xz.sha256 +sha256 7d1dc8441523638c3d455c7d408ec65aebc073acab80e24063865f929231f874 qtwebchannel-everywhere-src-5.14.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5webengine/chromium-latest.inc +78 -65
382 lines not on this page · raw message
package/qt5/qt5webengine/qt5webengine.hash +111 -98
469 lines not on this page · raw message
package/qt5/qt5webkit/0006-configure-remove-legacy-reference-to-qtConfig-mircli.patch new file +34 -0
@@ -0,0 +1,34 @@ +From c408484e3a442ecf99d3cc61402f20c45c894b7c Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <[email protected]> +Date: Mon, 3 Feb 2020 21:19:57 +0100 +Subject: [PATCH] configure: remove legacy reference to qtConfig(mirclient) + +The optio mirclient is removed since Qt-5.14.x (see [1]) +Fixes: + + Project ERROR: Could not find feature mirclient. + +[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=8c73ddd8e3fb43cc22fa111b855ab1f9f5b83405 + +Signed-off-by: Peter Seiderer <[email protected]> +--- + Tools/qmake/mkspecs/features/configure.prf | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf +index 23d99040..783f6752 100644 +--- a/Tools/qmake/mkspecs/features/configure.prf ++++ b/Tools/qmake/mkspecs/features/configure.prf +@@ -130,9 +130,6 @@ defineTest(finalizeConfigure) { + addReasonForSkippingBuild("Build not supported on Android.") + } + QT_FOR_CONFIG += gui-private +- production_build:qtConfig(mirclient) { +- addReasonForSkippingBuild("Build not supported on Ubuntu Touch.") +- } + !gnu_thin_archives:!win32-msvc2013:!mingw:qtConfig(static) { + addReasonForSkippingBuild("QtWebKit cannot be built as a static library on this platform. Check your configuration in qtbase/config.summary.") + } +-- +2.25.0 +
package/qt5/qt5websockets/qt5websockets.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtwebsockets-everywhere-src-5.13.2.tar.xz.sha256 -sha256 fc11236c8bf69b27a4e237a27b9ea27fc90d8c25d81d1d451ce3a0b63cbc02d3 qtwebsockets-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtwebsockets-everywhere-src-5.14.2.tar.xz.sha256 +sha256 f06e62b18313fe1b40a35566e79645de4a8e7ac9f7717d1d98a06c5b49afca84 qtwebsockets-everywhere-src-5.14.2.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.13/5.13.2/submodules/qtwebview-everywhere-src-5.13.2.tar.xz.sha256 -sha256 394cc7a9cb29b7883816ff3137b022f30568151aada0739fc99a23789c21c015 qtwebview-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtwebview-everywhere-src-5.14.2.tar.xz.sha256 +sha256 c61f9213ee84fd7408898c0194468208ffb51af9d257e87e6b53daf24f65ff4b qtwebview-everywhere-src-5.14.2.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.13/5.13.2/submodules/qtx11extras-everywhere-src-5.13.2.tar.xz.sha256 -sha256 95a7c5c30f42e9575c3a17a2c0eb0cdbdd2d89dbcb3ee1426cd41bb07e28c51c qtx11extras-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtx11extras-everywhere-src-5.14.2.tar.xz.sha256 +sha256 be9a84a03a2ee81771215264e5dff7a996d04be6192b8cdaa1d41e319a81545a qtx11extras-everywhere-src-5.14.2.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.13/5.13.2/submodules/qtxmlpatterns-everywhere-src-5.13.2.tar.xz.sha256 -sha256 1e87d8c004ec0beea3b29d13f0964c563aa9fae51c392c998750ca4e386374e2 qtxmlpatterns-everywhere-src-5.13.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtxmlpatterns-everywhere-src-5.14.2.tar.xz.sha256 +sha256 219a876665345e3801baff71f31f30f5495c1cb9ab23fbbd27602632c80fcfb7 qtxmlpatterns-everywhere-src-5.14.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
Signature · 1 line
2.26.0
Thomas Petazzoni
AppliedRFC v4 2/3 package/qt5: bump version to 5.14.2
Quoted 17 lines · On Fri, 3 Apr 2020 23:23:56 +0200 Peter Seiderer <[email protected]> wrote:
qt5base:
- rebased 0002-double-conversion-enable-for-microblaze.patch
- rebased 0004-double-conversion-enable-for-xtensa.patchqt5declarative:
- rebased 0001-qsgtexture-fix-debug-build-with-uclibc.patchqt5enginio:
- add 0001-Do-not-use-deprecated-QLinkedList.patchqt5tools:
- add 0001-Disable-designer-tool-fixes-configure-error.patch
ToDo: add proper fix/workaroundqt5webengine:
- update 3rdparty license hash list and chromium-latest.inc file
Quoted 7 lines
qt5webkit:
- add 0006-configure-remove-legacy-reference-to-qtConfig-mircli.patchSigned-off-by Peter Seiderer <[email protected]>---
Changes v1 -> v2:
- no changes
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
RFC v4 3/3 package/qt5/qt5wayland: fix compile for rpi3
In reply to Peter SeidererAdd three patches to fix compile for rpi3.
---
Changes v3 -> v4:
- new patch
--- ...ibdrm-related-configure-test-failure.patch | 56 +++++++++++++++++++ ...ayland-scanner-client-wayland-protoc.patch | 36 ++++++++++++ ...land-texture-sharing-custom-composit.patch | 42 ++++++++++++++ 3 files changed, 134 insertions(+) create mode 100644 package/qt5/qt5wayland/0001-fix-libdrm-related-configure-test-failure.patch create mode 100644 package/qt5/qt5wayland/0002-brcm-egl-needs-wayland-scanner-client-wayland-protoc.patch create mode 100644 package/qt5/qt5wayland/0003-examples-fix-wayland-texture-sharing-custom-composit.patch
package/qt5/qt5wayland/0001-fix-libdrm-related-configure-test-failure.patch new file +56 -0
@@ -0,0 +1,56 @@ +From ba93ccba2aa70bd76f0af43675fa5864e166e3c3 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <[email protected]> +Date: Fri, 3 Apr 2020 21:52:30 +0200 +Subject: [PATCH 1/3] fix libdrm related configure test failure + +Fixes: + + Project ERROR: Test config.qtwayland_client.tests.dmabuf-server-buffer tries to use undeclared library 'drm' + Project ERROR: Test config.qtwayland_compositor.tests.dmabuf-server-buffer tries to use undeclared library 'drm' + Project ERROR: Test config.qtwayland_compositor.tests.dmabuf-client-buffer tries to use undeclared library 'drm' + +Signed-off-by: Peter Seiderer <[email protected]> +--- + src/client/configure.json | 3 ++- + src/compositor/configure.json | 6 ++++-- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/src/client/configure.json b/src/client/configure.json +index 0621396..27c73f8 100644 +--- a/src/client/configure.json ++++ b/src/client/configure.json +@@ -74,7 +74,8 @@ + "label": "Linux dma-buf Buffer Sharing", + "type": "compile", + "test": "dmabuf_server_buffer", +- "use": "egl drm" ++ "libs": "-ldrm", ++ "use": "egl" + }, + "vulkan-server-buffer": { + "label": "Vulkan Buffer Sharing", +diff --git a/src/compositor/configure.json b/src/compositor/configure.json +index 0dbb336..73e4c1a 100644 +--- a/src/compositor/configure.json ++++ b/src/compositor/configure.json +@@ -80,13 +80,15 @@ + "label": "Linux dma-buf Buffer Sharing", + "type": "compile", + "test": "dmabuf_server_buffer", +- "use": "egl drm" ++ "libs": "-ldrm", ++ "use": "egl" + }, + "dmabuf-client-buffer": { + "label": "Linux Client dma-buf Buffer Sharing", + "type": "compile", + "test": "dmabuf_client_buffer", +- "use": "egl drm" ++ "libs": "-ldrm", ++ "use": "egl" + }, + "vulkan-server-buffer": { + "label": "Vulkan Buffer Sharing", +-- +2.26.0 +
package/qt5/qt5wayland/0002-brcm-egl-needs-wayland-scanner-client-wayland-protoc.patch new file +36 -0
@@ -0,0 +1,36 @@ +From 4770af94884be5a603934b36e6804eed7d18d43c Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <[email protected]> +Date: Fri, 3 Apr 2020 22:42:23 +0200 +Subject: [PATCH 2/3] brcm-egl: needs + wayland-scanner-client-wayland-protocol-include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + + wayland-brcm-client-protocol.h: In function ?wl_buffer* qt_brcm_create_buffer(qt_brcm*, int32_t, int32_t, wl_array*)?: + wayland-brcm-client-protocol.h:115:29: error: ?wl_buffer_interface? was not declared in this scope; did you mean ?qt_brcm_interface?? + 115 | QT_BRCM_CREATE_BUFFER, &wl_buffer_interface, NULL, width, height, data); + | ^~~~~~~~~~~~~~~~~~~ + | qt_brcm_interface + +Signed-off-by: Peter Seiderer <[email protected]> +--- + src/hardwareintegration/client/brcm-egl/brcm-egl.pri | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/hardwareintegration/client/brcm-egl/brcm-egl.pri b/src/hardwareintegration/client/brcm-egl/brcm-egl.pri +index f9f8d07..95eb86e 100644 +--- a/src/hardwareintegration/client/brcm-egl/brcm-egl.pri ++++ b/src/hardwareintegration/client/brcm-egl/brcm-egl.pri +@@ -11,5 +11,5 @@ HEADERS += $$PWD/qwaylandbrcmeglintegration.h \ + $$PWD/qwaylandbrcmglcontext.h \ + $$PWD/qwaylandbrcmeglwindow.h + +-CONFIG += wayland-scanner ++CONFIG += wayland-scanner-client-wayland-protocol-include + WAYLANDCLIENTSOURCES += $$PWD/../../../extensions/brcm.xml +-- +2.26.0 +
package/qt5/qt5wayland/0003-examples-fix-wayland-texture-sharing-custom-composit.patch new file +42 -0
42 lines not on this page · raw message
Signature · 1 line
2.26.0
RFC v4 3/3 package/qt5/qt5wayland: fix compile for rpi3
Quoted 3 lines · On Fri, 3 Apr 2020 23:23:57 +0200 Peter Seiderer <[email protected]> wrote:
Add three patches to fix compile for rpi3.
Signed-off-by Peter Seiderer <[email protected]>
I'm not super at ease with the patches. Especially, I'm always worried about a commit that fixes things for one particular platform: patches 1 and 3 don't seem at all related to Rpi3 specifically.
package/qt5/qt5wayland/0001-fix-libdrm-related-configure-test-failure.patch line 4
Quoted 10 lines
package/qt5/qt5wayland/0001-fix-libdrm-related-configure-test-failure.patch new file +4
-0@@ -0,0 +1,56 @@ +From ba93ccba2aa70bd76f0af43675fa5864e166e3c3 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <[email protected]> +Date: Fri, 3 Apr 2020 21:52:30 +0200 +Subject: [PATCH 1/3] fix libdrm related configure test failure
Nit: use git format-patch -N to generate patches.
package/qt5/qt5wayland/0001-fix-libdrm-related-configure-test-failure.patch line 12
Quoted 8 lines
package/qt5/qt5wayland/0001-fix-libdrm-related-configure-test-failure.patch new file +8
-0+ +Fixes: + + Project ERROR: Test config.qtwayland_client.tests.dmabuf-server-buffer tries to use undeclared library 'drm' + Project ERROR: Test config.qtwayland_compositor.tests.dmabuf-server-buffer tries to use undeclared library 'drm' + Project ERROR: Test config.qtwayland_compositor.tests.dmabuf-client-buffer tries to use undeclared library 'drm' + +Signed-off-by: Peter Seiderer <[email protected]>
Should the "drm" library be declared somewhere instead? How is this building for upstream?
Quoted 14 lines
package/qt5/qt5wayland/0002-brcm-egl-needs-wayland-scanner-client-wayland-protoc.patch new file +8
-0@@ -0,0 +1,36 @@ +From 4770af94884be5a603934b36e6804eed7d18d43c Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <[email protected]> +Date: Fri, 3 Apr 2020 22:42:23 +0200 +Subject: [PATCH 2/3] brcm-egl: needs + wayland-scanner-client-wayland-protocol-include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit
package/qt5/qt5wayland/0002-brcm-egl-needs-wayland-scanner-client-wayland-protoc.patch line 18
Quoted 10 lines
package/qt5/qt5wayland/0002-brcm-egl-needs-wayland-scanner-client-wayland-protoc.patch new file +10
-0+ +Fixes: + + wayland-brcm-client-protocol.h: In function ?wl_buffer* qt_brcm_create_buffer(qt_brcm*, int32_t, int32_t, wl_array*)?: + wayland-brcm-client-protocol.h:115:29: error: ?wl_buffer_interface? was not declared in this scope; did you mean ?qt_brcm_interface?? + 115 | QT_BRCM_CREATE_BUFFER, &wl_buffer_interface, NULL, width, height, data); + | ^~~~~~~~~~~~~~~~~~~ + | qt_brcm_interface + +Signed-off-by: Peter Seiderer <[email protected]>
A bit more explanation on the relationship between the build issue and the fix would be good.
Quoted 31 lines
package/qt5/qt5wayland/0003-examples-fix-wayland-texture-sharing-custom-composit.patch new file +25
-0@@ -0,0 +1,42 @@ +From f7d96ddd00f868810ed2ca260acd41435717e6b8 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <[email protected]> +Date: Fri, 3 Apr 2020 22:40:29 +0200 +Subject: [PATCH 3/3] examples: fix wayland/texture-sharing/custom-compositor +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + + main.cpp:83:33: error: ?GL_RGBA8? was not declared in this scope; did you mean ?GL_RGBA4?? + 83 | *glInternalFormat = GL_RGBA8; + | ^~~~~~~~ + | GL_RGBA4 + main.cpp:120:33: error: ?GL_RGBA8? was not declared in this scope; did you mean ?GL_RGBA4?? + 120 | *glInternalFormat = GL_RGBA8; + | ^~~~~~~~ + | GL_RGBA4 + +Signed-off-by: Peter Seiderer <[email protected]> +--- + examples/wayland/texture-sharing/custom-compositor/main.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/examples/wayland/texture-sharing/custom-compositor/main.cpp b/examples/wayland/texture-sharing/custom-compositor/main.cpp
package/qt5/qt5wayland/0003-examples-fix-wayland-texture-sharing-custom-composit.patch line 35
Quoted 10 lines
package/qt5/qt5wayland/0003-examples-fix-wayland-texture-sharing-custom-composit.patch new file +10
-0+index a39c8c3..af37502 100644 +--- a/examples/wayland/texture-sharing/custom-compositor/main.cpp ++++ b/examples/wayland/texture-sharing/custom-compositor/main.cpp +@@ -63,6 +63,10 @@ + + #include "QtWaylandCompositor/private/qwltexturesharingextension_p.h" + ++#ifndef GL_RGBA8 ++#define GL_RGBA8 0x8058 ++#endif
This feels like a hack. What should normally be providing the GL_RGBA8 define? The OpenGL headers?
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
RFC v4 3/3 package/qt5/qt5wayland: fix compile for rpi3
Hello Thomas,
Quoted 10 lines · Thomas Petazzoni
Quoted 3 lines · On Fri, 3 Apr 2020 23:23:57 +0200 Peter Seiderer <[email protected]> wrote:
Add three patches to fix compile for rpi3.
Signed-off-by Peter Seiderer <[email protected]>I'm not super at ease with the patches. Especially, I'm always worried about a commit that fixes things for one particular platform: patches 1 and 3 don't seem at all related to Rpi3 specifically.
That is why this is sent as an extra patch (and as RFC)...should have marked it as WIP ;-)
Quoted 13 lines
package/qt5/qt5wayland/0001-fix-libdrm-related-configure-test-failure.patch line 4
Quoted 11 lines
package/qt5/qt5wayland/0001-fix-libdrm-related-configure-test-failure.patch new file +4
-0@@ -0,0 +1,56 @@ +From ba93ccba2aa70bd76f0af43675fa5864e166e3c3 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <[email protected]> +Date: Fri, 3 Apr 2020 21:52:30 +0200 +Subject: [PATCH 1/3] fix libdrm related configure test failureNit: use git format-patch -N to generate patches.
Ups..., will do....
Quoted 12 lines
package/qt5/qt5wayland/0001-fix-libdrm-related-configure-test-failure.patch line 12
Quoted 9 lines
package/qt5/qt5wayland/0001-fix-libdrm-related-configure-test-failure.patch new file +8
-0+ +Fixes: + + Project ERROR: Test config.qtwayland_client.tests.dmabuf-server-buffer tries to use undeclared library 'drm' + Project ERROR: Test config.qtwayland_compositor.tests.dmabuf-server-buffer tries to use undeclared library 'drm' + Project ERROR: Test config.qtwayland_compositor.tests.dmabuf-client-buffer tries to use undeclared library 'drm' + +Signed-off-by: Peter Seiderer <[email protected]>Should the "drm" library be declared somewhere instead? How is this building for upstream?
Seems they always build with libdrm available....
Did not find the right way to fix it for the qt configure framework, but opened an upstream bug report [1], [2]...but no feedback yet...
Quoted 20 lines
Quoted 20 lines
package/qt5/qt5wayland/0002-brcm-egl-needs-wayland-scanner-client-wayland-protoc.patch new file +13
-0@@ -0,0 +1,36 @@ +From 4770af94884be5a603934b36e6804eed7d18d43c Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <[email protected]> +Date: Fri, 3 Apr 2020 22:42:23 +0200 +Subject: [PATCH 2/3] brcm-egl: needs + wayland-scanner-client-wayland-protocol-include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + + wayland-brcm-client-protocol.h: In function ?wl_buffer* qt_brcm_create_buffer(qt_brcm*, int32_t, int32_t, wl_array*)?: + wayland-brcm-client-protocol.h:115:29: error: ?wl_buffer_interface? was not declared in this scope; did you mean ?qt_brcm_interface??
Quoted 8 lines
package/qt5/qt5wayland/0002-brcm-egl-needs-wayland-scanner-client-wayland-protoc.patch line 18
Quoted 5 lines
package/qt5/qt5wayland/0002-brcm-egl-needs-wayland-scanner-client-wayland-protoc.patch new file +5
-0+ 115 | QT_BRCM_CREATE_BUFFER, &wl_buffer_interface, NULL, width, height, data); + | ^~~~~~~~~~~~~~~~~~~ + | qt_brcm_interface + +Signed-off-by: Peter Seiderer <[email protected]>A bit more explanation on the relationship between the build issue and the fix would be good.
Will try give an better explanation...., positive feedback from upstream [3], [4]..., only the target branch seems questionable...
Quoted 37 lines
Quoted 37 lines
package/qt5/qt5wayland/0003-examples-fix-wayland-texture-sharing-custom-composit.patch new file +30
-0@@ -0,0 +1,42 @@ +From f7d96ddd00f868810ed2ca260acd41435717e6b8 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <[email protected]> +Date: Fri, 3 Apr 2020 22:40:29 +0200 +Subject: [PATCH 3/3] examples: fix wayland/texture-sharing/custom-compositor +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + + main.cpp:83:33: error: ?GL_RGBA8? was not declared in this scope; did you mean ?GL_RGBA4?? + 83 | *glInternalFormat = GL_RGBA8; + | ^~~~~~~~ + | GL_RGBA4 + main.cpp:120:33: error: ?GL_RGBA8? was not declared in this scope; did you mean ?GL_RGBA4?? + 120 | *glInternalFormat = GL_RGBA8; + | ^~~~~~~~ + | GL_RGBA4 + +Signed-off-by: Peter Seiderer <[email protected]> +--- + examples/wayland/texture-sharing/custom-compositor/main.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/examples/wayland/texture-sharing/custom-compositor/main.cpp b/examples/wayland/texture-sharing/custom-compositor/main.cpp +index a39c8c3..af37502 100644 +--- a/examples/wayland/texture-sharing/custom-compositor/main.cpp ++++ b/examples/wayland/texture-sharing/custom-compositor/main.cpp +@@ -63,6 +63,10 @@ +
Quoted 8 lines
package/qt5/qt5wayland/0003-examples-fix-wayland-texture-sharing-custom-composit.patch line 35
Quoted 5 lines
package/qt5/qt5wayland/0003-examples-fix-wayland-texture-sharing-custom-composit.patch new file +5
-0+ #include "QtWaylandCompositor/private/qwltexturesharingextension_p.h" + ++#ifndef GL_RGBA8 ++#define GL_RGBA8 0x8058 ++#endifThis feels like a hack. What should normally be providing the
GL_RGBA8define? The OpenGL headers?
Same 'hack' is used at some other Qt locations and patch is upstream accepted [5], [6] as is ;-)
Will wait some time for more feedback...., and provide an updated buildroot patch soon...
Regards,
Peter
[1] https://bugreports.qt.io/browse/QTBUG-83303
[2] https://codereview.qt-project.org/c/qt/qtwayland/+/296213
[3] https://bugreports.qt.io/browse/QTBUG-83305
[4] https://codereview.qt-project.org/c/qt/qtwayland/+/296215
[5] https://bugreports.qt.io/browse/QTBUG-83304
[6] https://codereview.qt-project.org/c/qt/qtwayland/+/296214
Quoted 2 lines
Thomas
RFC v4 1/3 package/qt5: bump version to 5.13.2
In reply to Peter SeidererQuoted 11 lines · On Fri, 3 Apr 2020 23:23:55 +0200 Peter Seiderer <[email protected]> wrote:
qt5canvas3d:
- removed with 5.13 according to [1]qt5webengine:
- remove 0001-pkg_config-Fixes-when-use_sysroot-false.patch (taken from upstream [2])
- update 3rdparty license hash list and chromium-latest.inc file[1] https://doc.qt.io/qt-5/whatsnew513.html
[2] https://chromium.googlesource.com/chromium/src/+/a8c8396fd20d98666d517c45b358c63736e345ef
Quoted 8 lines
Signed-off-by Peter Seiderer <[email protected]>---
Changes v1 -> v2:
- remove spurious qt5base commit log entry (leftover from some early draft, suggested by Thomas Petazzoni)
- fix qt5scxml vs. qt5canvas3d typo, reword comment message and fix indent, remove unneeded license condition (suggested by Thomas Petazzoni)
I've added a Config.in.legacy entry for the removed qt5canvas3d option, and then applied. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
RFC v4 1/3 package/qt5: bump version to 5.13.2
Hello Thomas,
Quoted 23 lines · Thomas Petazzoni
Quoted 11 lines · On Fri, 3 Apr 2020 23:23:55 +0200 Peter Seiderer <[email protected]> wrote:
qt5canvas3d:
- removed with 5.13 according to [1]qt5webengine:
- remove 0001-pkg_config-Fixes-when-use_sysroot-false.patch (taken from upstream [2])
- update 3rdparty license hash list and chromium-latest.inc file[1] https://doc.qt.io/qt-5/whatsnew513.html
[2] https://chromium.googlesource.com/chromium/src/+/a8c8396fd20d98666d517c45b358c63736e345efQuoted 8 lines
Signed-off-by Peter Seiderer <[email protected]>---
Changes v1 -> v2:
- remove spurious qt5base commit log entry (leftover from some early draft, suggested by Thomas Petazzoni)
- fix qt5scxml vs. qt5canvas3d typo, reword comment message and fix indent, remove unneeded license condition (suggested by Thomas Petazzoni)
Quoted 2 lines
I've added a Config.in.legacy entry for the removed qt5canvas3d option, and then applied. Thanks!
Thanks for fixing it (now I can scratch this point from my ToDo list ;-)...
Regards,
Peter
Quoted 2 lines
Thomas