Qt5 bump to 5.6.0 version

PATCH New Julien Corjon 4 participants 16 messages Mar 17, 2016 – Mar 26, 2016 Arm/Allwinner sunXi SoC support

lore

Share & tools

lore

Julien Corjon

author

2016-03-17 09:42 UTC #0 lore raw

cover Qt5 bump to 5.6.0 version

Qt-5.6.0 have been released yesterday and drop the support of Qt5Webkit and Qt5Quick1.

All packages changed in this series have been compiled with:
- raspberry_defconfig + rpi_userland (brcm backend)
- firefly_rk3288_demo_defconfig + sunxi-mali (mali backend)
- own imx6q defconfig + imx-gpu-viv (vivante backend)

More info on the release:
- http://blog.qt.io/blog/2016/03/16/qt-5-6-released/
- http://blog.qt.io/blog/2015/11/17/embedded-linux-news-in-qt-5-6/

Regards

Julien Corjon (5):
package/qt5quick1: remove obsolete package package/qt5webkit: remove obsolete package package/qt5webkit-examples: remove obsolete package
qt5: bump version to 5.6.0
qt5: add GPLv3 and GFDLv1.3 licensing informations

 package/qt5/Config.in                              |   3 -
 package/qt5/qt5.mk                                 |   4 +-
 package/qt5/qt53d/qt53d.hash                       |   4 +-
 package/qt5/qt53d/qt53d.mk                         |   4 +-
 .../qt5/qt5base/0001-Force_egl_visual_ID_33.patch  |  27 -----
 package/qt5/qt5base/0003-xcb-egl-fixes.patch       |  82 ----------------
 .../0005-forkd-disable-eventfd-for-uclibc.patch    |  32 ------
 .../qt5base/0009-fix-eglfs-for-sunxi-mali.patch    | 109 ---------------------
 ...Invert-conditional-for-defining-QT_SOCKLE.patch |  40 --------
 package/qt5/qt5base/qt5base.hash                   |   4 +-
 package/qt5/qt5base/qt5base.mk                     |   8 +-
 package/qt5/qt5connectivity/qt5connectivity.hash   |   4 +-
 package/qt5/qt5connectivity/qt5connectivity.mk     |   4 +-
 package/qt5/qt5declarative/qt5declarative.hash     |   4 +-
 package/qt5/qt5declarative/qt5declarative.mk       |   4 +-
 package/qt5/qt5enginio/qt5enginio.hash             |   4 +-
 package/qt5/qt5enginio/qt5enginio.mk               |   8 +-
 .../qt5graphicaleffects/qt5graphicaleffects.hash   |   4 +-
 .../qt5/qt5graphicaleffects/qt5graphicaleffects.mk |   4 +-
 package/qt5/qt5imageformats/qt5imageformats.hash   |   4 +-
 package/qt5/qt5imageformats/qt5imageformats.mk     |   4 +-
 package/qt5/qt5multimedia/qt5multimedia.hash       |   4 +-
 package/qt5/qt5multimedia/qt5multimedia.mk         |   4 +-
 package/qt5/qt5quick1/Config.in                    |  26 -----
 package/qt5/qt5quick1/qt5quick1.hash               |   2 -
 package/qt5/qt5quick1/qt5quick1.mk                 |  41 --------
 package/qt5/qt5quickcontrols/qt5quickcontrols.hash |   4 +-
 package/qt5/qt5quickcontrols/qt5quickcontrols.mk   |   4 +-
 package/qt5/qt5script/qt5script.hash               |   4 +-
 package/qt5/qt5script/qt5script.mk                 |   4 +-
 package/qt5/qt5sensors/qt5sensors.hash             |   4 +-
 package/qt5/qt5sensors/qt5sensors.mk               |   4 +-
 package/qt5/qt5serialport/qt5serialport.hash       |   4 +-
 package/qt5/qt5serialport/qt5serialport.mk         |   4 +-
 package/qt5/qt5svg/qt5svg.hash                     |   4 +-
 package/qt5/qt5svg/qt5svg.mk                       |   4 +-
 package/qt5/qt5tools/qt5tools.hash                 |   4 +-
 package/qt5/qt5tools/qt5tools.mk                   |   4 +-
 .../0001-Fix-builds-without-qml-module.patch       |  61 ------------
 package/qt5/qt5webchannel/qt5webchannel.hash       |   4 +-
 package/qt5/qt5webchannel/qt5webchannel.mk         |   4 +-
 package/qt5/qt5webkit-examples/0001-build.patch    |  30 ------
 package/qt5/qt5webkit-examples/Config.in           |  14 ---
 .../qt5/qt5webkit-examples/qt5webkit-examples.hash |   2 -
 .../qt5/qt5webkit-examples/qt5webkit-examples.mk   |  50 ----------
 package/qt5/qt5webkit/Config.in                    |  23 -----
 package/qt5/qt5webkit/qt5webkit.hash               |   2 -
 package/qt5/qt5webkit/qt5webkit.mk                 |  58 -----------
 package/qt5/qt5websockets/qt5websockets.hash       |   4 +-
 package/qt5/qt5websockets/qt5websockets.mk         |   4 +-
 package/qt5/qt5x11extras/qt5x11extras.hash         |   4 +-
 package/qt5/qt5x11extras/qt5x11extras.mk           |   4 +-
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash     |   4 +-
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk       |   4 +-
 54 files changed, 77 insertions(+), 681 deletions(-)
 delete mode 100644 package/qt5/qt5base/0001-Force_egl_visual_ID_33.patch
 delete mode 100644 package/qt5/qt5base/0003-xcb-egl-fixes.patch
 delete mode 100644 package/qt5/qt5base/0005-forkd-disable-eventfd-for-uclibc.patch
 delete mode 100644 package/qt5/qt5base/0009-fix-eglfs-for-sunxi-mali.patch
 delete mode 100644 package/qt5/qt5base/0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
 delete mode 100644 package/qt5/qt5quick1/Config.in
 delete mode 100644 package/qt5/qt5quick1/qt5quick1.hash
 delete mode 100644 package/qt5/qt5quick1/qt5quick1.mk
 delete mode 100644 package/qt5/qt5webchannel/0001-Fix-builds-without-qml-module.patch
 delete mode 100644 package/qt5/qt5webkit-examples/0001-build.patch
 delete mode 100644 package/qt5/qt5webkit-examples/Config.in
 delete mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.hash
 delete mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.mk
 delete mode 100644 package/qt5/qt5webkit/Config.in
 delete mode 100644 package/qt5/qt5webkit/qt5webkit.hash
 delete mode 100644 package/qt5/qt5webkit/qt5webkit.mk

Signature · 1 line

2.5.0

Julien Corjon

author

2016-03-17 09:42 UTC #1 lore raw

PATCH 1/5 package/qt5quick1: remove obsolete package

Signed-off-by Julien Corjon <[email protected]>

---
 package/qt5/Config.in                |  1 -
 package/qt5/qt5quick1/Config.in      | 26 -----------------------
 package/qt5/qt5quick1/qt5quick1.hash |  2 --
 package/qt5/qt5quick1/qt5quick1.mk   | 41 ------------------------------------
 4 files changed, 70 deletions(-)
 delete mode 100644 package/qt5/qt5quick1/Config.in
 delete mode 100644 package/qt5/qt5quick1/qt5quick1.hash
 delete mode 100644 package/qt5/qt5quick1/qt5quick1.mk

package/qt5/Config.in +0 -1

index 1c42102..32de7a0 100644
@@ -48,7 +48,6 @@ source "package/qt5/qt5websockets/Config.in"
 source "package/qt5/qt5x11extras/Config.in"
 source "package/qt5/qt5xmlpatterns/Config.in"
 comment "legacy compatibility"
-source "package/qt5/qt5quick1/Config.in"
 source "package/qt5/qt5script/Config.in"
 source "package/qt5/qt5webkit/Config.in"
 source "package/qt5/qt5webkit-examples/Config.in"

package/qt5/qt5quick1/Config.in deleted +0 ~~-26~~

deleted file mode 100644
index 345ffae..0000000
@@ -1,26 +0,0 @@
-config BR2_PACKAGE_QT5QUICK1
-	bool "qt5quick1"
-	select BR2_PACKAGE_QT5BASE
-	select BR2_PACKAGE_QT5BASE_GUI
-	select BR2_PACKAGE_QT5BASE_NETWORK
-	select BR2_PACKAGE_QT5BASE_WIDGETS
-	select BR2_PACKAGE_QT5SCRIPT
-	select BR2_PACKAGE_QT5XMLPATTERNS
-	# This module does not support static linking
-	depends on !BR2_STATIC_LIBS
-	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
-	help
-	  Qt is a cross-platform application and UI framework for
-	  developers using C++.
-
-	  This package corresponds to the qt5quick1 module.
-
-	  This package has been tagged as deprecated since version
-	  5.5.0 and should be replaced by Qt Quick module in new
-	  design.
-
-	  http://qt.io
-
-comment "qt5quick1 needs a toolchain w/ dynamic library"
-	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
-	depends on BR2_STATIC_LIBS

package/qt5/qt5quick1/qt5quick1.hash deleted +0 -2

deleted file mode 100644
index 845742c..0000000
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtquick1-opensource-src-5.5.1.tar.xz.mirrorlist
-sha256 c812a7e59a8b9f0a87693181059933e15fef04bc875b6486cd653be1b9b51f2c qtquick1-opensource-src-5.5.1.tar.xz

package/qt5/qt5quick1/qt5quick1.mk deleted +0 ~~-41~~

41 lines not on this page · raw message

Signature · 1 line

2.5.0

Peter Seiderer

2016-03-18 09:49 UTC #2 lore raw

PATCH 1/5 package/qt5quick1: remove obsolete package

Hello Julien,

quick reaction on the Qt release ;-), the only missing part is the Config.in.legacy entry, e.g.:

Config.in.legacy +8 -0

@@ -143,6 +143,14 @@ comment "----------------------------------------------------"
 endif
 
 ###############################################################################
+comment "Legacy options removed in 2016.05"
+
+config BR2_PACKAGE_QT5QUICK1
+       bool qt5quick1 support option has been removed
+       select BR2_LEGACY
+       help
+         Qt qtquick1 submodule removed since Qt 5.6.
+

With this your can add my

Reviewed-by Peter Seiderer <[email protected]>

Regards,
Peter

Quoted 110 lines · Julien Corjon

Signed-off-by Julien Corjon <[email protected]>

---
 package/qt5/Config.in                |  1 -
 package/qt5/qt5quick1/Config.in      | 26 -----------------------
 package/qt5/qt5quick1/qt5quick1.hash |  2 --
 package/qt5/qt5quick1/qt5quick1.mk   | 41 ------------------------------------
 4 files changed, 70 deletions(-)
 delete mode 100644 package/qt5/qt5quick1/Config.in
 delete mode 100644 package/qt5/qt5quick1/qt5quick1.hash
 delete mode 100644 package/qt5/qt5quick1/qt5quick1.mk

package/qt5/Config.in +0 -1

index 1c42102..32de7a0 100644
@@ -48,7 +48,6 @@ source "package/qt5/qt5websockets/Config.in"
 source "package/qt5/qt5x11extras/Config.in"
 source "package/qt5/qt5xmlpatterns/Config.in"
 comment "legacy compatibility"
-source "package/qt5/qt5quick1/Config.in"
 source "package/qt5/qt5script/Config.in"
 source "package/qt5/qt5webkit/Config.in"
 source "package/qt5/qt5webkit-examples/Config.in"

package/qt5/qt5quick1/Config.in deleted +0 ~~-26~~

deleted file mode 100644
index 345ffae..0000000
@@ -1,26 +0,0 @@
-config BR2_PACKAGE_QT5QUICK1
-	bool "qt5quick1"
-	select BR2_PACKAGE_QT5BASE
-	select BR2_PACKAGE_QT5BASE_GUI
-	select BR2_PACKAGE_QT5BASE_NETWORK
-	select BR2_PACKAGE_QT5BASE_WIDGETS
-	select BR2_PACKAGE_QT5SCRIPT
-	select BR2_PACKAGE_QT5XMLPATTERNS
-	# This module does not support static linking
-	depends on !BR2_STATIC_LIBS
-	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
-	help
-	  Qt is a cross-platform application and UI framework for
-	  developers using C++.
-
-	  This package corresponds to the qt5quick1 module.
-
-	  This package has been tagged as deprecated since version
-	  5.5.0 and should be replaced by Qt Quick module in new
-	  design.
-
-	  http://qt.io
-
-comment "qt5quick1 needs a toolchain w/ dynamic library"
-	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
-	depends on BR2_STATIC_LIBS

package/qt5/qt5quick1/qt5quick1.hash deleted +0 -2

deleted file mode 100644
index 845742c..0000000
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtquick1-opensource-src-5.5.1.tar.xz.mirrorlist
-sha256 c812a7e59a8b9f0a87693181059933e15fef04bc875b6486cd653be1b9b51f2c qtquick1-opensource-src-5.5.1.tar.xz

package/qt5/qt5quick1/qt5quick1.mk deleted +0 ~~-41~~

deleted file mode 100644
index 7ccf644..0000000
@@ -1,41 +0,0 @@
-################################################################################
-#
-# qt5quick1
-#
-################################################################################
-
-QT5QUICK1_VERSION = $(QT5_VERSION)
-QT5QUICK1_SITE = $(QT5_SITE)
-QT5QUICK1_SOURCE = qtquick1-opensource-src-$(QT5QUICK1_VERSION).tar.xz
-QT5QUICK1_DEPENDENCIES = qt5base qt5xmlpatterns qt5script \
-	$(if $(BR2_PACKAGE_QT5WEBKIT),qt5webkit)
-QT5QUICK1_INSTALL_STAGING = YES
-
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5QUICK1_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
-QT5QUICK1_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2
-else
-QT5QUICK1_LICENSE = Commercial license
-QT5QUICK1_REDISTRIBUTE = NO
-endif
-
-define QT5QUICK1_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
-endef
-
-define QT5QUICK1_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
-endef
-
-define QT5QUICK1_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
-	$(QT5_LA_PRL_FILES_FIXUP)
-endef
-
-define QT5QUICK1_INSTALL_TARGET_CMDS
-	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Declarative.so.* $(TARGET_DIR)/usr/lib
-	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml1tooling $(TARGET_DIR)/usr/lib/qt/plugins/
-	cp -dpfr $(STAGING_DIR)/usr/imports $(TARGET_DIR)/usr
-endef
-
-$(eval $(generic-package))

Thomas Petazzoni

2016-03-20 22:32 UTC #3 lore raw

PATCH 1/5 package/qt5quick1: remove obsolete package

In reply to Julien Corjon

Hello,

Quoted 10 lines · Julien Corjon

Signed-off-by Julien Corjon <[email protected]>

---
 package/qt5/Config.in                |  1 -
 package/qt5/qt5quick1/Config.in      | 26 -----------------------
 package/qt5/qt5quick1/qt5quick1.hash |  2 --
 package/qt5/qt5quick1/qt5quick1.mk   | 41 ------------------------------------
 4 files changed, 70 deletions(-)
 delete mode 100644 package/qt5/qt5quick1/Config.in
 delete mode 100644 package/qt5/qt5quick1/qt5quick1.hash
 delete mode 100644 package/qt5/qt5quick1/qt5quick1.mk

Applied patches 1, 2 and 3, after adding the removed options to Config.in.legacy, as noticed by Peter Seiderer.

Thanks,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Julien Corjon

author

2016-03-17 09:42 UTC #4 lore raw

PATCH 2/5 package/qt5webkit: remove obsolete package

In reply to Julien Corjon

Signed-off-by Julien Corjon <[email protected]>

---
 package/qt5/Config.in                |  1 -
 package/qt5/qt5webkit/Config.in      | 23 --------------
 package/qt5/qt5webkit/qt5webkit.hash |  2 --
 package/qt5/qt5webkit/qt5webkit.mk   | 58 ------------------------------------
 4 files changed, 84 deletions(-)
 delete mode 100644 package/qt5/qt5webkit/Config.in
 delete mode 100644 package/qt5/qt5webkit/qt5webkit.hash
 delete mode 100644 package/qt5/qt5webkit/qt5webkit.mk

package/qt5/Config.in +0 -1

index 32de7a0..95d3ab9 100644
@@ -49,6 +49,5 @@ source "package/qt5/qt5x11extras/Config.in"
 source "package/qt5/qt5xmlpatterns/Config.in"
 comment "legacy compatibility"
 source "package/qt5/qt5script/Config.in"
-source "package/qt5/qt5webkit/Config.in"
 source "package/qt5/qt5webkit-examples/Config.in"
 endif

package/qt5/qt5webkit/Config.in deleted +0 ~~-23~~

deleted file mode 100644
index 96d97cc..0000000
@@ -1,23 +0,0 @@
-config BR2_PACKAGE_QT5WEBKIT
-	bool "qt5webkit"
-	select BR2_PACKAGE_QT5BASE
-	select BR2_PACKAGE_QT5BASE_ICU
-	select BR2_PACKAGE_QT5BASE_GUI
-	select BR2_PACKAGE_SQLITE
-	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB
-	select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_QT5BASE_XCB
-	# This module does not support static linking
-	depends on !BR2_STATIC_LIBS
-	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
-	depends on !BR2_BINFMT_FLAT # icu
-	help
-	  Qt is a cross-platform application and UI framework for
-	  developers using C++.
-
-	  This package corresponds to the qt5webkit module.
-
-	  This package has been tagged as deprecated since version
-	  5.5.0 and should be replaced by Qt WebEngine module in
-	  new design.
-
-	  http://qt.io

package/qt5/qt5webkit/qt5webkit.hash deleted +0 -2

deleted file mode 100644
index 8517223..0000000
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwebkit-opensource-src-5.5.1.tar.xz.mirrorlist
-sha256 77583f9dbd3e6ad874386df71b165dc3ce88efdabbc6e5d97a959ee2187d6d69 qtwebkit-opensource-src-5.5.1.tar.xz

package/qt5/qt5webkit/qt5webkit.mk deleted +0 ~~-58~~

58 lines not on this page · raw message

Signature · 1 line

2.5.0

Gary Bisson

2016-03-21 15:56 UTC #5 lore raw

PATCH 2/5 package/qt5webkit: remove obsolete package

Julien, All,

Quoted 11 lines · Julien Corjon

Signed-off-by Julien Corjon <[email protected]>

---
 package/qt5/Config.in                |  1 -
 package/qt5/qt5webkit/Config.in      | 23 --------------
 package/qt5/qt5webkit/qt5webkit.hash |  2 --
 package/qt5/qt5webkit/qt5webkit.mk   | 58 ------------------------------------
 4 files changed, 84 deletions(-)
 delete mode 100644 package/qt5/qt5webkit/Config.in
 delete mode 100644 package/qt5/qt5webkit/qt5webkit.hash
 delete mode 100644 package/qt5/qt5webkit/qt5webkit.mk

Are we sure we want to remove this package actually? The release says:
"With Qt 5.6 the following modules are no longer part of the release packages, but users can still build them from source:
- Qt WebKit
- Qt Declarative (Qt Quick 1)"

But the project has a qt5.6.0 branch just like the other modules:
https://github.com/qtproject/qtwebkit/commits/5.6.0

Especially since we don't have any replacement I wouldn't merge this patch just yet. Plus webkit can run on a platform without GPU whereas WebEngine depends on OpenGL, I wouldn't mind keeping it, for i.MX7 platforms for instance.

The package would need to be modified to use the github project instead of the release archives though.

Let me know your thoughts.

Regards,
Gary

Julien CORJON

author

2016-03-22 09:52 UTC #6 lore raw

PATCH 2/5 package/qt5webkit: remove obsolete package

Gary, All,

Le 21/03/2016 16:56, Gary Bisson a ?crit :

Quoted 15 lines

Julien, All,
Quoted 11 lines · Julien Corjon
Signed-off-by Julien Corjon <[email protected]>
---
  package/qt5/Config.in                |  1 -
  package/qt5/qt5webkit/Config.in      | 23 --------------
  package/qt5/qt5webkit/qt5webkit.hash |  2 --
  package/qt5/qt5webkit/qt5webkit.mk   | 58 ------------------------------------
  4 files changed, 84 deletions(-)
delete mode 100644 package/qt5/qt5webkit/Config.in delete mode 100644 package/qt5/qt5webkit/qt5webkit.hash delete mode 100644 package/qt5/qt5webkit/qt5webkit.mk

Quoted 8 lines

Are we sure we want to remove this package actually? The release says:
"With Qt 5.6 the following modules are no longer part of the release packages, but users can still build them from source:
- Qt WebKit
- Qt Declarative (Qt Quick 1)"
But the project has a qt5.6.0 branch just like the other modules:
https://github.com/qtproject/qtwebkit/commits/5.6.0

You're almost right, the project have a 5.6 branch but 5.6.0 version has not been tagged on deprecated modules. If we want to keep those in buildroot we have now to "randomly" choose a commit.

Quoted 5 lines

Especially since we don't have any replacement I wouldn't merge this patch just yet. Plus webkit can run on a platform without GPU whereas WebEngine depends on OpenGL, I wouldn't mind keeping it, for i.MX7 platforms for instance.

I agree that platform without OpenGL support lose web browser ability from Qt and for that we should probably keep webkit in buildroot packages. But I'm not sure we should keep it in official Qt section since there not officially supported by Digia and Qt community.

Quoted 3 lines

The package would need to be modified to use the github project instead of the release archives though.

If we use Qt repository we should use the official one
(http://code.qt.io/cgit/qt/qtwebkit.git/) instead of github.

Quoted 6 lines

Let me know your thoughts.
Regards,
Gary

Regards,

Julien

Julien Corjon

author

2016-03-17 09:42 UTC #7 lore raw

PATCH 3/5 package/qt5webkit-examples: remove obsolete package

In reply to Julien Corjon

Signed-off-by Julien Corjon <[email protected]>

---
 package/qt5/Config.in                              |  1 -
 package/qt5/qt5webkit-examples/0001-build.patch    | 30 -------------
 package/qt5/qt5webkit-examples/Config.in           | 14 ------
 .../qt5/qt5webkit-examples/qt5webkit-examples.hash |  2 -
 .../qt5/qt5webkit-examples/qt5webkit-examples.mk   | 50 ----------------------
 5 files changed, 97 deletions(-)
 delete mode 100644 package/qt5/qt5webkit-examples/0001-build.patch
 delete mode 100644 package/qt5/qt5webkit-examples/Config.in
 delete mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.hash
 delete mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.mk

package/qt5/Config.in +0 -1

index 95d3ab9..f673daa 100644
@@ -49,5 +49,4 @@ source "package/qt5/qt5x11extras/Config.in"
 source "package/qt5/qt5xmlpatterns/Config.in"
 comment "legacy compatibility"
 source "package/qt5/qt5script/Config.in"
-source "package/qt5/qt5webkit-examples/Config.in"
 endif

package/qt5/qt5webkit-examples/0001-build.patch deleted +0 ~~-30~~

deleted file mode 100644
index 68964f0..0000000
@@ -1,30 +0,0 @@
-This patch improves the qt5webkit examples build for 2 aspects:
-
-# Allows to build even if qt5base examples are not enabled
-# Builds xmlpatterns example only if the qt5xmlpattern package has been built
-
-Signed-off-by: Massimo Callegari <[email protected]>
-
-Index: b/examples/webkitwidgets/webkitwidgets.pro
-===================================================================
---- /dev/null
-+++ b/examples/webkitwidgets/webkitwidgets.pro
-@@ -8,5 +8,6 @@
-             framecapture \
-             browser \
-             embedded \
--            scroller \
--            xmlpatterns
-+            scroller
-+
-+qtHaveModule(xmlpatterns): SUBDIRS += xmlpatterns
-Index: b/qtwebkit-examples.pro
-===================================================================
---- /dev/null
-+++ b/qtwebkit-examples.pro
-@@ -3,3 +3,4 @@
- load(qt_parts)
- 
- SUBDIRS += doc
-+SUBDIRS += examples
-

package/qt5/qt5webkit-examples/Config.in deleted +0 ~~-14~~

deleted file mode 100644
index 3f9c243..0000000
@@ -1,14 +0,0 @@
-config BR2_PACKAGE_QT5WEBKIT_EXAMPLES
-	bool "qt5webkit examples"
-	depends on BR2_PACKAGE_QT5WEBKIT
-	help
-	  Qt is a cross-platform application and UI framework for
-	  developers using C++.
-
-	  This package contains examples for the qt5webkit module.
-
-	  This package has been tagged as deprecated since version
-	  5.5.0 and should be replaced by Qt WebEngine module in
-	  new design.
-
-	  http://qt.io

package/qt5/qt5webkit-examples/qt5webkit-examples.hash deleted +0 -2

deleted file mode 100644
index b28e0da..0000000
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwebkit-examples-opensource-src-5.5.1.tar.xz.mirrorlist
-sha256 098935b42d6d249027d1a635e4e70edc3d2969dd860f825b36aec06fc72e46c6 qtwebkit-examples-opensource-src-5.5.1.tar.xz

package/qt5/qt5webkit-examples/qt5webkit-examples.mk deleted +0 ~~-50~~

50 lines not on this page · raw message

Signature · 1 line

2.5.0

Julien Corjon

author

2016-03-17 09:42 UTC #8 lore raw

PATCH 4/5 qt5: bump version to 5.6.0

In reply to Julien Corjon

Remove upstream committed patches (qt5base):
- 0001-Force_egl_visual_ID_33.patch (see [1], [2])
- 0003-xcb-egl-fixes.patch (see [3])
- 0005-forkd-disable-eventfd-for-uclibc.patch (see [4], [5])
- 0009-fix-eglfs-for-sunxi-mali.patch (see [6])
- 0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch (see [7])

Remove MX6_WORKAROUND from qt5base.mk since we do not need to tweak EGL visual ID to 33.

Remove upstream committed patch (qt5webchannel):
- 0001-Fix-builds-without-qml-module.patch (see [8], [9])

Fix Qt5Enginio to 1.6.0 version (see [10])

[1] https://bugreports.qt.io/browse/QTBUG-44290
[2] https://codereview.qt-project.org/#/c/108849/
[3] https://codereview.qt-project.org/#/c/115438/
[4] https://bugreports.qt.io/browse/QTBUG-47337
[5] https://codereview.qt-project.org/#/c/121988/
[6] https://codereview.qt-project.org/#/c/125837/
[7] https://codereview.qt-project.org/#/c/126725/
[8] https://bugreports.qt.io/browse/QTBUG-47360
[9] https://codereview.qt-project.org/#/c/122086/
[10] https://bugreports.qt.io/browse/QTBUG-50111

Signed-off-by Julien Corjon <[email protected]>

---
 package/qt5/qt5.mk                                 |   4 +-
 package/qt5/qt53d/qt53d.hash                       |   4 +-
 .../qt5/qt5base/0001-Force_egl_visual_ID_33.patch  |  27 -----
 package/qt5/qt5base/0003-xcb-egl-fixes.patch       |  82 ----------------
 .../0005-forkd-disable-eventfd-for-uclibc.patch    |  32 ------
 .../qt5base/0009-fix-eglfs-for-sunxi-mali.patch    | 109 ---------------------
 ...Invert-conditional-for-defining-QT_SOCKLE.patch |  40 --------
 package/qt5/qt5base/qt5base.hash                   |   4 +-
 package/qt5/qt5base/qt5base.mk                     |   4 -
 package/qt5/qt5connectivity/qt5connectivity.hash   |   4 +-
 package/qt5/qt5declarative/qt5declarative.hash     |   4 +-
 package/qt5/qt5enginio/qt5enginio.hash             |   4 +-
 package/qt5/qt5enginio/qt5enginio.mk               |   4 +-
 .../qt5graphicaleffects/qt5graphicaleffects.hash   |   4 +-
 package/qt5/qt5imageformats/qt5imageformats.hash   |   4 +-
 package/qt5/qt5multimedia/qt5multimedia.hash       |   4 +-
 package/qt5/qt5quickcontrols/qt5quickcontrols.hash |   4 +-
 package/qt5/qt5script/qt5script.hash               |   4 +-
 package/qt5/qt5sensors/qt5sensors.hash             |   4 +-
 package/qt5/qt5serialport/qt5serialport.hash       |   4 +-
 package/qt5/qt5svg/qt5svg.hash                     |   4 +-
 package/qt5/qt5tools/qt5tools.hash                 |   4 +-
 .../0001-Fix-builds-without-qml-module.patch       |  61 ------------
 package/qt5/qt5webchannel/qt5webchannel.hash       |   4 +-
 package/qt5/qt5websockets/qt5websockets.hash       |   4 +-
 package/qt5/qt5x11extras/qt5x11extras.hash         |   4 +-
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash     |   4 +-
 27 files changed, 41 insertions(+), 394 deletions(-)
 delete mode 100644 package/qt5/qt5base/0001-Force_egl_visual_ID_33.patch
 delete mode 100644 package/qt5/qt5base/0003-xcb-egl-fixes.patch
 delete mode 100644 package/qt5/qt5base/0005-forkd-disable-eventfd-for-uclibc.patch
 delete mode 100644 package/qt5/qt5base/0009-fix-eglfs-for-sunxi-mali.patch
 delete mode 100644 package/qt5/qt5base/0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
 delete mode 100644 package/qt5/qt5webchannel/0001-Fix-builds-without-qml-module.patch

package/qt5/qt5.mk +2 -2

index bb33903..e43795f 100644
@@ -1,5 +1,5 @@
-QT5_VERSION_MAJOR = 5.5
-QT5_VERSION = $(QT5_VERSION_MAJOR).1
+QT5_VERSION_MAJOR = 5.6
+QT5_VERSION = $(QT5_VERSION_MAJOR).0
 QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules
 include $(sort $(wildcard package/qt5/*/*.mk))

package/qt5/qt53d/qt53d.hash +2 -2

index 8fbc42f..8d9a3d6 100644
@@ -1,2 +1,2 @@
-# Hash from http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qt3d-opensource-src-5.5.1.tar.xz.mirrorlist
-sha256 e380906e2bcbd825dab45043bf063dd88b793c0d5fb050ee915bf4e2b58b1bf7 qt3d-opensource-src-5.5.1.tar.xz
+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qt3d-opensource-src-5.6.0.tar.xz.mirrorlist
+sha256 b961789daecebed030ad36568301d1fe6c1ad97e9a2726fad5bd96ad603f439d qt3d-opensource-src-5.6.0.tar.xz

package/qt5/qt5base/0001-Force_egl_visual_ID_33.patch deleted +0 ~~-27~~

deleted file mode 100644
index c21775f..0000000
@@ -1,27 +0,0 @@
-Workaround EGL initialization failure due visual mismatch
-
-Error:
-
-Warning: EGL suggested using X Visual ID 33 (RGB888) for EGL config 28 (RGB444), but this is incompatable
-Unable to find an X11 visual which matches EGL config 28
-Could not initialize EGL
-Aborted
-
-Upstream-Status: Inappropriate [workaround]
-
-Signed-off-by: Otavio Salvador <[email protected]>
-Signed-off-by: J?r?me Pouiller <[email protected]>
-
-diff -Naur qtbase-opensource-src-5.1.1_original/src/platformsupport/eglconvenience/qxlibeglintegration.cpp qtbase-opensource-src-5.1.1/src/platformsupport/eglconvenience/qxlibeglintegration.cpp
---- qtbase-opensource-src-5.1.1_original/src/platformsupport/eglconvenience/qxlibeglintegration.cpp	2013-12-25 19:08:42.163895341 -0800
-+++ qtbase-opensource-src-5.1.1/src/platformsupport/eglconvenience/qxlibeglintegration.cpp	2013-12-25 19:09:37.207893799 -0800
-@@ -180,5 +180,9 @@
-     }
- 
-     qWarning("Unable to find an X11 visual which matches EGL config %d", configId);
-+#ifdef ENABLE_MX6_WORKAROUND
-+    return (VisualID)33;
-+#else
-     return (VisualID)0;
-+#endif
- }

package/qt5/qt5base/0003-xcb-egl-fixes.patch deleted +0 ~~-82~~

82 lines not on this page · raw message

package/qt5/qt5base/0005-forkd-disable-eventfd-for-uclibc.patch deleted +0 ~~-32~~

deleted file mode 100644
index 04d49dd..0000000
@@ -1,32 +0,0 @@
-From 62ef0d97cfa2ed0142fc69c6e6395a570bea9215 Mon Sep 17 00:00:00 2001
-From: Julien Corjon <[email protected]>
-Date: Tue, 21 Jul 2015 11:59:57 +0200
-Subject: [PATCH] forkd - disable eventfd for uClibc <= 0.9.33
-
-eventfd is not implemented in uClibc <= 0.9.33
-
-Upstream-Status : https://bugreports.qt.io/browse/QTBUG-47337
-
-Signed-off-by: Julien Corjon <[email protected]>
----
- src/3rdparty/forkfd/forkfd.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/3rdparty/forkfd/forkfd.c b/src/3rdparty/forkfd/forkfd.c
-index 8d08f40..fa47cdf 100644
---- a/src/3rdparty/forkfd/forkfd.c
-+++ b/src/3rdparty/forkfd/forkfd.c
-@@ -48,6 +48,10 @@
- #  if (defined(__GLIBC__) && (__GLIBC__ << 16) + __GLIBC_MINOR__ >= 0x209) || defined(__BIONIC__)
- #    define HAVE_PIPE2    1
- #  endif
-+#  if (defined(__UCLIBC__) && (__UCLIBC_MAJOR__ == 0) && (__UCLIBC_MINOR__ < 9 || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 33)))
-+#    undef HAVE_EVENTFD
-+#    undef HAVE_PIPE2
-+#  endif
- #endif
- 
- #if _POSIX_VERSION-0 >= 200809L || _XOPEN_VERSION-0 >= 500
--- 
-2.1.0
-

package/qt5/qt5base/0009-fix-eglfs-for-sunxi-mali.patch deleted +0 ~~-109~~

109 lines not on this page · raw message

package/qt5/qt5base/0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch deleted +0 ~~-40~~

deleted file mode 100644
index 97be739..0000000
@@ -1,40 +0,0 @@
-From 8f09897de948cea8861ca95e182f442cf15a339e Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Mon, 8 Jun 2015 13:59:25 -0700
-Subject: [PATCH] linux-oe-g++: Invert conditional for defining QT_SOCKLEN_T
-
-This helps to make sure that QT_SOCKLEN_T is defined to be 'int'
-only when its glibc < 2 and not also for the libraries which may define
-it as per standards but are not glibc, e.g. musl
-
-Signed-off-by: Khem Raj <[email protected]>
-[Bernd: Downloaded from
-https://github.com/meta-qt5/meta-qt5/blob/d9d1d04760430cd0e5edd1764d832860715e7b83/recipes-qt/qt5/qtbase/0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
-and adjusted path.]
-
-Signed-off-by: Bernd Kuhls <[email protected]>
----
- mkspecs/linux-oe-g++/qplatformdefs.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
-index dd12003..8623651 100644
---- a/mkspecs/linux-g++/qplatformdefs.h
-+++ b/mkspecs/linux-g++/qplatformdefs.h
-@@ -86,10 +86,10 @@
- 
- #undef QT_SOCKLEN_T
- 
--#if defined(__GLIBC__) && (__GLIBC__ >= 2)
--#define QT_SOCKLEN_T            socklen_t
--#else
-+#if defined(__GLIBC__) && (__GLIBC__ < 2)
- #define QT_SOCKLEN_T            int
-+#else
-+#define QT_SOCKLEN_T            socklen_t
- #endif
- 
- #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
--- 
-2.1.4
-

package/qt5/qt5base/qt5base.hash +2 -2

index ea831e9..934fb5d 100644
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz.mirrorlist
-sha256 dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916 qtbase-opensource-src-5.5.1.tar.xz
+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtbase-opensource-src-5.6.0.tar.xz.mirrorlist
+sha256 6efa8a5c559e92b2e526d48034e858023d5fd3c39115ac1bfd3bb65834dbd67a qtbase-opensource-src-5.6.0.tar.xz

package/qt5/qt5base/qt5base.mk +0 -4

index 6eeb619..b81383b 100644
@@ -111,10 +111,6 @@ endif
 QT5BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT5BASE_DEFAULT_QPA))
 QT5BASE_CONFIGURE_OPTS += $(if $(QT5BASE_DEFAULT_QPA),-qpa $(QT5BASE_DEFAULT_QPA))
 
-ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y)
-QT5BASE_EXTRA_CFLAGS = -DENABLE_MX6_WORKAROUND
-endif
-
 ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y)
 QT5BASE_CONFIGURE_OPTS += -eglfs
 QT5BASE_DEPENDENCIES   += libegl

package/qt5/qt5connectivity/qt5connectivity.hash +2 -2

index 058ba31..a8676a9 100644
@@ -1,2 +1,2 @@
-# Hashe from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtconnectivity-opensource-src-5.5.1.tar.xz.mirrorlist
-sha256 3637e6def8582fc0fb3684179b93650720ba2da1311a560d358296153f245023 qtconnectivity-opensource-src-5.5.1.tar.xz
+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtconnectivity-opensource-src-5.6.0.tar.xz.mirrorlist
+sha256 0c5cb0c100006759b6954a36e7dc66f8f1ac2b61b3f639152cf6ecb8d48a40eb qtconnectivity-opensource-src-5.6.0.tar.xz

package/qt5/qt5declarative/qt5declarative.hash +2 -2

index f32b037..830e18f 100644
@@ -1,2 +1,2 @@
-# Hashe from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtdeclarative-opensource-src-5.5.1.tar.xz.mirrorlist
-sha256 5fd14eefb83fff36fb17681693a70868f6aaf6138603d799c16466a094b26791 qtdeclarative-opensource-src-5.5.1.tar.xz
+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtdeclarative-opensource-src-5.6.0.tar.xz.mirrorlist
+sha256 8c55f053f0e348577b56da541af74d02d0f2b61c9a6c15152b03dad03dfde04c qtdeclarative-opensource-src-5.6.0.tar.xz

package/qt5/qt5enginio/qt5enginio.hash +2 -2

index 6f5f626..3f66ee0 100644
@@ -1,2 +1,2 @@
-# Hashe from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtenginio-opensource-src-5.5.1.tar.xz.mirrorlist
-sha256 a79936bd5b6a35aba28dd282291b28c8fa869b8d86652c62efe5e268d94defe2 qtenginio-opensource-src-5.5.1.tar.xz
+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtenginio-opensource-src-1.6.0.tar.xz.mirrorlist
+sha256 627ddcfbbfc3ec1a83c9dbb5f24287b5cd6cb5d3b9d09af4d1c444c6ac147f0c qtenginio-opensource-src-1.6.0.tar.xz

package/qt5/qt5enginio/qt5enginio.mk +3 -1

index 2a6aa3c..b6a534c 100644
@@ -4,7 +4,9 @@
 #
 ################################################################################
 
-QT5ENGINIO_VERSION = $(QT5_VERSION)
+# Qt5Enginio does not follow Qt versionning
+# see https://bugreports.qt.io/browse/QTBUG-50111
+QT5ENGINIO_VERSION = 1.6.0
 QT5ENGINIO_SITE = $(QT5_SITE)
 QT5ENGINIO_SOURCE = qtenginio-opensource-src-$(QT5ENGINIO_VERSION).tar.xz
 QT5ENGINIO_DEPENDENCIES = openssl qt5base

package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +2 -2

index 959230f..847458e 100644
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtgraphicaleffects-opensource-src-5.5.1.tar.xz.mirrorlist
-sha256 9bca0f8db3a4289eceebfa9504915440fe3fa6301d90b65705e4ece528c12d47 qtgraphicaleffects-opensource-src-5.5.1.tar.xz
+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtgraphicaleffects-opensource-src-5.6.0.tar.xz.mirrorlist
+sha256 01e911fdcf85a13b927cba341d15a0baeead3eba85c4532b1b45bb5c334416e8 qtgraphicaleffects-opensource-src-5.6.0.tar.xz

package/qt5/qt5imageformats/qt5imageformats.hash +2 -2

index c392abf..05b8cbc 100644
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtimageformats-opensource-src-5.5.1.tar.xz.mirrorlist
-sha256 c97fee00c602f9f089fea480546d6e9d61a2b2297c2f163bfd9f8aba92b754a5 qtimageformats-opensource-src-5.5.1.tar.xz
+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtimageformats-opensource-src-5.6.0.tar.xz.mirrorlist
+sha256 2c854275a689a513ba24f4266cc6017d76875336671c2c8801b4b7289081bada qtimageformats-opensource-src-5.6.0.tar.xz

package/qt5/qt5multimedia/qt5multimedia.hash +2 -2

index b4e1b68..f988666 100644
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtmultimedia-opensource-src-5.5.1.tar.xz.mirrorlist
-sha256 7cc7ca99f41587c188303670499e5c75101f9a8cb6178e8f29cc941e637d957f qtmultimedia-opensource-src-5.5.1.tar.xz
+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtmultimedia-opensource-src-5.6.0.tar.xz.mirrorlist
+sha256 103f99d6cd266f5c4485546a75ef0c6ee7e88dc901a0be21447cf89159370686 qtmultimedia-opensource-src-5.6.0.tar.xz

package/qt5/qt5quickcontrols/qt5quickcontrols.hash +2 -2

index 99dacb8..409efde 100644
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtquickcontrols-opensource-src-5.5.1.tar.xz.mirrorlist
-sha256 1b7a8389d656066c629bd2cb520b39a7eb041d184b567dd1b9639b88d841fcf0 qtquickcontrols-opensource-src-5.5.1.tar.xz
+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtquickcontrols-opensource-src-5.6.0.tar.xz.mirrorlist
+sha256 ec0896792f2a08d109ab3791aa4e47747aab22ebfad281005c4bf8f26f9f788b qtquickcontrols-opensource-src-5.6.0.tar.xz

package/qt5/qt5script/qt5script.hash +2 -2

index f2b1df8..cc32efc 100644
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtscript-opensource-src-5.5.1.tar.xz.mirrorlist
-sha256 cd46dddd998f22bcb06447e0407fef81f7052f25bc770b1c27625654cee828fd qtscript-opensource-src-5.5.1.tar.xz
+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtscript-opensource-src-5.6.0.tar.xz.mirrorlist
+sha256 ac7475197d9a0f3c7284f002390e2427fef84ec90dc590630431a848099c5042 qtscript-opensource-src-5.6.0.tar.xz

package/qt5/qt5sensors/qt5sensors.hash +2 -2

index 23559f6..4f23af0 100644
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtsensors-opensource-src-5.5.1.tar.xz.mirrorlist
-sha256 5d264fc0729a5d7679bd4eb8d7a0a9b142ed38d09fa68fc7dfe57f64afc8eeea qtsensors-opensource-src-5.5.1.tar.xz
+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtsensors-opensource-src-5.6.0.tar.xz.mirrorlist
+sha256 518f392fec5e01aaa7f95e9141678cc99b02ed067ebbd24c38c1420067c59c2e qtsensors-opensource-src-5.6.0.tar.xz

package/qt5/qt5serialport/qt5serialport.hash +2 -2

index db50145..f2f0fe9 100644
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtserialport-opensource-src-5.5.1.tar.xz.mirrorlist
-sha256 a034dbfb023db1b9b9de54390f7e76a48c1d1eb12533b0ffd574505c99968f7a qtserialport-opensource-src-5.5.1.tar.xz
+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtserialport-opensource-src-5.6.0.tar.xz.mirrorlist
+sha256 16ee7fb66bb997df674a12a7a5a1450e2a2b860c8d34d237f3631d9f60853c1f qtserialport-opensource-src-5.6.0.tar.xz

package/qt5/qt5svg/qt5svg.hash +2 -2

index afe98cf..56043cf 100644
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtsvg-opensource-src-5.5.1.tar.xz.mirrorlist
-sha256 f7f588be48befd9ccab5a6086832551b8899e8bed9e603ddea979581e05a91c7 qtsvg-opensource-src-5.5.1.tar.xz
+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtsvg-opensource-src-5.6.0.tar.xz.mirrorlist
+sha256 798799319138bb40b6187f4ecc1099956a0d62148f78512e9cb085d1fa5f641f qtsvg-opensource-src-5.6.0.tar.xz

package/qt5/qt5tools/qt5tools.hash +2 -2

index f54c94a..84be92d 100644
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz.mirrorlist
-sha256 4361f6ce49717058160908297841a18b94645cec593d1b48fb126c9d06c87bfd qttools-opensource-src-5.5.1.tar.xz
+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qttools-opensource-src-5.6.0.tar.xz.mirrorlist
+sha256 0d244c61bbe5505cb94310e980b06ef13dd573511e80ccbdc060f71d5462219d qttools-opensource-src-5.6.0.tar.xz

package/qt5/qt5webchannel/0001-Fix-builds-without-qml-module.patch deleted +0 ~~-61~~

61 lines not on this page · raw message

package/qt5/qt5webchannel/qt5webchannel.hash +2 -2

index c0ae89e..4f93cdb 100644
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwebchannel-opensource-src-5.5.1.tar.xz.mirrorlist
-sha256 7f4295ee57cd4ecba3cb263452d2a08d501b45c9a2b8b7794b6a97d7652f15d0 qtwebchannel-opensource-src-5.5.1.tar.xz
+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtwebchannel-opensource-src-5.6.0.tar.xz.mirrorlist
+sha256 c25424935e866e77f31e5ebc50fc97eaedd4d77f6e967bfc59ce7fa6a7b4c14f qtwebchannel-opensource-src-5.6.0.tar.xz

package/qt5/qt5websockets/qt5websockets.hash +2 -2

index 0bd4a5a..d803285 100644
@@ -1,2 +1,2 @@
-# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwebsockets-opensource-src-5.5.1.tar.xz.mirrorlist
-sha256 cf4e834a867b90337188be504ef20184c52666370f721e704952988f8cb12deb qtwebsockets-opensource-src-5.5.1.tar.xz
+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtwebsockets-opensource-src-5.6.0.tar.xz.mirrorlist
+sha256 268ab869fe3d0d22abd9668851155db79aff2f386bc448051b6ef477841d719f qtwebsockets-opensource-src-5.6.0.tar.xz

package/qt5/qt5x11extras/qt5x11extras.hash +2 -2

index d7c0ad0..5f5481e 100644
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtx11extras-opensource-src-5.5.1.tar.xz.mirrorlist
-sha256 6387a01d972b62e1ad39e5a25e07d0492200f62fc87cf4366122085aeeebeb65 qtx11extras-opensource-src-5.5.1.tar.xz
+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtx11extras-opensource-src-5.6.0.tar.xz.mirrorlist
+sha256 47ed768d02bc09edfa20332bc58c4188b9529235cdb616802ef775d6e7613425 qtx11extras-opensource-src-5.6.0.tar.xz

package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +2 -2

index e04a1a1..ffe2a40 100644
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtxmlpatterns-opensource-src-5.5.1.tar.xz.mirrorlist
-sha256 b537eb0252988e3805a32a16c65038973371d647baf246fdf703bde725d0e8ec qtxmlpatterns-opensource-src-5.5.1.tar.xz
+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtxmlpatterns-opensource-src-5.6.0.tar.xz.mirrorlist
+sha256 baed1b3bd3f010b8c4a96b4ca7a595b665d43d2e5758b55a364dbc9f2ac819d4 qtxmlpatterns-opensource-src-5.6.0.tar.xz

Signature · 1 line

2.5.0

Thomas Petazzoni

Applied

2016-03-20 22:32 UTC #9 lore raw

PATCH 4/5 qt5: bump version to 5.6.0

Hello,

Quoted 54 lines · Julien Corjon

Remove upstream committed patches (qt5base):
- 0001-Force_egl_visual_ID_33.patch (see [1], [2])
- 0003-xcb-egl-fixes.patch (see [3])
- 0005-forkd-disable-eventfd-for-uclibc.patch (see [4], [5])
- 0009-fix-eglfs-for-sunxi-mali.patch (see [6])
- 0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch (see [7])
Remove MX6_WORKAROUND from qt5base.mk since we do not need to tweak EGL visual ID to 33.
Remove upstream committed patch (qt5webchannel):
- 0001-Fix-builds-without-qml-module.patch (see [8], [9])
Fix Qt5Enginio to 1.6.0 version (see [10])
[1] https://bugreports.qt.io/browse/QTBUG-44290
[2] https://codereview.qt-project.org/#/c/108849/
[3] https://codereview.qt-project.org/#/c/115438/
[4] https://bugreports.qt.io/browse/QTBUG-47337
[5] https://codereview.qt-project.org/#/c/121988/
[6] https://codereview.qt-project.org/#/c/125837/
[7] https://codereview.qt-project.org/#/c/126725/
[8] https://bugreports.qt.io/browse/QTBUG-47360
[9] https://codereview.qt-project.org/#/c/122086/
[10] https://bugreports.qt.io/browse/QTBUG-50111
Signed-off-by Julien Corjon <[email protected]>
---
 package/qt5/qt5.mk                                 |   4 +-
 package/qt5/qt53d/qt53d.hash                       |   4 +-
 .../qt5/qt5base/0001-Force_egl_visual_ID_33.patch  |  27 -----
 package/qt5/qt5base/0003-xcb-egl-fixes.patch       |  82 ----------------
 .../0005-forkd-disable-eventfd-for-uclibc.patch    |  32 ------
 .../qt5base/0009-fix-eglfs-for-sunxi-mali.patch    | 109 ---------------------
 ...Invert-conditional-for-defining-QT_SOCKLE.patch |  40 --------
 package/qt5/qt5base/qt5base.hash                   |   4 +-
 package/qt5/qt5base/qt5base.mk                     |   4 -
 package/qt5/qt5connectivity/qt5connectivity.hash   |   4 +-
 package/qt5/qt5declarative/qt5declarative.hash     |   4 +-
 package/qt5/qt5enginio/qt5enginio.hash             |   4 +-
 package/qt5/qt5enginio/qt5enginio.mk               |   4 +-
 .../qt5graphicaleffects/qt5graphicaleffects.hash   |   4 +-
 package/qt5/qt5imageformats/qt5imageformats.hash   |   4 +-
 package/qt5/qt5multimedia/qt5multimedia.hash       |   4 +-
 package/qt5/qt5quickcontrols/qt5quickcontrols.hash |   4 +-
 package/qt5/qt5script/qt5script.hash               |   4 +-
 package/qt5/qt5sensors/qt5sensors.hash             |   4 +-
 package/qt5/qt5serialport/qt5serialport.hash       |   4 +-
 package/qt5/qt5svg/qt5svg.hash                     |   4 +-
 package/qt5/qt5tools/qt5tools.hash                 |   4 +-
 .../0001-Fix-builds-without-qml-module.patch       |  61 ------------
 package/qt5/qt5webchannel/qt5webchannel.hash       |   4 +-
 package/qt5/qt5websockets/qt5websockets.hash       |   4 +-
 package/qt5/qt5x11extras/qt5x11extras.hash         |   4 +-

Quoted 8 lines

 package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash     |   4 +-
 27 files changed, 41 insertions(+), 394 deletions(-)
 delete mode 100644 package/qt5/qt5base/0001-Force_egl_visual_ID_33.patch
 delete mode 100644 package/qt5/qt5base/0003-xcb-egl-fixes.patch
 delete mode 100644 package/qt5/qt5base/0005-forkd-disable-eventfd-for-uclibc.patch
 delete mode 100644 package/qt5/qt5base/0009-fix-eglfs-for-sunxi-mali.patch
 delete mode 100644 package/qt5/qt5base/0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
 delete mode 100644 package/qt5/qt5webchannel/0001-Fix-builds-without-qml-module.patch

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Julien Corjon

author

2016-03-17 09:42 UTC #10 lore raw

PATCH 5/5 qt5: add GPLv3 and GFDLv1.3 licensing informations

In reply to Julien Corjon

All Qt5 packages have gain the GPLv3 license option and all the documentation is now under GFDLv1.3 license (except qt5websocket)

Signed-off-by Julien Corjon <[email protected]>

---
 package/qt5/qt53d/qt53d.mk                             | 4 ++--
 package/qt5/qt5base/qt5base.mk                         | 4 ++--
 package/qt5/qt5connectivity/qt5connectivity.mk         | 4 ++--
 package/qt5/qt5declarative/qt5declarative.mk           | 4 ++--
 package/qt5/qt5enginio/qt5enginio.mk                   | 4 ++--
 package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 4 ++--
 package/qt5/qt5imageformats/qt5imageformats.mk         | 4 ++--
 package/qt5/qt5multimedia/qt5multimedia.mk             | 4 ++--
 package/qt5/qt5quickcontrols/qt5quickcontrols.mk       | 4 ++--
 package/qt5/qt5script/qt5script.mk                     | 4 ++--
 package/qt5/qt5sensors/qt5sensors.mk                   | 4 ++--
 package/qt5/qt5serialport/qt5serialport.mk             | 4 ++--
 package/qt5/qt5svg/qt5svg.mk                           | 4 ++--
 package/qt5/qt5tools/qt5tools.mk                       | 4 ++--
 package/qt5/qt5webchannel/qt5webchannel.mk             | 4 ++--
 package/qt5/qt5websockets/qt5websockets.mk             | 4 ++--
 package/qt5/qt5x11extras/qt5x11extras.mk               | 4 ++--
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk           | 4 ++--
 18 files changed, 36 insertions(+), 36 deletions(-)

package/qt5/qt53d/qt53d.mk +2 -2

index 24c42e6..8d683ae 100644
@@ -15,8 +15,8 @@ QT53D_DEPENDENCIES += assimp
 endif
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT53D_LICENSE = GPLv2+ or LGPLv3
-QT53D_LICENSE_FILES = LICENSE.GPL LICENSE.LGPLv3
+QT53D_LICENSE = GPLv2+ or GPLv3 or LGPLv3, docs: GFDLv1.3
+QT53D_LICENSE_FILES = LICENSE.GPL LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
 else
 QT53D_LICENSE = Commercial license
 QT53D_REDISTRIBUTE = NO

package/qt5/qt5base/qt5base.mk +2 -2

index b81383b..45f5f83 100644
@@ -39,8 +39,8 @@ QT5BASE_CONFIGURE_OPTS += -largefile
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license
-QT5BASE_LICENSE = LGPLv2.1 with exception or LGPLv3
-QT5BASE_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
+QT5BASE_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, docs: GFDLv1.3
+QT5BASE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 else
 QT5BASE_LICENSE = Commercial license
 QT5BASE_REDISTRIBUTE = NO

package/qt5/qt5connectivity/qt5connectivity.mk +2 -2

index fa07d93..54634eb 100644
@@ -11,8 +11,8 @@ QT5CONNECTIVITY_DEPENDENCIES = bluez_utils qt5base
 QT5CONNECTIVITY_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5CONNECTIVITY_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
-QT5CONNECTIVITY_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2
+QT5CONNECTIVITY_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, docs: GFDLv1.3
+QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 else
 QT5CONNECTIVITY_LICENSE = Commercial license
 QT5CONNECTIVITY_REDISTRIBUTE = NO

package/qt5/qt5declarative/qt5declarative.mk +2 -2

index 296292b..9251120 100644
@@ -11,8 +11,8 @@ QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns
 QT5DECLARATIVE_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5DECLARATIVE_LICENSE = LGPLv2.1 with exception or LGPLv3
-QT5DECLARATIVE_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
+QT5DECLARATIVE_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, docs: GFDLv1.3
+QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 else
 QT5DECLARATIVE_LICENSE = Commercial license
 QT5DECLARATIVE_REDISTRIBUTE = NO

package/qt5/qt5enginio/qt5enginio.mk +2 -2

index b6a534c..be0d37f 100644
@@ -13,8 +13,8 @@ QT5ENGINIO_DEPENDENCIES = openssl qt5base
 QT5ENGINIO_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5ENGINIO_LICENSE = LGPLv2.1 with exception or LGPLv3
-QT5ENGINIO_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
+QT5ENGINIO_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, docs: GFDLv1.3
+QT5ENGINIO_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 else
 QT5ENGINIO_LICENSE = Commercial license
 QT5ENGINIO_REDISTRIBUTE = NO

package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +2 -2

index 2dc2e71..26a56c0 100644
@@ -11,8 +11,8 @@ QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5base qt5declarative
 QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5GRAPHICALEFFECTS_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
-QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2
+QT5GRAPHICALEFFECTS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, docs: GFDLv1.3
+QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 else
 QT5GRAPHICALEFFECTS_LICENSE = Commercial license
 QT5GRAPHICALEFFECTS_REDISTRIBUTE = NO

package/qt5/qt5imageformats/qt5imageformats.mk +2 -2

index 0703db0..02fe5a9 100644
@@ -11,8 +11,8 @@ QT5IMAGEFORMATS_DEPENDENCIES = qt5base
 QT5IMAGEFORMATS_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5IMAGEFORMATS_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
-QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2
+QT5IMAGEFORMATS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, docs: GFDLv1.3
+QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 else
 QT5IMAGEFORMATS_LICENSE = Commercial license
 QT5IMAGEFORMATS_REDISTRIBUTE = NO

package/qt5/qt5multimedia/qt5multimedia.mk +2 -2

index df1395c..8c0b6d2 100644
@@ -11,8 +11,8 @@ QT5MULTIMEDIA_DEPENDENCIES = qt5base
 QT5MULTIMEDIA_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5MULTIMEDIA_LICENSE = LGPLv2.1 with exception or LGPLv3
-QT5MULTIMEDIA_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
+QT5MULTIMEDIA_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, docs: GFDLv1.3
+QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 else
 QT5MULTIMEDIA_LICENSE = Commercial license
 QT5MULTIMEDIA_REDISTRIBUTE = NO

package/qt5/qt5quickcontrols/qt5quickcontrols.mk +2 -2

index a0b9215..018bd2d 100644
@@ -11,8 +11,8 @@ QT5QUICKCONTROLS_DEPENDENCIES = qt5base qt5declarative
 QT5QUICKCONTROLS_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5QUICKCONTROLS_LICENSE = LGPLv3, GPLv2, GFDLv1.3
-QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.LGPLv3 LICENSE.GPLv2 LICENSE.FDL
+QT5QUICKCONTROLS_LICENSE = GPLv2 or GPLv3 or LGPLv3, docs: GFDLv1.3
+QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
 else
 QT5QUICKCONTROLS_LICENSE = Commercial license
 QT5QUICKCONTROLS_REDISTRIBUTE = NO

package/qt5/qt5script/qt5script.mk +2 -2

index 250bdfd..3401d9d 100644
@@ -11,8 +11,8 @@ QT5SCRIPT_DEPENDENCIES = qt5base
 QT5SCRIPT_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SCRIPT_LICENSE = LGPLv2.1 with exception or LGPLv3
-QT5SCRIPT_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
+QT5SCRIPT_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, docs: GFDLv1.3
+QT5SCRIPT_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 else
 QT5SCRIPT_LICENSE = Commercial license
 QT5SCRIPT_REDISTRIBUTE = NO

package/qt5/qt5sensors/qt5sensors.mk +2 -2

index 522dd8a..05c7681 100644
@@ -11,8 +11,8 @@ QT5SENSORS_DEPENDENCIES = qt5base
 QT5SENSORS_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SENSORS_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
-QT5SENSORS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2
+QT5SENSORS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, docs: GFDLv1.3
+QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 else
 QT5SENSORS_LICENSE = Commercial license
 QT5SENSORS_REDISTRIBUTE = NO

package/qt5/qt5serialport/qt5serialport.mk +2 -2

index 14cbf32..8b37361 100644
@@ -11,8 +11,8 @@ QT5SERIALPORT_DEPENDENCIES = qt5base
 QT5SERIALPORT_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SERIALPORT_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
-QT5SERIALPORT_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2
+QT5SERIALPORT_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, docs: GFDLv1.3
+QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 else
 QT5SERIALPORT_LICENSE = Commercial license
 QT5SERIALPORT_REDISTRIBUTE = NO

package/qt5/qt5svg/qt5svg.mk +2 -2

index 5942d01..54d84e9 100644
@@ -11,8 +11,8 @@ QT5SVG_DEPENDENCIES = qt5base
 QT5SVG_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SVG_LICENSE = LGPLv2.1 with exception or LGPLv3
-QT5SVG_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
+QT5SVG_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, docs: GFDLv1.3
+QT5SVG_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 else
 QT5SVG_LICENSE = Commercial license
 QT5SVG_REDISTRIBUTE = NO

package/qt5/qt5tools/qt5tools.mk +2 -2

index f3d78ce..d6c9eaa 100644
@@ -20,8 +20,8 @@ QT5TOOLS_DEPENDENCIES += qt5declarative
 endif
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5TOOLS_LICENSE = LGPLv2.1 with exception or LGPLv3
-QT5TOOLS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
+QT5TOOLS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, docs: GFDLv1.3
+QT5TOOLS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 else
 QT5TOOLS_LICENSE = Commercial license
 QT5TOOLS_REDISTRIBUTE = NO

package/qt5/qt5webchannel/qt5webchannel.mk +2 -2

index 6ceb59e..f40ced4 100644
@@ -11,8 +11,8 @@ QT5WEBCHANNEL_DEPENDENCIES = qt5base qt5websockets
 QT5WEBCHANNEL_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5WEBCHANNEL_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
-QT5WEBCHANNEL_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LGPL_EXCEPTION.txt LICENSE.GPLv2
+QT5WEBCHANNEL_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, docs: GFDLv1.3
+QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LICENSE.LGPLv3 LGPL_EXCEPTION.txt LICENSE.FDL
 else
 QT5WEBCHANNEL_LICENSE = Commercial license
 QT5WEBCHANNEL_REDISTRIBUTE = NO

package/qt5/qt5websockets/qt5websockets.mk +2 -2

index 1d7c1f1..f1200c2 100644
@@ -11,8 +11,8 @@ QT5WEBSOCKETS_DEPENDENCIES = qt5base
 QT5WEBSOCKETS_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5WEBSOCKETS_LICENSE = LGPLv2.1 with exception or LGPLv3
-QT5WEBSOCKETS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
+QT5WEBSOCKETS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3
+QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
 else
 QT5WEBSOCKETS_LICENSE = Commercial license
 QT5WEBSOCKETS_REDISTRIBUTE = NO

package/qt5/qt5x11extras/qt5x11extras.mk +2 -2

index 280379a..82ebed7 100644
@@ -11,8 +11,8 @@ QT5X11EXTRAS_DEPENDENCIES = qt5base
 QT5X11EXTRAS_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5X11EXTRAS_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
-QT5X11EXTRAS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2
+QT5X11EXTRAS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, doc: GFDLv1.3
+QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 else
 QT5X11EXTRAS_LICENSE = Commercial license
 QT5X11EXTRAS_REDISTRIBUTE = NO

package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +2 -2

index 136da9f..e75d4d4 100644
@@ -11,8 +11,8 @@ QT5XMLPATTERNS_DEPENDENCIES = qt5base
 QT5XMLPATTERNS_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5XMLPATTERNS_LICENSE = LGPLv2.1 with exception or LGPLv3
-QT5XMLPATTERNS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
+QT5XMLPATTERNS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, docs: GFDLv1.3
+QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 else
 QT5XMLPATTERNS_LICENSE = Commercial license
 QT5XMLPATTERNS_REDISTRIBUTE = NO

Signature · 1 line

2.5.0

Thomas Petazzoni

2016-03-20 22:35 UTC #11 lore raw

PATCH 5/5 qt5: add GPLv3 and GFDLv1.3 licensing informations

Hello,

Quoted 1 line · Julien Corjon

All Qt5 packages have gain the GPLv3 license option and all the

gain -> gained

Quoted 1 line

documentation is now under GFDLv1.3 license (except qt5websocket)

Are the libraries still available under LGPLv2.1 ? According to
http://www.qt.io/faq/#faqupcoming:

"""
Qt will be licensed under a commercial license, GPLv2, GPLv3 and LGPLv3, but no longer under LGPLv2.1
"""

But maybe this is only starting with Qt 5.7.

package/qt5/qt53d/qt53d.mk QT53D_DEPENDENCIES += assimp · line 18

Quoted 4 lines

ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
package/qt5/qt53d/qt53d.mk +1 -2
-QT53D_LICENSE = GPLv2+ or LGPLv3
-QT53D_LICENSE_FILES = LICENSE.GPL LICENSE.LGPLv3
+QT53D_LICENSE = GPLv2+ or GPLv3 or LGPLv3, docs: GFDLv1.3

This is not the proper format to specify which part is covered by which license. You should use:

GPLv2+ or GPLv3 or LGPLv3, GFDLv1.3 (docs)

This should be fixed globally, of course.

It's a bit weird though to mention GPLv3 *and* GPLv2+. Are sure it was GPLv2+ ?

Quoted 1 line

+QT53D_LICENSE_FILES = LICENSE.GPL LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL

There is no LICENSE.FDL file in this package, so make legal-info fails.

Please enable all Qt5 packages, and make sure that "make legal-info" works properly.

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Gary Bisson

2016-03-21 10:45 UTC #12 lore raw

cover Qt5 bump to 5.6.0 version

In reply to Julien Corjon

Julien, All,

Quoted 11 lines · Julien Corjon

Qt-5.6.0 have been released yesterday and drop the support of Qt5Webkit and Qt5Quick1.
All packages changed in this series have been compiled with:
- raspberry_defconfig + rpi_userland (brcm backend)
- firefly_rk3288_demo_defconfig + sunxi-mali (mali backend)
- own imx6q defconfig + imx-gpu-viv (vivante backend)
More info on the release:
- http://blog.qt.io/blog/2016/03/16/qt-5-6-released/
- http://blog.qt.io/blog/2015/11/17/embedded-linux-news-in-qt-5-6/

Tested on a Nitrogen6QP_MAX (nitrogen6x defconfig), with the following config:
BR2_PACKAGE_QT5CINEX=y
BR2_PACKAGE_QT5CINEX_HD=y
BR2_PACKAGE_QT5=y
BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y BR2_PACKAGE_QT5BASE_EXAMPLES=y
BR2_PACKAGE_QT5BASE_OPENGL_LIB=y
BR2_PACKAGE_QT5BASE_LINUXFB=y BR2_PACKAGE_QT5BASE_DEFAULT_QPA="eglfs"
BR2_PACKAGE_QT53D=y
BR2_PACKAGE_QT5CONNECTIVITY=y
BR2_PACKAGE_QT5ENGINIO=y
BR2_PACKAGE_QT5IMAGEFORMATS=y
BR2_PACKAGE_QT5MULTIMEDIA=y
BR2_PACKAGE_QT5QUICKCONTROLS=y
BR2_PACKAGE_QT5SENSORS=y
BR2_PACKAGE_QT5SERIALPORT=y
BR2_PACKAGE_QT5SVG=y
BR2_PACKAGE_QT5TOOLS=y
BR2_PACKAGE_QT5WEBCHANNEL=y
BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q=y BR2_PACKAGE_IMX_GPU_VIV=y
BR2_PACKAGE_IMX_GPU_VIV_G2D=y BR2_PACKAGE_KERNEL_MODULE_IMX_GPU_VIV=y

CinematicExperience-demo, hellogl2 and hellogles3 all run fine.

For the whole series:

Tested-by Gary Bisson <[email protected]>

One remark though, maybe we should get webengine in at the same time since webkit has been removed. Otherwise it means users won't have any option to display web content. I know I said I would look at webengine but haven't had the time yet. Have you tested it?

Regards,
Gary

Julien CORJON

author

2016-03-21 11:05 UTC #13 lore raw

cover Qt5 bump to 5.6.0 version

Gary,

Le 21/03/2016 11:45, Gary Bisson a ?crit :

Quoted 41 lines

Julien, All,
Quoted 11 lines · Julien Corjon
Qt-5.6.0 have been released yesterday and drop the support of Qt5Webkit and Qt5Quick1.
All packages changed in this series have been compiled with:
- raspberry_defconfig + rpi_userland (brcm backend)
- firefly_rk3288_demo_defconfig + sunxi-mali (mali backend)
- own imx6q defconfig + imx-gpu-viv (vivante backend)
More info on the release:
- http://blog.qt.io/blog/2016/03/16/qt-5-6-released/
- http://blog.qt.io/blog/2015/11/17/embedded-linux-news-in-qt-5-6/
Tested on a Nitrogen6QP_MAX (nitrogen6x defconfig), with the following config:
BR2_PACKAGE_QT5CINEX=y
BR2_PACKAGE_QT5CINEX_HD=y
BR2_PACKAGE_QT5=y
BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y BR2_PACKAGE_QT5BASE_EXAMPLES=y
BR2_PACKAGE_QT5BASE_OPENGL_LIB=y
BR2_PACKAGE_QT5BASE_LINUXFB=y BR2_PACKAGE_QT5BASE_DEFAULT_QPA="eglfs"
BR2_PACKAGE_QT53D=y
BR2_PACKAGE_QT5CONNECTIVITY=y
BR2_PACKAGE_QT5ENGINIO=y
BR2_PACKAGE_QT5IMAGEFORMATS=y
BR2_PACKAGE_QT5MULTIMEDIA=y
BR2_PACKAGE_QT5QUICKCONTROLS=y
BR2_PACKAGE_QT5SENSORS=y
BR2_PACKAGE_QT5SERIALPORT=y
BR2_PACKAGE_QT5SVG=y
BR2_PACKAGE_QT5TOOLS=y
BR2_PACKAGE_QT5WEBCHANNEL=y
BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q=y BR2_PACKAGE_IMX_GPU_VIV=y
BR2_PACKAGE_IMX_GPU_VIV_G2D=y BR2_PACKAGE_KERNEL_MODULE_IMX_GPU_VIV=y

Quoted 4 lines

CinematicExperience-demo, hellogl2 and hellogles3 all run fine.
For the whole series:
Tested-by Gary Bisson <[email protected]>

Thanks for the testing

Quoted 5 lines

One remark though, maybe we should get webengine in at the same time since webkit has been removed. Otherwise it means users won't have any option to display web content. I know I said I would look at webengine but haven't had the time yet. Have you tested it?

I already tried to get webengine working with Qt5.5.0 but, at the time, qt5webengine build system was quite buggy for 'not android' embedded systems. I will try with this new version but, like you, I do not have much time to spend on this topic.

Regards,
Julien

Quoted 4 lines

Regards,
Gary

Julien Corjon

author

2016-03-21 11:00 UTC #14 lore raw

PATCH v2 1/1 qt5: add GPLv3 and GFDLv1.3 licensing informations

In reply to Julien Corjon

All Qt5 packages gained the GPLv3 license option and all the documentation is now under GFDLv1.3 license (except qt5websocket and qt53d)

Signed-off-by Julien Corjon <[email protected]>

---

Notes:
Qt5.6 does not drop LGPLv2.1 with exceptions[1], Qt5.7 will.

[1] http://blog.qt.io/blog/2016/02/22/qt-roadmap-for-2016/

Changes v1 -> v2 (suggested by Thomas):
- Replace GPLv2+ with GPLv2 for qt5base
- Use the proper format to specify license
- Remove GFDLv1.3 from qt53d
- Fix typo in commit log
- Test make legal-info

 package/qt5/qt53d/qt53d.mk                             | 4 ++--
 package/qt5/qt5base/qt5base.mk                         | 4 ++--
 package/qt5/qt5connectivity/qt5connectivity.mk         | 4 ++--
 package/qt5/qt5declarative/qt5declarative.mk           | 4 ++--
 package/qt5/qt5enginio/qt5enginio.mk                   | 4 ++--
 package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 4 ++--
 package/qt5/qt5imageformats/qt5imageformats.mk         | 4 ++--
 package/qt5/qt5multimedia/qt5multimedia.mk             | 4 ++--
 package/qt5/qt5quickcontrols/qt5quickcontrols.mk       | 4 ++--
 package/qt5/qt5script/qt5script.mk                     | 4 ++--
 package/qt5/qt5sensors/qt5sensors.mk                   | 4 ++--
 package/qt5/qt5serialport/qt5serialport.mk             | 4 ++--
 package/qt5/qt5svg/qt5svg.mk                           | 4 ++--
 package/qt5/qt5tools/qt5tools.mk                       | 4 ++--
 package/qt5/qt5webchannel/qt5webchannel.mk             | 4 ++--
 package/qt5/qt5websockets/qt5websockets.mk             | 4 ++--
 package/qt5/qt5x11extras/qt5x11extras.mk               | 4 ++--
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk           | 4 ++--
 18 files changed, 36 insertions(+), 36 deletions(-)

package/qt5/qt53d/qt53d.mk +2 -2

index 24c42e6..5dac5b0 100644
@@ -15,8 +15,8 @@ QT53D_DEPENDENCIES += assimp
 endif
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT53D_LICENSE = GPLv2+ or LGPLv3
-QT53D_LICENSE_FILES = LICENSE.GPL LICENSE.LGPLv3
+QT53D_LICENSE = GPLv2 or GPLv3 or LGPLv3
+QT53D_LICENSE_FILES = LICENSE.GPL LICENSE.GPLv3 LICENSE.LGPLv3
 else
 QT53D_LICENSE = Commercial license
 QT53D_REDISTRIBUTE = NO

package/qt5/qt5base/qt5base.mk +2 -2

index b81383b..9ff7af1 100644
@@ -39,8 +39,8 @@ QT5BASE_CONFIGURE_OPTS += -largefile
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license
-QT5BASE_LICENSE = LGPLv2.1 with exception or LGPLv3
-QT5BASE_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
+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
 else
 QT5BASE_LICENSE = Commercial license
 QT5BASE_REDISTRIBUTE = NO

package/qt5/qt5connectivity/qt5connectivity.mk +2 -2

index fa07d93..a68f5ec 100644
@@ -11,8 +11,8 @@ QT5CONNECTIVITY_DEPENDENCIES = bluez_utils qt5base
 QT5CONNECTIVITY_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5CONNECTIVITY_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
-QT5CONNECTIVITY_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2
+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
 else
 QT5CONNECTIVITY_LICENSE = Commercial license
 QT5CONNECTIVITY_REDISTRIBUTE = NO

package/qt5/qt5declarative/qt5declarative.mk +2 -2

index 296292b..be3a7b7 100644
@@ -11,8 +11,8 @@ QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns
 QT5DECLARATIVE_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5DECLARATIVE_LICENSE = LGPLv2.1 with exception or LGPLv3
-QT5DECLARATIVE_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
+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
 else
 QT5DECLARATIVE_LICENSE = Commercial license
 QT5DECLARATIVE_REDISTRIBUTE = NO

package/qt5/qt5enginio/qt5enginio.mk +2 -2

index b6a534c..b858d1c 100644
@@ -13,8 +13,8 @@ QT5ENGINIO_DEPENDENCIES = openssl qt5base
 QT5ENGINIO_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5ENGINIO_LICENSE = LGPLv2.1 with exception or LGPLv3
-QT5ENGINIO_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
+QT5ENGINIO_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5ENGINIO_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 else
 QT5ENGINIO_LICENSE = Commercial license
 QT5ENGINIO_REDISTRIBUTE = NO

package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +2 -2

index 2dc2e71..223374a 100644
@@ -11,8 +11,8 @@ QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5base qt5declarative
 QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5GRAPHICALEFFECTS_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
-QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2
+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
 else
 QT5GRAPHICALEFFECTS_LICENSE = Commercial license
 QT5GRAPHICALEFFECTS_REDISTRIBUTE = NO

package/qt5/qt5imageformats/qt5imageformats.mk +2 -2

index 0703db0..921656d 100644
@@ -11,8 +11,8 @@ QT5IMAGEFORMATS_DEPENDENCIES = qt5base
 QT5IMAGEFORMATS_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5IMAGEFORMATS_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
-QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2
+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
 else
 QT5IMAGEFORMATS_LICENSE = Commercial license
 QT5IMAGEFORMATS_REDISTRIBUTE = NO

package/qt5/qt5multimedia/qt5multimedia.mk +2 -2

index df1395c..67e7968 100644
@@ -11,8 +11,8 @@ QT5MULTIMEDIA_DEPENDENCIES = qt5base
 QT5MULTIMEDIA_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5MULTIMEDIA_LICENSE = LGPLv2.1 with exception or LGPLv3
-QT5MULTIMEDIA_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
+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
 else
 QT5MULTIMEDIA_LICENSE = Commercial license
 QT5MULTIMEDIA_REDISTRIBUTE = NO

package/qt5/qt5quickcontrols/qt5quickcontrols.mk +2 -2

index a0b9215..b33ff15 100644
@@ -11,8 +11,8 @@ QT5QUICKCONTROLS_DEPENDENCIES = qt5base qt5declarative
 QT5QUICKCONTROLS_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5QUICKCONTROLS_LICENSE = LGPLv3, GPLv2, GFDLv1.3
-QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.LGPLv3 LICENSE.GPLv2 LICENSE.FDL
+QT5QUICKCONTROLS_LICENSE = GPLv2 or GPLv3 or LGPLv3, GFDLv1.3 (docs)
+QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
 else
 QT5QUICKCONTROLS_LICENSE = Commercial license
 QT5QUICKCONTROLS_REDISTRIBUTE = NO

package/qt5/qt5script/qt5script.mk +2 -2

index 250bdfd..57ba6f0 100644
@@ -11,8 +11,8 @@ QT5SCRIPT_DEPENDENCIES = qt5base
 QT5SCRIPT_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SCRIPT_LICENSE = LGPLv2.1 with exception or LGPLv3
-QT5SCRIPT_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
+QT5SCRIPT_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5SCRIPT_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 else
 QT5SCRIPT_LICENSE = Commercial license
 QT5SCRIPT_REDISTRIBUTE = NO

package/qt5/qt5sensors/qt5sensors.mk +2 -2

index 522dd8a..0dd952a 100644
@@ -11,8 +11,8 @@ QT5SENSORS_DEPENDENCIES = qt5base
 QT5SENSORS_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SENSORS_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
-QT5SENSORS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2
+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
 else
 QT5SENSORS_LICENSE = Commercial license
 QT5SENSORS_REDISTRIBUTE = NO

package/qt5/qt5serialport/qt5serialport.mk +2 -2

index 14cbf32..04df021 100644
@@ -11,8 +11,8 @@ QT5SERIALPORT_DEPENDENCIES = qt5base
 QT5SERIALPORT_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SERIALPORT_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
-QT5SERIALPORT_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2
+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
 else
 QT5SERIALPORT_LICENSE = Commercial license
 QT5SERIALPORT_REDISTRIBUTE = NO

package/qt5/qt5svg/qt5svg.mk +2 -2

index 5942d01..ebd5cba 100644
@@ -11,8 +11,8 @@ QT5SVG_DEPENDENCIES = qt5base
 QT5SVG_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SVG_LICENSE = LGPLv2.1 with exception or LGPLv3
-QT5SVG_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
+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
 else
 QT5SVG_LICENSE = Commercial license
 QT5SVG_REDISTRIBUTE = NO

package/qt5/qt5tools/qt5tools.mk +2 -2

index f3d78ce..6befb8b 100644
@@ -20,8 +20,8 @@ QT5TOOLS_DEPENDENCIES += qt5declarative
 endif
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5TOOLS_LICENSE = LGPLv2.1 with exception or LGPLv3
-QT5TOOLS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
+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
 else
 QT5TOOLS_LICENSE = Commercial license
 QT5TOOLS_REDISTRIBUTE = NO

package/qt5/qt5webchannel/qt5webchannel.mk +2 -2

index 6ceb59e..9e94914 100644
@@ -11,8 +11,8 @@ QT5WEBCHANNEL_DEPENDENCIES = qt5base qt5websockets
 QT5WEBCHANNEL_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5WEBCHANNEL_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
-QT5WEBCHANNEL_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LGPL_EXCEPTION.txt LICENSE.GPLv2
+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
 else
 QT5WEBCHANNEL_LICENSE = Commercial license
 QT5WEBCHANNEL_REDISTRIBUTE = NO

package/qt5/qt5websockets/qt5websockets.mk +2 -2

index 1d7c1f1..f1200c2 100644
@@ -11,8 +11,8 @@ QT5WEBSOCKETS_DEPENDENCIES = qt5base
 QT5WEBSOCKETS_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5WEBSOCKETS_LICENSE = LGPLv2.1 with exception or LGPLv3
-QT5WEBSOCKETS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
+QT5WEBSOCKETS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3
+QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
 else
 QT5WEBSOCKETS_LICENSE = Commercial license
 QT5WEBSOCKETS_REDISTRIBUTE = NO

package/qt5/qt5x11extras/qt5x11extras.mk +2 -2

index 280379a..a0e1209 100644
@@ -11,8 +11,8 @@ QT5X11EXTRAS_DEPENDENCIES = qt5base
 QT5X11EXTRAS_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5X11EXTRAS_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
-QT5X11EXTRAS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2
+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
 else
 QT5X11EXTRAS_LICENSE = Commercial license
 QT5X11EXTRAS_REDISTRIBUTE = NO

package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +2 -2

index 136da9f..31477a7 100644
@@ -11,8 +11,8 @@ QT5XMLPATTERNS_DEPENDENCIES = qt5base
 QT5XMLPATTERNS_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5XMLPATTERNS_LICENSE = LGPLv2.1 with exception or LGPLv3
-QT5XMLPATTERNS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
+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
 else
 QT5XMLPATTERNS_LICENSE = Commercial license
 QT5XMLPATTERNS_REDISTRIBUTE = NO

Signature · 1 line

2.5.0

Thomas Petazzoni

Applied

2016-03-26 17:55 UTC #15 lore raw

PATCH v2 1/1 qt5: add GPLv3 and GFDLv1.3 licensing informations

Hello,

Quoted 5 lines · Julien Corjon

All Qt5 packages gained the GPLv3 license option and all the documentation is now under GFDLv1.3 license (except qt5websocket and qt53d)
Signed-off-by Julien Corjon <[email protected]>
---

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com