summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Müller-Klieser <s.mueller-klieser@phytec.de>2020-06-03 15:12:08 +0200
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2020-06-08 15:31:49 +0200
commit0554f3bd79ec57e7f7100bd60811121fcac11656 (patch)
tree82e7fb328caeb6d85354a47d95f6625b6664153a
parentaf8a4f26989d4880cbbe1daf6f719b0828035864 (diff)
downloadmeta-yogurt-rocko.tar.bz2
meta-yogurt-rocko.zip
qtwebbrowser: update to latest version from qt 5.13.2rocko
The changes are backward compatible with qt 5.9. Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--recipes-qt/qtwebbrowser/qtwebbrowser/0001-project-fix-install-path-for-poky.patch30
-rw-r--r--recipes-qt/qtwebbrowser/qtwebbrowser_git.bb5
2 files changed, 3 insertions, 32 deletions
diff --git a/recipes-qt/qtwebbrowser/qtwebbrowser/0001-project-fix-install-path-for-poky.patch b/recipes-qt/qtwebbrowser/qtwebbrowser/0001-project-fix-install-path-for-poky.patch
deleted file mode 100644
index fa7cbe9..0000000
--- a/recipes-qt/qtwebbrowser/qtwebbrowser/0001-project-fix-install-path-for-poky.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6944d9acfef05b14471b5deb153fcf0bed89f0ea Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20M=C3=BCller-Klieser?= <s.mueller-klieser@phytec.de>
-Date: Thu, 26 Jan 2017 00:02:28 +0100
-Subject: [PATCH] project: fix install path for poky
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-status: not applicable, poky specific
-
-Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
----
- src/src.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/src.pro b/src/src.pro
-index 79e4bdc..f5c9269 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -38,6 +38,6 @@ RESOURCES += resources.qrc
- HEADERS += touchmockingapplication.h
- QT += gui-private
- } else {
-- target.path =/data/user/qt/qtwebbrowser-app
-+ target.path = $$(bindir)
- INSTALLS += target
- }
---
-1.9.1
-
diff --git a/recipes-qt/qtwebbrowser/qtwebbrowser_git.bb b/recipes-qt/qtwebbrowser/qtwebbrowser_git.bb
index 2d26f73..3c6ef4c 100644
--- a/recipes-qt/qtwebbrowser/qtwebbrowser_git.bb
+++ b/recipes-qt/qtwebbrowser/qtwebbrowser_git.bb
@@ -10,13 +10,12 @@ QT_MODULE = "qt-apps-qtwebbrowser"
QT_MODULE_BRANCH = "dev"
SRC_URI += " \
- file://0001-project-fix-install-path-for-poky.patch \
file://0002-qtwebbrowser-add-application-mode.patch \
file://wait-for-server.sh \
file://${PN}.service \
"
-SRCREV = "023733af5523a5ad84359926224fa106001215f4"
+SRCREV = "93637d1b4f32a1f73613f70b29544f232059d600"
DEPENDS = "qtbase qtdeclarative qtwebengine"
@@ -25,6 +24,8 @@ PACKAGECONFIG[desktop] = "-DDESKTOP_BUILD,,"
SYSTEMD_SERVICE_${PN} = "${PN}.service"
+EXTRA_QMAKEVARS_PRE += "INSTALL_PREFIX=${bindir}"
+
do_install_append() {
install -Dm 0644 ${WORKDIR}/${PN}.service ${D}${systemd_system_unitdir}/${PN}.service
install -Dm 0755 ${WORKDIR}/wait-for-server.sh ${D}${bindir}/wait-for-server.sh