From 7cc177d116ad98d0c922f98aa7f02c2cc655c0ec Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 23 Dec 2018 08:02:55 +0000 Subject: qtwebkit-examples: drop recipe * it's not supported by upstream * it's broken again with 5.12.0: http://errors.yoctoproject.org/Errors/Build/74151/ make[3]: Entering directory 'TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit-examples/5.12.0+gitAUTOINC+2d68492004-r0/build/examples/webkitwidgets/simpleselector' make[3]: *** No rule to make target 'QtWebKit/QWebView', needed by '.uic/ui_window.h'. Stop. make[3]: Leaving directory 'TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit-examples/5.12.0+gitAUTOINC+2d68492004-r0/build/examples/webkitwidgets/simpleselector' ... make[3]: Entering directory 'TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit-examples/5.12.0+gitAUTOINC+2d68492004-r0/build/examples/webkitwidgets/domtraversal' make[3]: *** No rule to make target 'QtWebKitWidgets/QWebView', needed by '.uic/ui_window.h'. Stop. make[3]: Leaving directory 'TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit-examples/5.12.0+gitAUTOINC+2d68492004-r0/build/examples/webkitwidgets/domtraversal' ... make[3]: Entering directory 'TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit-examples/5.12.0+gitAUTOINC+2d68492004-r0/build/examples/webkitwidgets/formextractor' make[3]: *** No rule to make target 'QtWebKit/QWebView', needed by '.uic/ui_formextractor.h'. Stop. make[3]: Leaving directory 'TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit-examples/5.12.0+gitAUTOINC+2d68492004-r0/build/examples/webkitwidgets/formextractor' ... make[3]: Entering directory 'TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit-examples/5.12.0+gitAUTOINC+2d68492004-r0/build/examples/webkitwidgets/previewer' make[3]: *** No rule to make target 'QtWebKit/QWebView', needed by '.uic/ui_previewer.h'. Stop. make[3]: Leaving directory 'TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit-examples/5.12.0+gitAUTOINC+2d68492004-r0/build/examples/webkitwidgets/previewer' * nobody was interested in fixing it last time it got broken with 5.11 upgrade: https://patchwork.openembedded.org/patch/151399/ Signed-off-by: Martin Jansa --- .../0001-Fix-build-with-qt-5.11.patch | 48 ---------------------- recipes-qt/qt5/qtwebkit-examples_git.bb | 24 ----------- 2 files changed, 72 deletions(-) delete mode 100644 recipes-qt/qt5/qtwebkit-examples/0001-Fix-build-with-qt-5.11.patch delete mode 100644 recipes-qt/qt5/qtwebkit-examples_git.bb (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qtwebkit-examples/0001-Fix-build-with-qt-5.11.patch b/recipes-qt/qt5/qtwebkit-examples/0001-Fix-build-with-qt-5.11.patch deleted file mode 100644 index 57e318b0..00000000 --- a/recipes-qt/qt5/qtwebkit-examples/0001-Fix-build-with-qt-5.11.patch +++ /dev/null @@ -1,48 +0,0 @@ -From e07f1fcba5a291ef0ab31fd85fbc4836eda19a66 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 24 Sep 2018 03:14:29 -0700 -Subject: [PATCH] Fix build with qt 5.11 - -Fixes - -examples/webkitwidgets/scroller/wheel/main.cpp:93:84: error: cannot call -member function 'int QRandomGenerator::bounded(int)' without object - m_wheel1->scrollTo(m_wheel1->currentIndex() + -QRandomGenerator::bounded(200)); - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - examples/webkitwidgets/scroller/wheel/main.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/examples/webkitwidgets/scroller/wheel/main.cpp b/examples/webkitwidgets/scroller/wheel/main.cpp -index 11fad08..9a6a225 100644 ---- a/examples/webkitwidgets/scroller/wheel/main.cpp -+++ b/examples/webkitwidgets/scroller/wheel/main.cpp -@@ -40,7 +40,7 @@ - - #include - #include -- -+#include - #include "wheelwidget.h" - - class MainWindow : public QMainWindow -@@ -90,9 +90,9 @@ public: - private slots: - void rotateRandom() - { -- m_wheel1->scrollTo(m_wheel1->currentIndex() + QRandomGenerator::bounded(200)); -- m_wheel2->scrollTo(m_wheel2->currentIndex() + QRandomGenerator::bounded(200)); -- m_wheel3->scrollTo(m_wheel3->currentIndex() + QRandomGenerator::bounded(200)); -+ m_wheel1->scrollTo(m_wheel1->currentIndex() + QRandomGenerator::global()->bounded(200)); -+ m_wheel2->scrollTo(m_wheel2->currentIndex() + QRandomGenerator::global()->bounded(200)); -+ m_wheel3->scrollTo(m_wheel3->currentIndex() + QRandomGenerator::global()->bounded(200)); - } - - private: --- -2.19.0 - diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb deleted file mode 100644 index 4b635bdf..00000000 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ /dev/null @@ -1,24 +0,0 @@ -require qt5.inc -require qt5-git.inc - -LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" -LIC_FILES_CHKSUM = " \ - file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ - file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ - file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ - file://examples/webkitwidgets/scroller/wheel/main.cpp;endline=39;md5=b0739af76072fbe303dc04b6941e054f \ - file://examples/webkitwidgets/imageanalyzer/imageanalyzer.cpp;endline=39;md5=b0739af76072fbe303dc04b6941e054f \ -" - -SRC_URI += "file://0001-Fix-build-with-qt-5.11.patch" - -PACKAGECONFIG ?= "examples" - -DEPENDS += "qtwebkit qtxmlpatterns" -RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" -RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" - -QT_MODULE_BRANCH = "dev" - -SRCREV = "2d68492004bf4ba49cf58c9bd72706cb282cf59b" -- cgit v1.2.3-54-g00ecf