From 43e1d099b4fca37ce7cbbf3dd41fe4330610b723 Mon Sep 17 00:00:00 2001 From: Gaël PORTAY Date: Tue, 28 Nov 2017 23:50:38 -0500 Subject: Revert "package/qt5webkit-examples: remove obsolete package" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 [Thomas: add entry in the DEVELOPERS file.] Signed-off-by: Thomas Petazzoni --- .../qt5webkit-examples/0001-Build-examples.patch | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 package/qt5/qt5webkit-examples/0001-Build-examples.patch (limited to 'package/qt5/qt5webkit-examples/0001-Build-examples.patch') diff --git a/package/qt5/qt5webkit-examples/0001-Build-examples.patch b/package/qt5/qt5webkit-examples/0001-Build-examples.patch new file mode 100644 index 0000000000..6303006f62 --- /dev/null +++ b/package/qt5/qt5webkit-examples/0001-Build-examples.patch @@ -0,0 +1,52 @@ +From 78f558df35860484711a600d155ae7a13ebf44b2 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= +Date: Tue, 28 Nov 2017 23:14:42 -0500 +Subject: [PATCH 1/1] Build examples +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +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 +Signed-off-by: Gaël PORTAY +[gportay: build imageanalyzer example if concurrent module is built] +--- + examples/webkitwidgets/webkitwidgets.pro | 7 ++++--- + qtwebkit-examples.pro | 1 + + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/examples/webkitwidgets/webkitwidgets.pro b/examples/webkitwidgets/webkitwidgets.pro +index ab20df4..67f6785 100644 +--- a/examples/webkitwidgets/webkitwidgets.pro ++++ b/examples/webkitwidgets/webkitwidgets.pro +@@ -4,9 +4,10 @@ SUBDIRS += domtraversal \ + previewer \ + fancybrowser \ + simpleselector \ +- imageanalyzer \ + framecapture \ + browser \ + embedded \ +- scroller \ +- xmlpatterns ++ scroller ++ ++qtHaveModule(xmlpatterns): SUBDIRS += xmlpatterns ++qtHaveModule(concurrent): SUBDIRS += imageanalyzer +diff --git a/qtwebkit-examples.pro b/qtwebkit-examples.pro +index 3fcecf1..2ade7ff 100644 +--- a/qtwebkit-examples.pro ++++ b/qtwebkit-examples.pro +@@ -3,3 +3,4 @@ requires(qtHaveModule(webkit)) + load(qt_parts) + + SUBDIRS += doc ++SUBDIRS += examples +-- +2.15.0 + -- cgit v1.2.3