bump/choice for qt 5.8.0
v5 cover bump/choice for qt 5.8.0
Finally bumping to Qt 5.8.0 release version, keeping 5.6.2 as an option. This mainly involved making some configure options conditional as well as different licensing. Also, 5.8 supports Quick and modules depending on it on non-GL platforms.
Currently no more qt-patches are needed for 5.8.0. Moved 5.6.2 patches to separate directory.
Split up the qt5quickcontrols patch for hopefully more clarity.
Changed python-pyqt5 to depend on Qt5 instead of a bunch of toolchain requirements (as suggested by Thomas). The same for pyqt for consistency.
Andreas Naumann (7):
qt5: add choice between version 5.6.2 and 5.8.0
qt5declarative: enable Quick for non-GL platforms for Qt 5.8.0
qt5quickcontrols: More deterministic target install qt5quickcontrols/qt5quickcontrols2: enable for software renderer for
Qt 5.8.0
python-pyqt5: Depend directly on Qt5 rather than its toolchain
requirements
python-pyqt: Depend directly on Qt rather than its toolchain
requirements
python-pyqt5: Fix for Qt 5.8.0
Julien Corjon (3):
qt5enginio : move into legacy compatibility qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview Conditional revert "qt5base: install bundled fonts to target"
package/python-pyqt/Config.in | 10 ++-- package/python-pyqt5/0002-fix-qt-5.6.2.patch | 28 ------------ package/python-pyqt5/0002-fix-qt5.8-build.patch | 28 ++++++++++++ package/python-pyqt5/Config.in | 13 ++---- package/qt5/Config.in | 27 ++++++++--- package/qt5/qt5.mk | 8 ++++ package/qt5/qt53d/qt53d.hash | 3 ++ .../0006-eglfs-rasp-pi-header-inclusion.patch | 45 ------------------ ...fs-fix-eglfs_mali-compile-for-odroid-mali.patch | 53 ---------------------- .../0006-eglfs-rasp-pi-header-inclusion.patch | 45 ++++++++++++++++++ ...fs-fix-eglfs_mali-compile-for-odroid-mali.patch | 53 ++++++++++++++++++++++ package/qt5/qt5base/qt5base.hash | 3 ++ package/qt5/qt5base/qt5base.mk | 15 ++++++ package/qt5/qt5canvas3d/qt5canvas3d.hash | 3 ++ package/qt5/qt5connectivity/qt5connectivity.hash | 3 ++ package/qt5/qt5connectivity/qt5connectivity.mk | 5 ++ package/qt5/qt5declarative/Config.in | 6 +-- package/qt5/qt5declarative/qt5declarative.hash | 3 ++ package/qt5/qt5declarative/qt5declarative.mk | 5 ++ .../qt5graphicaleffects/qt5graphicaleffects.hash | 3 ++ .../qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 5 ++ package/qt5/qt5imageformats/qt5imageformats.hash | 3 ++ package/qt5/qt5imageformats/qt5imageformats.mk | 5 ++ package/qt5/qt5location/qt5location.hash | 3 ++ package/qt5/qt5location/qt5location.mk | 5 ++ package/qt5/qt5multimedia/qt5multimedia.hash | 3 ++ package/qt5/qt5multimedia/qt5multimedia.mk | 8 ++++ package/qt5/qt5quickcontrols/Config.in | 4 +- package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 3 ++ package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 5 +- package/qt5/qt5quickcontrols2/Config.in | 4 +- .../qt5/qt5quickcontrols2/qt5quickcontrols2.hash | 3 ++ package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 12 +++++ package/qt5/qt5script/qt5script.hash | 3 ++ package/qt5/qt5sensors/qt5sensors.hash | 3 ++ package/qt5/qt5sensors/qt5sensors.mk | 5 ++ package/qt5/qt5serialbus/qt5serialbus.hash | 3 ++ package/qt5/qt5serialport/qt5serialport.hash | 3 ++ package/qt5/qt5serialport/qt5serialport.mk | 5 ++ package/qt5/qt5svg/qt5svg.hash | 3 ++ package/qt5/qt5svg/qt5svg.mk | 5 ++ package/qt5/qt5tools/qt5tools.hash | 3 ++ package/qt5/qt5tools/qt5tools.mk | 5 ++ package/qt5/qt5webchannel/qt5webchannel.hash | 3 ++ package/qt5/qt5webchannel/qt5webchannel.mk | 5 ++ package/qt5/qt5webkit/qt5webkit.hash | 3 ++ package/qt5/qt5websockets/qt5websockets.hash | 3 ++ package/qt5/qt5websockets/qt5websockets.mk | 5 ++ package/qt5/qt5x11extras/qt5x11extras.hash | 3 ++ package/qt5/qt5x11extras/qt5x11extras.mk | 5 ++ package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 3 ++ package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 5 ++ 52 files changed, 337 insertions(+), 158 deletions(-) delete mode 100644 package/python-pyqt5/0002-fix-qt-5.6.2.patch create mode 100644 package/python-pyqt5/0002-fix-qt5.8-build.patch delete mode 100644 package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch delete mode 100644 package/qt5/qt5base/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch create mode 100644 package/qt5/qt5base/5.6.2/0006-eglfs-rasp-pi-header-inclusion.patch create mode 100644 package/qt5/qt5base/5.6.2/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch
Signature · 1 line
1.9.1
PATCH v5 1/10 qt5: add choice between version 5.6.2 and 5.8.0
For 5.8.0
- add hashes
- qt5 need C++11 compliant compiler since 5.7 ([1])
- use different licenses: since version 5.7 Qt removed the LGPL v2.1 option in favor of v3 with a different exception
- qt5base: renamed library to EglFSDeviceIntegration ([2])
- qt5base: remove ras-pi patch, commit c0cc5052097c723d0331a7619d686af9eb93d33c fix it ([3])
- qt5base: remove 0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch (upstream committed [3b])
- qt5base: remove obsolete config-option -large ([4])
- qt5base: remove gstreamer related config-option ([5])
For 5.6.2
- moved patches to subdir
[1] http://blog.qt.io/blog/2016/06/16/qt-5-7-released/ [2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=ec4eb4db61094179bc6a9ec26ec68fb710177053 [3] https://codereview.qt-project.org/#/c/167172/
[3b] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=f1b4bd4790860e1ff5afcec111a359bc3a91cfda
[4] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=84d3a21c9efe7efb2cce6d3bd14af1f9580b1108
[5] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=7d4da559afb62a779b3d90a65fb679cb5433f203
Signed-off-by Andreas Naumann <[email protected]>
Signed-off-by Julien Corjon <[email protected]>
--- package/qt5/Config.in | 18 +++++++- package/qt5/qt5.mk | 8 ++++ package/qt5/qt53d/qt53d.hash | 3 ++ .../0006-eglfs-rasp-pi-header-inclusion.patch | 45 ------------------ ...fs-fix-eglfs_mali-compile-for-odroid-mali.patch | 53 ---------------------- .../0006-eglfs-rasp-pi-header-inclusion.patch | 45 ++++++++++++++++++ ...fs-fix-eglfs_mali-compile-for-odroid-mali.patch | 53 ++++++++++++++++++++++ package/qt5/qt5base/qt5base.hash | 3 ++ package/qt5/qt5base/qt5base.mk | 13 ++++++ package/qt5/qt5canvas3d/qt5canvas3d.hash | 3 ++ package/qt5/qt5connectivity/qt5connectivity.hash | 3 ++ package/qt5/qt5connectivity/qt5connectivity.mk | 5 ++ package/qt5/qt5declarative/qt5declarative.hash | 3 ++ package/qt5/qt5declarative/qt5declarative.mk | 5 ++ .../qt5graphicaleffects/qt5graphicaleffects.hash | 3 ++ .../qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 5 ++ package/qt5/qt5imageformats/qt5imageformats.hash | 3 ++ package/qt5/qt5imageformats/qt5imageformats.mk | 5 ++ package/qt5/qt5location/qt5location.hash | 3 ++ package/qt5/qt5location/qt5location.mk | 5 ++ package/qt5/qt5multimedia/qt5multimedia.hash | 3 ++ package/qt5/qt5multimedia/qt5multimedia.mk | 5 ++ package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 3 ++ .../qt5/qt5quickcontrols2/qt5quickcontrols2.hash | 3 ++ package/qt5/qt5script/qt5script.hash | 3 ++ package/qt5/qt5sensors/qt5sensors.hash | 3 ++ package/qt5/qt5sensors/qt5sensors.mk | 5 ++ package/qt5/qt5serialbus/qt5serialbus.hash | 3 ++ package/qt5/qt5serialport/qt5serialport.hash | 3 ++ package/qt5/qt5serialport/qt5serialport.mk | 5 ++ package/qt5/qt5svg/qt5svg.hash | 3 ++ package/qt5/qt5svg/qt5svg.mk | 5 ++ package/qt5/qt5tools/qt5tools.hash | 3 ++ package/qt5/qt5tools/qt5tools.mk | 5 ++ package/qt5/qt5webchannel/qt5webchannel.hash | 3 ++ package/qt5/qt5webchannel/qt5webchannel.mk | 5 ++ package/qt5/qt5webkit/qt5webkit.hash | 3 ++ package/qt5/qt5websockets/qt5websockets.hash | 3 ++ package/qt5/qt5websockets/qt5websockets.mk | 5 ++ package/qt5/qt5x11extras/qt5x11extras.hash | 3 ++ package/qt5/qt5x11extras/qt5x11extras.mk | 5 ++ package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 3 ++ package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 5 ++ 43 files changed, 271 insertions(+), 100 deletions(-) delete mode 100644 package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch delete mode 100644 package/qt5/qt5base/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch create mode 100644 package/qt5/qt5base/5.6.2/0006-eglfs-rasp-pi-header-inclusion.patch create mode 100644 package/qt5/qt5base/5.6.2/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch
package/qt5/Config.in +16 -2
@@ -11,15 +11,16 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE depends on !BR2_ARM_CPU_ARMV4 default y -comment "Qt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library" +comment "Qt5 needs a toolchain w/ wchar, NPTL, C++11, dynamic library" depends on !BR2_PACKAGE_QT - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_STATIC_LIBS menuconfig BR2_PACKAGE_QT5 bool "Qt5" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on !BR2_STATIC_LIBS depends on !BR2_PACKAGE_QT select BR2_PACKAGE_QT5BASE
@@ -30,6 +31,19 @@ menuconfig BR2_PACKAGE_QT5 http://qt.io if BR2_PACKAGE_QT5 + +choice + prompt "Qt5 version" + default BR2_QT5_VERSION_5_8 + +config BR2_QT5_VERSION_5_8 + bool "5.8" + +config BR2_QT5_VERSION_5_6 + bool "5.6" + +endchoice + source "package/qt5/qt5base/Config.in" source "package/qt5/qt5canvas3d/Config.in" source "package/qt5/qt5connectivity/Config.in"
package/qt5/qt5.mk +8 -0
@@ -1,7 +1,15 @@ +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5_VERSION_MAJOR = 5.8 +QT5_VERSION = $(QT5_VERSION_MAJOR).0 +QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules +QT5_SNAPSHOTS_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules +else QT5_VERSION_MAJOR = 5.6 QT5_VERSION = $(QT5_VERSION_MAJOR).2 QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules QT5_SNAPSHOTS_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules +endif + include $(sort $(wildcard package/qt5/*/*.mk)) define QT5_LA_PRL_FILES_FIXUP
package/qt5/qt53d/qt53d.hash +3 -0
@@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qt3d-opensource-src-5.6.2.tar.xz.mirrorlist sha256 a21786db6e0f5c6c70213fe1a3530ed3d7f28f28401a0f793970e9bc860ce941 qt3d-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qt3d-opensource-src-5.8.0.tar.xz +sha256 3a224576fc922195ac0063b5b351cd6b9d13afcde9cec14317be0347d10c8ae5 qt3d-opensource-src-5.8.0.tar.xz
package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch deleted +0 -45
45 lines not on this page · raw message
package/qt5/qt5base/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch deleted +0 -53
53 lines not on this page · raw message
package/qt5/qt5base/5.6.2/0006-eglfs-rasp-pi-header-inclusion.patch new file +45 -0
45 lines not on this page · raw message
package/qt5/qt5base/5.6.2/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch new file +53 -0
53 lines not on this page · raw message
package/qt5/qt5base/qt5base.hash +3 -0
@@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtbase-opensource-src-5.6.2.tar.xz.mirrorlist sha256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 qtbase-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtbase-opensource-src-5.8.0.tar.xz +sha256 c17111ae02a44dc7be1ec2cf979a47ee9e58edf4904041a525c21f4fa53fc005 qtbase-opensource-src-5.8.0.tar.xz
package/qt5/qt5base/qt5base.mk +13 -0
@@ -41,12 +41,19 @@ else QT5BASE_CONFIGURE_OPTS += -release endif +ifeq ($(BR2_QT5_VERSION_5_6),y) QT5BASE_CONFIGURE_OPTS += -largefile +endif ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5BASE_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +else QT5BASE_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5BASE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif else QT5BASE_LICENSE = Commercial license QT5BASE_REDISTRIBUTE = NO
@@ -154,12 +161,14 @@ QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_EXAMPLES),-make,-nomake) examples # gstreamer 0.10 support is broken in qt5multimedia +ifeq ($(BR2_QT5_VERSION_5_6),y) ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) QT5BASE_CONFIGURE_OPTS += -gstreamer 1.0 QT5BASE_DEPENDENCIES += gst1-plugins-base else QT5BASE_CONFIGURE_OPTS += -no-gstreamer endif +endif ifeq ($(BR2_PACKAGE_LIBINPUT),y) QT5BASE_CONFIGURE_OPTS += -libinput
@@ -177,7 +186,11 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL) += Qt5Sql QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST) += Qt5Test QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML) += Qt5Xml QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFSDeviceIntegration +else QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglDeviceIntegration +endif QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets
package/qt5/qt5canvas3d/qt5canvas3d.hash +3 -0
@@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtcanvas3d-opensource-src-5.6.2.tar.xz.mirrorlist sha256 d7584d006b03f99692ccabce922e755a6f12bb1ed1fbc99c2b84842b9e0aa0ad qtcanvas3d-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtcanvas3d-opensource-src-5.8.0.tar.xz +sha256 5446f790f526f582df7790e1e1442357f61aac9c23ea9b00d4a791c9d78ccaa3 qtcanvas3d-opensource-src-5.8.0.tar.xz
package/qt5/qt5connectivity/qt5connectivity.hash +3 -0
@@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtconnectivity-opensource-src-5.6.2.tar.xz.mirrorlist sha256 1b672923e0703d62f605ccec97b454b1a04c1f0db47f54b687d009e84eabedf9 qtconnectivity-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtconnectivity-opensource-src-5.8.0.tar.xz +sha256 7b2d01e9d67f6390a9e64bdae62e81a965b0f0b21137cf1a021e08a28bb227f1 qtconnectivity-opensource-src-5.8.0.tar.xz
package/qt5/qt5connectivity/qt5connectivity.mk +5 -0
@@ -11,8 +11,13 @@ QT5CONNECTIVITY_DEPENDENCIES = qt5base QT5CONNECTIVITY_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5CONNECTIVITY_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +else QT5CONNECTIVITY_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif else QT5CONNECTIVITY_LICENSE = Commercial license QT5CONNECTIVITY_REDISTRIBUTE = NO
package/qt5/qt5declarative/qt5declarative.hash +3 -0
@@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtdeclarative-opensource-src-5.6.2.tar.xz.mirrorlist sha256 0086a986bc36b398ba518c404d08cdff0a0d7978c30aa3fa2ab73d71654209da qtdeclarative-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtdeclarative-opensource-src-5.8.0.tar.xz +sha256 32941eb9ad12d8735dfc64de8b50b5ab830a6d8705a421c57369de7cb5708a46 qtdeclarative-opensource-src-5.8.0.tar.xz
package/qt5/qt5declarative/qt5declarative.mk +5 -0
@@ -11,8 +11,13 @@ QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns QT5DECLARATIVE_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5DECLARATIVE_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +else QT5DECLARATIVE_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif else QT5DECLARATIVE_LICENSE = Commercial license QT5DECLARATIVE_REDISTRIBUTE = NO
package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +3 -0
@@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtgraphicaleffects-opensource-src-5.6.2.tar.xz.mirrorlist sha256 1e9f0fac2c72a812d396db74b2d9d12f513d2ec9135d5982ca85aee7f00be75e qtgraphicaleffects-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtgraphicaleffects-opensource-src-5.8.0.tar.xz +sha256 5f2a9b50530ac83d7c2b2ce73fbdf03ac61f83a9521e9d4b796fa17a969dd919 qtgraphicaleffects-opensource-src-5.8.0.tar.xz
package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +5 -0
@@ -11,8 +11,13 @@ QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5base qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5GRAPHICALEFFECTS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +else QT5GRAPHICALEFFECTS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif else QT5GRAPHICALEFFECTS_LICENSE = Commercial license QT5GRAPHICALEFFECTS_REDISTRIBUTE = NO
package/qt5/qt5imageformats/qt5imageformats.hash +3 -0
@@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtimageformats-opensource-src-5.6.2.tar.xz.mirrorlist sha256 4fb153be62dac393cbcebab65040b3b9d6edecd1ebbe5e543401b0e45bd147e4 qtimageformats-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtimageformats-opensource-src-5.8.0.tar.xz +sha256 75045eeac11c96194260badbdb4d3e9eb7b7f9972d18d3491230ea820be4606f qtimageformats-opensource-src-5.8.0.tar.xz
package/qt5/qt5imageformats/qt5imageformats.mk +5 -0
@@ -11,8 +11,13 @@ QT5IMAGEFORMATS_DEPENDENCIES = qt5base QT5IMAGEFORMATS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5IMAGEFORMATS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +else QT5IMAGEFORMATS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif else QT5IMAGEFORMATS_LICENSE = Commercial license QT5IMAGEFORMATS_REDISTRIBUTE = NO
package/qt5/qt5location/qt5location.hash +3 -0
@@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtlocation-opensource-src-5.6.2.tar.xz.mirrorlist sha256 7a8995206ed0220f943a33c037527a1a8243d5386f5ca77bf88152675c28d23a qtlocation-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtlocation-opensource-src-5.8.0.tar.xz +sha256 48a1e39ed989f0133aeacaa379e9c3958ec9b08c043626bba503619891d21abb qtlocation-opensource-src-5.8.0.tar.xz
package/qt5/qt5location/qt5location.mk +5 -0
@@ -11,8 +11,13 @@ QT5LOCATION_DEPENDENCIES = qt5base QT5LOCATION_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5LOCATION_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +else QT5LOCATION_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif else QT5LOCATION_LICENSE = Commercial license QT5LOCATION_REDISTRIBUTE = NO
package/qt5/qt5multimedia/qt5multimedia.hash +3 -0
@@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtmultimedia-opensource-src-5.6.2.tar.xz.mirrorlist sha256 cb9a70a7c6c0eb5be4a3fcaf9590863479e95a255308bbf07d5b7aa303bb8caf qtmultimedia-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtmultimedia-opensource-src-5.8.0.tar.xz +sha256 a8bc044834f95208261915feefe5e2fdb6761b76f0f99e21062963bd9f9d4a07 qtmultimedia-opensource-src-5.8.0.tar.xz
package/qt5/qt5multimedia/qt5multimedia.mk +5 -0
@@ -11,8 +11,13 @@ QT5MULTIMEDIA_DEPENDENCIES = qt5base QT5MULTIMEDIA_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5MULTIMEDIA_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +else QT5MULTIMEDIA_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif else QT5MULTIMEDIA_LICENSE = Commercial license QT5MULTIMEDIA_REDISTRIBUTE = NO
package/qt5/qt5quickcontrols/qt5quickcontrols.hash +3 -0
@@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtquickcontrols-opensource-src-5.6.2.tar.xz.mirrorlist sha256 5ed0f2292be10222dfb1b57a05472798fd759279f65455d91c02ef4fb746102c qtquickcontrols-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtquickcontrols-opensource-src-5.8.0.tar.xz +sha256 04e70d0ccfd9ba882691a5e8f81e3428ae1b72a76bb9f43ba242f1c33bd7b326 qtquickcontrols-opensource-src-5.8.0.tar.xz
package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +3 -0
@@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtquickcontrols2-opensource-src-5.6.2.tar.xz.mirrorlist sha256 09dc1710aa4701aebe145829eb99bab94d0870cf578f7dddcec0af92286dfec1 qtquickcontrols2-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtquickcontrols2-opensource-src-5.8.0.tar.xz +sha256 b099866ec74f13cf0047274c61f0486d1eba27716fa07b69f682c54d3a4ade1b qtquickcontrols2-opensource-src-5.8.0.tar.xz
package/qt5/qt5script/qt5script.hash +3 -0
@@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtscript-opensource-src-5.6.2.tar.xz.mirrorlist sha256 e06ef6b271cae2187b57cd4ffdd6759428fd47f94a060e2ed2af024a8c14110e qtscript-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtscript-opensource-src-5.8.0.tar.xz +sha256 293ab91d2d189d889dc80609aa259190fb7de636d360e904784a5ce1a45e5ad3 qtscript-opensource-src-5.8.0.tar.xz
package/qt5/qt5sensors/qt5sensors.hash +3 -0
@@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtsensors-opensource-src-5.6.2.tar.xz.mirrorlist sha256 a7809081aab4f2f0d7a4f40c3abb02e1690bb390d1dd410d7c6c5019a5053427 qtsensors-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtsensors-opensource-src-5.8.0.tar.xz +sha256 3a5d0639ecf8cd30c8ca349c353a8f3c424889b53831e70b6d8c481fc45de796 qtsensors-opensource-src-5.8.0.tar.xz
package/qt5/qt5sensors/qt5sensors.mk +5 -0
@@ -11,8 +11,13 @@ QT5SENSORS_DEPENDENCIES = qt5base QT5SENSORS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5SENSORS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +else QT5SENSORS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif else QT5SENSORS_LICENSE = Commercial license QT5SENSORS_REDISTRIBUTE = NO
package/qt5/qt5serialbus/qt5serialbus.hash +3 -0
@@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtserialbus-opensource-src-5.6.2.tar.xz.mirrorlist sha256 b39260091691532382935ed51de9ead8e66cfb5f7a6e5410c17cd0695ccaf826 qtserialbus-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtserialbus-opensource-src-5.8.0.tar.xz +sha256 58343dd9f2e339d4900a2d4b54ee25ed959cf62bacb012fe61e6b99d7958c10a qtserialbus-opensource-src-5.8.0.tar.xz
package/qt5/qt5serialport/qt5serialport.hash +3 -0
@@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtserialport-opensource-src-5.6.2.tar.xz.mirrorlist sha256 af76281bad2c2bd283189635316b46091f6712134b845ae1b9e3016eec94f376 qtserialport-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtserialport-opensource-src-5.8.0.tar.xz +sha256 52317fded73ad0beb0a2ecf93124a8e2dfdcf14270a762c1f4fd06fb075506ad qtserialport-opensource-src-5.8.0.tar.xz
package/qt5/qt5serialport/qt5serialport.mk +5 -0
@@ -11,8 +11,13 @@ QT5SERIALPORT_DEPENDENCIES = qt5base QT5SERIALPORT_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5SERIALPORT_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +else QT5SERIALPORT_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif else QT5SERIALPORT_LICENSE = Commercial license QT5SERIALPORT_REDISTRIBUTE = NO
package/qt5/qt5svg/qt5svg.hash +3 -0
@@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtsvg-opensource-src-5.6.2.tar.xz.mirrorlist sha256 f7a361bf661b31ae7779513559dd0b774171911bc57f5cfb6bed6878ddc8bc4e qtsvg-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtsvg-opensource-src-5.8.0.tar.xz +sha256 9873191c211ab4da9c0bc47b1e3549f475db4d448bba3175e0f86b24eefadc89 qtsvg-opensource-src-5.8.0.tar.xz
package/qt5/qt5svg/qt5svg.mk +5 -0
@@ -11,8 +11,13 @@ QT5SVG_DEPENDENCIES = qt5base QT5SVG_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5SVG_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +else QT5SVG_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5SVG_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif else QT5SVG_LICENSE = Commercial license QT5SVG_REDISTRIBUTE = NO
package/qt5/qt5tools/qt5tools.hash +3 -0
@@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qttools-opensource-src-5.6.2.tar.xz.mirrorlist sha256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 qttools-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qttools-opensource-src-5.8.0.tar.xz +sha256 95ec8e76d393b6ba26ffff5041fce41946d2bf3aec1402c6533e24d9fc269d83 qttools-opensource-src-5.8.0.tar.xz
package/qt5/qt5tools/qt5tools.mk +5 -0
@@ -20,8 +20,13 @@ QT5TOOLS_DEPENDENCIES += qt5declarative endif ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5TOOLS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5TOOLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +else QT5TOOLS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5TOOLS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif else QT5TOOLS_LICENSE = Commercial license QT5TOOLS_REDISTRIBUTE = NO
package/qt5/qt5webchannel/qt5webchannel.hash +3 -0
@@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtwebchannel-opensource-src-5.6.2.tar.xz.mirrorlist sha256 700efdef5f51bdb77093f4db212afe275ad35a710ea08ba0e9e9cbc8f09f1a52 qtwebchannel-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtwebchannel-opensource-src-5.8.0.tar.xz +sha256 5bf5b15413baa235ee2cbfd136ea3b9303b32879b54f9f25bfb4dc96d37d0b4a qtwebchannel-opensource-src-5.8.0.tar.xz
package/qt5/qt5webchannel/qt5webchannel.mk +5 -0
@@ -11,8 +11,13 @@ QT5WEBCHANNEL_DEPENDENCIES = qt5base qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5WEBCHANNEL_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +else QT5WEBCHANNEL_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif else QT5WEBCHANNEL_LICENSE = Commercial license QT5WEBCHANNEL_REDISTRIBUTE = NO
package/qt5/qt5webkit/qt5webkit.hash +3 -0
@@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/snapshots/qt/5.6/5.6.2/latest_src/submodules/qtwebkit-opensource-src-5.6.2.tar.xz.mirrorlist sha256 528a6b8b1c5095367b26e8ce4f3a46bb739e2e9913ff4dfc6ef58a04fcd73966 qtwebkit-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtwebkit-opensource-src-5.8.0.tar.xz +sha256 79ae8660086bf92ffb0008b17566270e6477c8fa0daf9bb3ac29404fb5911bec qtwebkit-opensource-src-5.8.0.tar.xz
package/qt5/qt5websockets/qt5websockets.hash +3 -0
@@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtwebsockets-opensource-src-5.6.2.tar.xz.mirrorlist sha256 3cd9d4bbff8e6be5e252f00fc9ecb9ac2d8a193020288c7d1e82583daeb5ba35 qtwebsockets-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtwebsockets-opensource-src-5.8.0.tar.xz +sha256 aa110af297d0d3239f346c3ee0cd43621adf463eb62a04941bbfe3fcccb845f5 qtwebsockets-opensource-src-5.8.0.tar.xz
package/qt5/qt5websockets/qt5websockets.mk +5 -0
@@ -11,8 +11,13 @@ QT5WEBSOCKETS_DEPENDENCIES = qt5base QT5WEBSOCKETS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5WEBSOCKETS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools) +QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 +else QT5WEBSOCKETS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3 QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 +endif else QT5WEBSOCKETS_LICENSE = Commercial license QT5WEBSOCKETS_REDISTRIBUTE = NO
package/qt5/qt5x11extras/qt5x11extras.hash +3 -0
@@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtx11extras-opensource-src-5.6.2.tar.xz.mirrorlist sha256 71ffde1cfaeec310677b69ecd16cb5992e8885cf3e73b4cec7d6e7a115b40ced qtx11extras-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtx11extras-opensource-src-5.8.0.tar.xz +sha256 bed7f2b5123a9849ec94afa67db5f296e6f527c6330f47a680c83586d3a4280e qtx11extras-opensource-src-5.8.0.tar.xz
package/qt5/qt5x11extras/qt5x11extras.mk +5 -0
@@ -11,8 +11,13 @@ QT5X11EXTRAS_DEPENDENCIES = qt5base QT5X11EXTRAS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5X11EXTRAS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +else QT5X11EXTRAS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif else QT5X11EXTRAS_LICENSE = Commercial license QT5X11EXTRAS_REDISTRIBUTE = NO
package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +3 -0
@@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtxmlpatterns-opensource-src-5.6.2.tar.xz.mirrorlist sha256 7c6df3eebf188d8ce6822a22cebbc63da5ac27047cf1bd7236d5b988244782cc qtxmlpatterns-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtxmlpatterns-opensource-src-5.8.0.tar.xz +sha256 7bffa65ea52e54fb1314b45222888612d55eaf51a936a6119b8756266439da04 qtxmlpatterns-opensource-src-5.8.0.tar.xz
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +5 -0
@@ -11,8 +11,13 @@ QT5XMLPATTERNS_DEPENDENCIES = qt5base QT5XMLPATTERNS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5XMLPATTERNS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +else QT5XMLPATTERNS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif else QT5XMLPATTERNS_LICENSE = Commercial license QT5XMLPATTERNS_REDISTRIBUTE = NO
Signature · 1 line
1.9.1
PATCH v5 2/10 qt5enginio : move into legacy compatibility
In reply to Andreas NaumannFrom: Julien Corjon <[email protected]>
See https://wiki.qt.io/New_Features_in_Qt_5.7
Signed-off-by Julien Corjon <[email protected]>
Signed-off-by Andreas Naumann <[email protected]>
--- package/qt5/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/qt5/Config.in +1 -1
@@ -48,7 +48,6 @@ source "package/qt5/qt5base/Config.in" source "package/qt5/qt5canvas3d/Config.in" source "package/qt5/qt5connectivity/Config.in" source "package/qt5/qt5declarative/Config.in" -source "package/qt5/qt5enginio/Config.in" source "package/qt5/qt5graphicaleffects/Config.in" source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5location/Config.in"
@@ -67,6 +66,7 @@ source "package/qt5/qt53d/Config.in" source "package/qt5/qt5quickcontrols2/Config.in" source "package/qt5/qt5serialbus/Config.in" comment "legacy compatibility" +source "package/qt5/qt5enginio/Config.in" source "package/qt5/qt5script/Config.in" source "package/qt5/qt5webkit/Config.in" endif
Signature · 1 line
1.9.1
PATCH v5 2/10 qt5enginio : move into legacy compatibility
Hello,
Quoted 6 lines · Andreas Naumann
From: Julien Corjon <[email protected]>
See https://wiki.qt.io/New_Features_in_Qt_5.7
Signed-off-by Julien Corjon <[email protected]>Signed-off-by Andreas Naumann <[email protected]>
But this is only true for Qt >= 5.7. So if the user selects Qt 5.6, this is not true :-/
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
PATCH v5 3/10 qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview
In reply to Andreas NaumannFrom: Julien Corjon <[email protected]>
See http://blog.qt.io/blog/2016/06/16/qt-5-7-released/
Signed-off-by Julien Corjon <[email protected]>
Signed-off-by Andreas Naumann <[email protected]>
--- package/qt5/Config.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
package/qt5/Config.in +3 -4
@@ -44,6 +44,7 @@ config BR2_QT5_VERSION_5_6 endchoice +source "package/qt5/qt53d/Config.in" source "package/qt5/qt5base/Config.in" source "package/qt5/qt5canvas3d/Config.in" source "package/qt5/qt5connectivity/Config.in"
@@ -53,7 +54,9 @@ source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5location/Config.in" source "package/qt5/qt5multimedia/Config.in" source "package/qt5/qt5quickcontrols/Config.in" +source "package/qt5/qt5quickcontrols2/Config.in" source "package/qt5/qt5sensors/Config.in" +source "package/qt5/qt5serialbus/Config.in" source "package/qt5/qt5serialport/Config.in" source "package/qt5/qt5svg/Config.in" source "package/qt5/qt5tools/Config.in"
@@ -61,10 +64,6 @@ source "package/qt5/qt5webchannel/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5x11extras/Config.in" source "package/qt5/qt5xmlpatterns/Config.in" -comment "technology preview" -source "package/qt5/qt53d/Config.in" -source "package/qt5/qt5quickcontrols2/Config.in" -source "package/qt5/qt5serialbus/Config.in" comment "legacy compatibility" source "package/qt5/qt5enginio/Config.in" source "package/qt5/qt5script/Config.in"
Signature · 1 line
1.9.1
PATCH v5 3/10 qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview
Hello,
Quoted 6 lines · Andreas Naumann
From: Julien Corjon <[email protected]>
See http://blog.qt.io/blog/2016/06/16/qt-5-7-released/
Signed-off-by Julien Corjon <[email protected]>Signed-off-by Andreas Naumann <[email protected]>
Same here, this is only true for Qt >= 5.7, so if the user selects Qt 5.6, those modules are still in "tech preview".
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
PATCH v5 4/10 Conditional revert "qt5base: install bundled fonts to target"
In reply to Andreas NaumannFrom: Julien Corjon <[email protected]>
qtbase carries nor more fonts since c5ceabb9a1caf6b9b7615a28c3097f221772f645
So for Qt Version 5.8.0 this reverts commit cdfa21b06041eb601e0bea79f2c8f50e9d637384 and part of 186ef9f6f4647ed34b67a3427a5e0e249f0794e7
Signed-off-by Andreas Naumann <[email protected]>
Signed-off-by Julien Corjon <[email protected]>
--- package/qt5/qt5base/qt5base.mk | 2 ++ 1 file changed, 2 insertions(+)
package/qt5/qt5base/qt5base.mk +2 -0
@@ -256,12 +256,14 @@ define QT5BASE_INSTALL_TARGET_PLUGINS fi endef +ifeq ($(BR2_QT5_VERSION_5_6),y) define QT5BASE_INSTALL_TARGET_FONTS if [ -d $(STAGING_DIR)/usr/lib/fonts/ ] ; then \ mkdir -p $(TARGET_DIR)/usr/lib/fonts ; \ cp -dpfr $(STAGING_DIR)/usr/lib/fonts/* $(TARGET_DIR)/usr/lib/fonts ; \ fi endef +endif define QT5BASE_INSTALL_TARGET_EXAMPLES if [ -d $(STAGING_DIR)/usr/lib/qt/examples/ ] ; then \
Signature · 1 line
1.9.1
PATCH v5 4/10 Conditional revert "qt5base: install bundled fonts to target"
Hello,
Quoted 6 lines · Andreas Naumann
From: Julien Corjon <[email protected]>
qtbase carries nor more fonts since
c5ceabb9a1caf6b9b7615a28c3097f221772f645So for Qt Version 5.8.0 this reverts commit
cdfa21b06041eb601e0bea79f2c8f50e9d637384and part of186ef9f6f4647ed34b67a3427a5e0e249f0794e7
Time for a new subject, eg. 'qt5base: conditional install bundled fonts'?
And a new patch description (the resulting patch hase nothing more to do with reverting a particular patch)?
Regards,
Peter
Quoted 26 lines
Signed-off-by Andreas Naumann <[email protected]>Signed-off-by Julien Corjon <[email protected]>--- package/qt5/qt5base/qt5base.mk | 2 ++ 1 file changed, 2 insertions(+)package/qt5/qt5base/qt5base.mk +2
-0@@ -256,12 +256,14 @@ define QT5BASE_INSTALL_TARGET_PLUGINS fi endef +ifeq ($(BR2_QT5_VERSION_5_6),y) define QT5BASE_INSTALL_TARGET_FONTS if [ -d $(STAGING_DIR)/usr/lib/fonts/ ] ; then \ mkdir -p $(TARGET_DIR)/usr/lib/fonts ; \ cp -dpfr $(STAGING_DIR)/usr/lib/fonts/* $(TARGET_DIR)/usr/lib/fonts ; \ fi endef +endif define QT5BASE_INSTALL_TARGET_EXAMPLES if [ -d $(STAGING_DIR)/usr/lib/qt/examples/ ] ; then \
PATCH v5 5/10 qt5declarative: enable Quick for non-GL platforms for Qt 5.8.0
In reply to Andreas NaumannSince Qt 5.8.0 provides a software rasterizer we can enable Quick for non-GL platforms. However, some modules provide less functionality without OpenGL, so install steps have to be limited for the softrender only backend:
- qtmultimedia does not provide qml
Signed-off-by Andreas Naumann <[email protected]>
--- package/qt5/qt5declarative/Config.in | 6 +++--- package/qt5/qt5multimedia/qt5multimedia.mk | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-)
package/qt5/qt5declarative/Config.in +3 -3
@@ -15,11 +15,11 @@ config BR2_PACKAGE_QT5DECLARATIVE if BR2_PACKAGE_QT5DECLARATIVE comment "quick module needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_QT5_VERSION_5_6 config BR2_PACKAGE_QT5DECLARATIVE_QUICK bool "quick module" - select BR2_PACKAGE_QT5BASE_OPENGL - depends on BR2_PACKAGE_QT5_GL_AVAILABLE + select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5_GL_AVAILABLE + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_QT5_VERSION_5_8 endif
package/qt5/qt5multimedia/qt5multimedia.mk +3 -0
@@ -58,11 +58,14 @@ define QT5MULTIMEDIA_INSTALL_TARGET_LIBS endef endif +# QtMultimedia QMLs have a hard dependency on OpenGL -> not available for softraster backends +ifeq ($(BR2_PACKAGE_QT5_GL_AVAILABLE),y) ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) define QT5MULTIMEDIA_INSTALL_TARGET_QMLS cp -dpfr $(STAGING_DIR)/usr/qml/QtMultimedia $(TARGET_DIR)/usr/qml/ endef endif +endif ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) define QT5MULTIMEDIA_INSTALL_TARGET_EXAMPLES
Signature · 1 line
1.9.1
PATCH v5 6/10 qt5quickcontrols: More deterministic target install
In reply to Andreas NaumannRestrict target install to quickcontrols(1) qmls only.
Installing everything under qml/QtQuick includes e.g. quickcontrols2 if existent in staging (but not selected). Another issue may arise e.g. for a external package that creates more files than it installs itself under qml/QtQuick. In that case, it would depend on the order of the packages how much gets installed into target.
Signed-off-by Andreas Naumann <[email protected]>
--- package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
package/qt5/qt5quickcontrols/qt5quickcontrols.mk +4 -1
@@ -31,7 +31,10 @@ define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS endef define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick $(TARGET_DIR)/usr/qml + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick endef $(eval $(generic-package))
Signature · 1 line
1.9.1
PATCH v5 7/10 qt5quickcontrols/qt5quickcontrols2: enable for software renderer for Qt 5.8.0
In reply to Andreas NaumannSigned-off-by Andreas Naumann <[email protected]>
--- package/qt5/qt5quickcontrols/Config.in | 4 ++-- package/qt5/qt5quickcontrols2/Config.in | 4 ++-- package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 12 ++++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-)
package/qt5/qt5quickcontrols/Config.in +2 -2
@@ -2,7 +2,7 @@ config BR2_PACKAGE_QT5QUICKCONTROLS bool "qt5quickcontrols" select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK - depends on BR2_PACKAGE_QT5_GL_AVAILABLE + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_QT5_VERSION_5_8 depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE help Qt is a cross-platform application and UI framework for
@@ -13,5 +13,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS http://qt.io comment "qt5quickcontrols needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_QT5_VERSION_5_6 depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
package/qt5/qt5quickcontrols2/Config.in +2 -2
@@ -2,7 +2,7 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 bool "qt5quickcontrols2" select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK - depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative/quick + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_QT5_VERSION_5_8 # qt5declarative/quick depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick help Qt is a cross-platform application and UI framework for
@@ -13,5 +13,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 http://qt.io comment "qt5quickcontrols2 needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_QT5_VERSION_5_6 depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +12 -0
@@ -36,6 +36,7 @@ define QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES endef endif +ifeq ($(BR2_QT5_VERSION_5_6),y) define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS cp -dpf $(STAGING_DIR)/usr/lib/libQt5LabsTemplates.so.* $(TARGET_DIR)/usr/lib cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/controls $(TARGET_DIR)/usr/qml/Qt/labs
@@ -43,5 +44,16 @@ define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/templates $(TARGET_DIR)/usr/qml/Qt/labs $(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES) endef +else +define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS + cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickTemplates2.so.* $(TARGET_DIR)/usr/lib + cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickControls2.so.* $(TARGET_DIR)/usr/lib + cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs + cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/platform $(TARGET_DIR)/usr/qml/Qt/labs + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls.2 $(TARGET_DIR)/usr/qml/QtQuick + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Templates.2 $(TARGET_DIR)/usr/qml/QtQuick + $(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES) +endef +endif $(eval $(generic-package))
Signature · 1 line
1.9.1
PATCH v5 8/10 python-pyqt5: Depend directly on Qt5 rather than its toolchain requirements
In reply to Andreas NaumannSigned-off-by Andreas Naumann <[email protected]>
--- package/python-pyqt5/Config.in | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
package/python-pyqt5/Config.in +3 -10
@@ -1,16 +1,9 @@ -comment "python-pyqt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library" - depends on !BR2_PACKAGE_QT - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS +comment "python-pyqt5 needs Qt5" + depends on !BR2_PACKAGE_QT5 config BR2_PACKAGE_PYTHON_PYQT5 bool "python-pyqt5" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # qt5 - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # qt5 - depends on !BR2_STATIC_LIBS # qt5 - depends on !BR2_PACKAGE_QT # qt5 - select BR2_PACKAGE_QT5 + depends on BR2_PACKAGE_QT5 select BR2_PACKAGE_PYTHON_SIP help Python bindings for Qt 5
Signature · 1 line
1.9.1
PATCH v5 8/10 python-pyqt5: Depend directly on Qt5 rather than its toolchain requirements
Hello,
Quoted 4 lines · Andreas Naumann
Signed-off-by Andreas Naumann <[email protected]>--- package/python-pyqt5/Config.in | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
What was the motivation for this change? The commit log is empty :-/
Note that I don't disagree with the change, but a little bit more details about the rationale would be good.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
PATCH v5 8/10 python-pyqt5: Depend directly on Qt5 rather than its toolchain requirements
Hi,
Am 27.01.2017 um 09:21 schrieb Thomas Petazzoni:
Quoted 8 lines
Hello,
Quoted 4 lines · Andreas Naumann
Signed-off-by Andreas Naumann <[email protected]>--- package/python-pyqt5/Config.in | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
Quoted 4 lines
What was the motivation for this change? The commit log is empty :-/
Note that I don't disagree with the change, but a little bit more details about the rationale would be good.
That would be your comment in v3 of this set:
"When you want python-qt5 it's really obvious that you need Qt5, so for the user it's logical to enable Qt5 and then Python-Qt5."
Unfortunately, I wont have time to rework this and your other two comments in the next 10 days. If you need to apply the set earlier than that, feel free to just change as needed.
Thanks!
Andreas
Quoted 3 lines
Thomas
PATCH v5 8/10 python-pyqt5: Depend directly on Qt5 rather than its toolchain requirements
Hello,
Quoted 4 lines · Andreas Naumann
That would be your comment in v3 of this set:
"When you want python-qt5 it's really obvious that you need Qt5, so for the user it's logical to enable Qt5 and then Python-Qt5."
Sure. What I meant is that such explanation should be part of the commit log. This way, if a few months/years from now we wonder why this change was done, we have the explanation in the commit log.
Quoted 3 lines
Unfortunately, I wont have time to rework this and your other two comments in the next 10 days. If you need to apply the set earlier than that, feel free to just change as needed.
Sure, thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
PATCH v5 8/10 python-pyqt5: Depend directly on Qt5 rather than its toolchain requirements
Dear Thomas, Andreas & All,
I'm gonna try to take this over from Andreas. As not all of the patches apply clean atm (because of the recent example code license related patchset), i'm going to fix that, do some testing (which will take some time given the compilation times), and submit a v6 of this set, also adding the proposed comment for python-qt5. (Unless of course someone is working on this already, in this case pls let me know so we can share the tasks)
Regards,
Zoltan Gyarmati
https://zgyarmati.de
Quoted 12 lines · Thomas Petazzoni
Hello,
Quoted 4 lines · Andreas Naumann
That would be your comment in v3 of this set:
"When you want python-qt5 it's really obvious that you need Qt5, so for the user it's logical to enable Qt5 and then Python-Qt5."
Sure. What I meant is that such explanation should be part of the commit log. This way, if a few months/years from now we wonder why this change was done, we have the explanation in the commit log.
Quoted 6 lines
Quoted 3 lines
Unfortunately, I wont have time to rework this and your other two comments in the next 10 days. If you need to apply the set earlier than that, feel free to just change as needed.
Sure, thanks!
Thomas
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20170130/2e98912a/attachment.asc>
PATCH v5 9/10 python-pyqt: Depend directly on Qt rather than its toolchain requirements
In reply to Andreas NaumannSigned-off-by Andreas Naumann <[email protected]>
--- package/python-pyqt/Config.in | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
package/python-pyqt/Config.in +3 -7
@@ -1,13 +1,9 @@ -comment "python-pyqt needs a toolchain w/ C++, threads" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS +comment "python-pyqt needs Qt4" + depends on !BR2_PACKAGE_QT config BR2_PACKAGE_PYTHON_PYQT bool "python-pyqt" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS # qt - depends on BR2_USE_MMU # qt - select BR2_PACKAGE_QT + depends on BR2_PACKAGE_QT select BR2_PACKAGE_PYTHON_SIP help PyQt4 for Qt Embedded 4 bindings.
Signature · 1 line
1.9.1
PATCH v5 10/10 python-pyqt5: Fix for Qt 5.8.0
In reply to Andreas NaumannJust follow https://code.qt.io/cgit/qt/qtbase.git/commit/?id=2be25273e1fc81c5a9e5124f1444100bdb3d458a
Signed-off-by Andreas Naumann <[email protected]>
--- package/python-pyqt5/0002-fix-qt-5.6.2.patch | 28 ------------------------- package/python-pyqt5/0002-fix-qt5.8-build.patch | 28 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 package/python-pyqt5/0002-fix-qt-5.6.2.patch create mode 100644 package/python-pyqt5/0002-fix-qt5.8-build.patch
package/python-pyqt5/0002-fix-qt-5.6.2.patch deleted +0 -28
@@ -1,28 +0,0 @@ -Fix the build with Qt 5.6.2 - -Building PyQt 5.7 with versions of Qt older than Qt 5.7 is supposed to -work, but currently fails in practice. In fact, this is due to the -fact that the %Timeline variable in QtCoremod.sip didn't contain the -5.6.2 Qt version, so if this version was used, PyQt was assuming it -was the later version 5.7, and therefore started enabling APIs only -available in Qt 5.7, causing build failures when building against Qt -5.6.2. - -Adding Qt_5_6_2 to the timeline fixes this problem. This fix was -suggested by Phil Thompson <[email protected]>. - -Signed-off-by: Thomas Petazzoni <[email protected]> - -Index: PyQt5_gpl-5.7/sip/QtCore/QtCoremod.sip -=================================================================== ---- PyQt5_gpl-5.7.orig/sip/QtCore/QtCoremod.sip 2016-07-25 15:55:37.000000000 +0200 -+++ PyQt5_gpl-5.7/sip/QtCore/QtCoremod.sip 2016-10-26 15:45:43.577153825 +0200 -@@ -22,7 +22,7 @@ - - %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", version=1) - --%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_7_0} -+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_7_0} - - %Platforms {WS_X11 WS_WIN WS_MACX} -
package/python-pyqt5/0002-fix-qt5.8-build.patch new file +28 -0
@@ -0,0 +1,28 @@ +Fix the build with Qt 5.8.0 + +WindowCancelButtonHint and WindowOkButtonHint were removed in qt5 qtbase +commit 2be25273e1fc81c5a9e5124f1444100bdb3d458a. + +Signed-off-by: Andreas Naumann <[email protected]> + + +Index: python-pyqt5-5.7/QtCore/sipQtCoreQt.cpp +=================================================================== +--- python-pyqt5-5.7.orig/QtCore/sipQtCoreQt.cpp 2016-12-20 14:53:14.240498721 +0100 ++++ python-pyqt5-5.7/QtCore/sipQtCoreQt.cpp 2016-12-20 15:01:28.604481049 +0100 +@@ -1090,7 +1090,6 @@ + {sipName_WindingFill, static_cast<int>(Qt::WindingFill), 345}, + {sipName_Window, static_cast<int>(Qt::Window), 418}, + {sipName_WindowActive, static_cast<int>(Qt::WindowActive), 416}, +- {sipName_WindowCancelButtonHint, static_cast<int>(Qt::WindowCancelButtonHint), 418}, + {sipName_WindowCloseButtonHint, static_cast<int>(Qt::WindowCloseButtonHint), 418}, + {sipName_WindowContextHelpButtonHint, static_cast<int>(Qt::WindowContextHelpButtonHint), 418}, + {sipName_WindowDoesNotAcceptFocus, static_cast<int>(Qt::WindowDoesNotAcceptFocus), 418}, +@@ -1103,7 +1102,6 @@ + {sipName_WindowMinimized, static_cast<int>(Qt::WindowMinimized), 416}, + {sipName_WindowModal, static_cast<int>(Qt::WindowModal), 415}, + {sipName_WindowNoState, static_cast<int>(Qt::WindowNoState), 416}, +- {sipName_WindowOkButtonHint, static_cast<int>(Qt::WindowOkButtonHint), 418}, + {sipName_WindowOverridesSystemGestures, static_cast<int>(Qt::WindowOverridesSystemGestures), 418}, + {sipName_WindowShadeButtonHint, static_cast<int>(Qt::WindowShadeButtonHint), 418}, + {sipName_WindowShortcut, static_cast<int>(Qt::WindowShortcut), 391},
Signature · 1 line
1.9.1
PATCH v5 10/10 python-pyqt5: Fix for Qt 5.8.0
Dear Andreas,
pls see my comment below
Quoted 68 lines · Andreas Naumann
Just follow https://code.qt.io/cgit/qt/qtbase.git/commit/?id=2be25273e1fc81c5a9e5124f1444100bdb3d458a
Signed-off-by Andreas Naumann <[email protected]>--- package/python-pyqt5/0002-fix-qt-5.6.2.patch | 28 ------------------------- package/python-pyqt5/0002-fix-qt5.8-build.patch | 28 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 package/python-pyqt5/0002-fix-qt-5.6.2.patch create mode 100644 package/python-pyqt5/0002-fix-qt5.8-build.patchpackage/python-pyqt5/0002-fix-qt-5.6.2.patch deleted +0
-28@@ -1,28 +0,0 @@ -Fix the build with Qt 5.6.2 - -Building PyQt 5.7 with versions of Qt older than Qt 5.7 is supposed to -work, but currently fails in practice. In fact, this is due to the -fact that the %Timeline variable in QtCoremod.sip didn't contain the -5.6.2 Qt version, so if this version was used, PyQt was assuming it -was the later version 5.7, and therefore started enabling APIs only -available in Qt 5.7, causing build failures when building against Qt -5.6.2. - -Adding Qt_5_6_2 to the timeline fixes this problem. This fix was -suggested by Phil Thompson <[email protected]>. - -Signed-off-by: Thomas Petazzoni <[email protected]> - -Index: PyQt5_gpl-5.7/sip/QtCore/QtCoremod.sip -=================================================================== ---- PyQt5_gpl-5.7.orig/sip/QtCore/QtCoremod.sip 2016-07-25 15:55:37.000000000 +0200 -+++ PyQt5_gpl-5.7/sip/QtCore/QtCoremod.sip 2016-10-26 15:45:43.577153825 +0200 -@@ -22,7 +22,7 @@ - - %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", version=1) - --%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_7_0} -+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_7_0} - - %Platforms {WS_X11 WS_WIN WS_MACX} -package/python-pyqt5/0002-fix-qt5.8-build.patch new file +18
-0@@ -0,0 +1,28 @@ +Fix the build with Qt 5.8.0 + +WindowCancelButtonHint and WindowOkButtonHint were removed in qt5 qtbase +commit 2be25273e1fc81c5a9e5124f1444100bdb3d458a. + +Signed-off-by: Andreas Naumann <[email protected]> + + +Index: python-pyqt5-5.7/QtCore/sipQtCoreQt.cpp +=================================================================== +--- python-pyqt5-5.7.orig/QtCore/sipQtCoreQt.cpp 2016-12-20 14:53:14.240498721 +0100 ++++ python-pyqt5-5.7/QtCore/sipQtCoreQt.cpp 2016-12-20 15:01:28.604481049 +0100 +@@ -1090,7 +1090,6 @@ + {sipName_WindingFill, static_cast<int>(Qt::WindingFill), 345}, + {sipName_Window, static_cast<int>(Qt::Window), 418}, + {sipName_WindowActive, static_cast<int>(Qt::WindowActive), 416}, +- {sipName_WindowCancelButtonHint, static_cast<int>(Qt::WindowCancelButtonHint), 418}, + {sipName_WindowCloseButtonHint, static_cast<int>(Qt::WindowCloseButtonHint), 418},
package/python-pyqt5/0002-fix-qt5.8-build.patch line 28
Quoted 10 lines
package/python-pyqt5/0002-fix-qt5.8-build.patch new file +10
-0+ {sipName_WindowContextHelpButtonHint, static_cast<int>(Qt::WindowContextHelpButtonHint), 418}, + {sipName_WindowDoesNotAcceptFocus, static_cast<int>(Qt::WindowDoesNotAcceptFocus), 418}, +@@ -1103,7 +1102,6 @@ + {sipName_WindowMinimized, static_cast<int>(Qt::WindowMinimized), 416}, + {sipName_WindowModal, static_cast<int>(Qt::WindowModal), 415}, + {sipName_WindowNoState, static_cast<int>(Qt::WindowNoState), 416}, +- {sipName_WindowOkButtonHint, static_cast<int>(Qt::WindowOkButtonHint), 418}, + {sipName_WindowOverridesSystemGestures, static_cast<int>(Qt::WindowOverridesSystemGestures), 418}, + {sipName_WindowShadeButtonHint, static_cast<int>(Qt::WindowShadeButtonHint), 418}, + {sipName_WindowShortcut, static_cast<int>(Qt::WindowShortcut), 391},
This seems to be bogus, the 0002-fix-qt5.8-build.patch tries to patch the QtCore/sipQtCoreQt.cpp file, which is generated by SIP, so it's not available during the patching phase directly after extracting. What was your intention here?
Wouldn't be enough just to remove those 2 members from the qnamespace.sip file? (I'm totally new to sip, that's why i'm asking ;)
Thanks in advance, regards
Zoltan Gyarmati
https://zgyarmati.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20170130/07ebd55d/attachment.asc>