Revert "package/qt5webkit-examples: remove obsolete package"

PATCH New Gaël PORTAY 2 participants 2 messages Nov 29, 2017

lore

Share & tools

lore

Gaël PORTAY

author

2017-11-29 04:50 UTC #0 lore raw

PATCH 1/1 Revert "package/qt5webkit-examples: remove obsolete package"

This reverts commit 940bfe2f4336a3fea1ec6805db1f90ce83bd4a78 with the following changes:

- new hashes for 5.6.3 and 5.9.1 (there is no 5.9.2).
- BR2_PACKAGE_QT5BASE_LICENSE_APPROVED has been removed
- add GPL-3 to licences
- uses SPDX identifier for licences
- add missing dependencies (qt5base, qt5webkit, qt5declarative)
- removes /usr when qmake host-tools is invoked at configure

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

---
 Config.in.legacy                                   |  7 ---
 package/qt5/Config.in                              |  1 +
 .../qt5webkit-examples/0001-Build-examples.patch   | 52 +++++++++++++++++++++
 package/qt5/qt5webkit-examples/Config.in           | 10 ++++
 .../qt5/qt5webkit-examples/qt5webkit-examples.hash |  5 ++
 .../qt5/qt5webkit-examples/qt5webkit-examples.mk   | 54 ++++++++++++++++++++++
 6 files changed, 122 insertions(+), 7 deletions(-)
 create mode 100644 package/qt5/qt5webkit-examples/0001-Build-examples.patch
 create mode 100644 package/qt5/qt5webkit-examples/Config.in
 create mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.hash
 create mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.mk

Config.in.legacy +0 -7

index 35a6d6e1fe..cabfc49ed2 100644
@@ -1143,13 +1143,6 @@ config BR2_x86_i386
 	  The support for the i386 processors of the x86 architecture
 	  has been removed.
 
-config BR2_PACKAGE_QT5WEBKIT_EXAMPLES
-	bool "qt5webkit-examples package removed"
-	select BR2_LEGACY
-	help
-	  The qt5webkit-examples package has been removed, since it
-	  was removed from upstream starting from Qt 5.6.
-
 config BR2_PACKAGE_QT5QUICK1
 	bool "qt5quick1 package removed"
 	select BR2_LEGACY

package/qt5/Config.in +1 -0

index 8513c36623..0136e1124f 100644
@@ -80,6 +80,7 @@ source "package/qt5/qt5virtualkeyboard/Config.in"
 source "package/qt5/qt5wayland/Config.in"
 source "package/qt5/qt5webchannel/Config.in"
 source "package/qt5/qt5webkit/Config.in"
+source "package/qt5/qt5webkit-examples/Config.in"
 source "package/qt5/qt5webengine/Config.in"
 source "package/qt5/qt5websockets/Config.in"
 source "package/qt5/qt5x11extras/Config.in"

package/qt5/qt5webkit-examples/0001-Build-examples.patch new file +52 -0

52 lines not on this page · raw message

package/qt5/qt5webkit-examples/Config.in new file +10 -0

new file mode 100644
index 0000000000..e7610c2088
@@ -0,0 +1,10 @@
+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.
+
+	  http://qt.io

package/qt5/qt5webkit-examples/qt5webkit-examples.hash new file +5 -0

new file mode 100644
index 0000000000..2af1efbaf0
@@ -0,0 +1,5 @@
+# Hash from: http://download.qt.io/community_releases/5.6/5.6.3/qtwebkit-examples-opensource-src-5.6.3.tar.xz.mirrorlist
+sha256 2d6ce7146298d03b443cca4390bbfee17c4c0b08a31efcbf9fe0732291a6169e qtwebkit-examples-opensource-src-5.6.3.tar.xz
+
+# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-examples-opensource-src-5.9.1.tar.xz.mirrorlist
+sha256 e4ce4de6b468243abad2baabbe8ddfb05d25b186529bfe88cb8662fc983f54d0 qtwebkit-examples-opensource-src-5.9.1.tar.xz

package/qt5/qt5webkit-examples/qt5webkit-examples.mk new file +54 -0

54 lines not on this page · raw message

Signature · 1 line

2.15.0

Thomas Petazzoni

Applied

2017-11-29 21:23 UTC #1 lore raw

PATCH 1/1 Revert "package/qt5webkit-examples: remove obsolete package"

Hello,

Quoted 11 lines · Ga?l PORTAY

This reverts commit 940bfe2f4336a3fea1ec6805db1f90ce83bd4a78 with the following changes:
- new hashes for 5.6.3 and 5.9.1 (there is no 5.9.2).
- BR2_PACKAGE_QT5BASE_LICENSE_APPROVED has been removed
- add GPL-3 to licences
- uses SPDX identifier for licences
- add missing dependencies (qt5base, qt5webkit, qt5declarative)
- removes /usr when qmake host-tools is invoked at configure
Signed-off-by Ga?l PORTAY <[email protected]>

Quoted 12 lines

---
 Config.in.legacy                                   |  7 ---
 package/qt5/Config.in                              |  1 +
 .../qt5webkit-examples/0001-Build-examples.patch   | 52 +++++++++++++++++++++
 package/qt5/qt5webkit-examples/Config.in           | 10 ++++
 .../qt5/qt5webkit-examples/qt5webkit-examples.hash |  5 ++
 .../qt5/qt5webkit-examples/qt5webkit-examples.mk   | 54 ++++++++++++++++++++++
 6 files changed, 122 insertions(+), 7 deletions(-)
 create mode 100644 package/qt5/qt5webkit-examples/0001-Build-examples.patch
 create mode 100644 package/qt5/qt5webkit-examples/Config.in
 create mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.hash
 create mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.mk

Applied to next, after adding an entry in the DEVELOPERS file to reference you as a developer for qt5webkit-examples.

Thanks!

Thomas

Signature · 3 lines

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