Skip to contentSkip to conversation

qt5charts: build with both Qt 5.6/5.11

PATCH New Gaël PORTAY 3 participants 5 messages Jun 18, 2018 – Jun 25, 2018

lore
Share & tools
lore

Gaël PORTAY

author
#0 lore raw

cover qt5charts: build with both Qt 5.6/5.11

Hi all,

This patch serie makes the module qt5charts buildable with both version of Qt5 (i.e. 5.6 and lastest). Currently, it is not buildable with Qt 5.6 and the build is broken with latest (5.11) since 4fbb2d143d (qt5:
bump latest version to 5.11.0).

The first patch removes the restriction that disable the build of qt5charts when Qt 5.6 is selected; and it updates the hash in its hash file. This module is available since 5.6.3 under the version 2.1.3.

The second patch fixes the missing bump of its hash file from the general bump to Qt 5.11.0.

Regards,
Ga?l PORTAY (2):
qt5charts: allow to build with qt5.6
qt5chart: bump hash for 5.11.0

 package/qt5/qt5charts/Config.in      | 4 ----
 package/qt5/qt5charts/qt5charts.hash | 7 +++++--
 package/qt5/qt5charts/qt5charts.mk   | 5 +++++
 3 files changed, 10 insertions(+), 6 deletions(-)
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 1/2 qt5charts: allow to build with qt5.6

This module is available for Qt 5.6 since version 5.6.3 under the version number 2.1.3.

Signed-off-by Ga?l PORTAY <[email protected]>
---
 package/qt5/qt5charts/Config.in      | 4 ----
 package/qt5/qt5charts/qt5charts.hash | 3 +++
 package/qt5/qt5charts/qt5charts.mk   | 5 +++++
 3 files changed, 8 insertions(+), 4 deletions(-)
package/qt5/qt5charts/Config.in +0 -4
index 78f08fe637..db199922db 100644
@@ -1,9 +1,5 @@
-comment "qt5charts needs at least qt-5.7"
-	depends on !BR2_PACKAGE_QT5_VERSION_LATEST
-
 config BR2_PACKAGE_QT5CHARTS
 	bool "qt5charts"
-	depends on BR2_PACKAGE_QT5_VERSION_LATEST
 	select BR2_PACKAGE_QT5BASE
 	select BR2_PACKAGE_QT5BASE_GUI
 	select BR2_PACKAGE_QT5BASE_WIDGETS
package/qt5/qt5charts/qt5charts.hash +3 -0
index 5a5845ef9f..ce1189d0e1 100644
@@ -1,3 +1,6 @@
+# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcharts-opensource-src-2.1.3.tar.xz.mirrorlist
+sha256 f636a9b1c255f678f11b36cd73abc807d16dae0c31ecbc75c09524703aae7d2f  qtcharts-opensource-src-2.1.3.tar.xz
+
 # Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtcharts-everywhere-src-5.10.1.tar.xz.mirrorlist
 sha256 4f0d577bf73dd2bbb2765c2cfb493a2d68790fc2c64f42544d31dba806321ec9  qtcharts-everywhere-src-5.10.1.tar.xz
package/qt5/qt5charts/qt5charts.mk +5 -0
index 123cb658fe..71d0e54027 100644
@@ -4,7 +4,12 @@
 #
 ################################################################################
 
+# Qt5Charts does not follow Qt versionning for 5.6
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
 QT5CHARTS_VERSION = $(QT5_VERSION)
+else
+QT5CHARTS_VERSION = 2.1.3
+endif
 QT5CHARTS_SITE = $(QT5_SITE)
 QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz
 QT5CHARTS_DEPENDENCIES = qt5base
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH 2/2 qt5charts: bump hash for 5.11.0

In reply to Gaël PORTAY

The hash bump was missing commit 4fbb2d143d (qt5: bump latest version to 5.11.0).

Signed-off-by Ga?l PORTAY <[email protected]>
---
 package/qt5/qt5charts/qt5charts.hash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/qt5/qt5charts/qt5charts.hash +2 -2
index ce1189d0e1..6bd9a9d51b 100644
@@ -1,8 +1,8 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcharts-opensource-src-2.1.3.tar.xz.mirrorlist
 sha256 f636a9b1c255f678f11b36cd73abc807d16dae0c31ecbc75c09524703aae7d2f  qtcharts-opensource-src-2.1.3.tar.xz
 
-# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtcharts-everywhere-src-5.10.1.tar.xz.mirrorlist
-sha256 4f0d577bf73dd2bbb2765c2cfb493a2d68790fc2c64f42544d31dba806321ec9  qtcharts-everywhere-src-5.10.1.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtcharts-everywhere-src-5.11.0.tar.xz.mirrorlist
+sha256 c46e12beeaabf731ce918c7508d8ab62ae3b675870992faf36878268da4ee351  qtcharts-everywhere-src-5.11.0.tar.xz
 
 # Hashes for license files:
 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
Signature · 1 line
2.17.1
#3 lore raw

PATCH 2/2 qt5charts: bump hash for 5.11.0

Hello Ga?l,

Quoted 4 lines · Ga?l PORTAY

The hash bump was missing commit 4fbb2d143d (qt5: bump latest version to 5.11.0).

Signed-off-by Ga?l PORTAY <[email protected]>
Reviewed-by Peter Seiderer <[email protected]>

Regards,
Peter

Quoted 19 lines
---
 package/qt5/qt5charts/qt5charts.hash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/qt5/qt5charts/qt5charts.hash +2 -2
index ce1189d0e1..6bd9a9d51b 100644
@@ -1,8 +1,8 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcharts-opensource-src-2.1.3.tar.xz.mirrorlist
 sha256 f636a9b1c255f678f11b36cd73abc807d16dae0c31ecbc75c09524703aae7d2f  qtcharts-opensource-src-2.1.3.tar.xz
 
-# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtcharts-everywhere-src-5.10.1.tar.xz.mirrorlist
-sha256 4f0d577bf73dd2bbb2765c2cfb493a2d68790fc2c64f42544d31dba806321ec9  qtcharts-everywhere-src-5.10.1.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtcharts-everywhere-src-5.11.0.tar.xz.mirrorlist
+sha256 c46e12beeaabf731ce918c7508d8ab62ae3b675870992faf36878268da4ee351  qtcharts-everywhere-src-5.11.0.tar.xz
 
 # Hashes for license files:
 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
#4 lore raw

cover qt5charts: build with both Qt 5.6/5.11

In reply to Gaël PORTAY

Hello,

Quoted 3 lines · Ga?l PORTAY

Ga?l PORTAY (2):
qt5charts: allow to build with qt5.6
qt5chart: bump hash for 5.11.0

Both applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com