From 1455ac09ce2334853b9a9b8c5305016f15b1d379 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh>
Date: Wed, 14 Mar 2018 22:30:47 +0100
Subject: [PATCH] web-runtime: Use runxdg for running QtWebEngine
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Bug-AGL: SPEC-1346

Change-Id: I4783d06b008864a4703afe7364c5bec413590fc0
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
---
 recipes-graphics/web-runtime/web-runtime/web-runtime | 19 +++++++++++++++++--
 recipes-graphics/web-runtime/web-runtime_0.1.bb      |  3 +++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/recipes-graphics/web-runtime/web-runtime/web-runtime b/recipes-graphics/web-runtime/web-runtime/web-runtime
index 80685eb81..ad7915553 100755
--- a/recipes-graphics/web-runtime/web-runtime/web-runtime
+++ b/recipes-graphics/web-runtime/web-runtime/web-runtime
@@ -1,2 +1,17 @@
-#!/bin/sh
-exec /usr/bin/qt5/qmlscene "$1" /usr/bin/web-runtime.qml
+#!/bin/bash
+export -n QT_WAYLAND_SHELL_INTEGRATION
+port=$(echo -n "$1" | sed 's,.*local.*:\([^/]*\)/.*,\1,')
+token=$(echo -n "$1" | sed 's,.*token=,,')
+export AFM_APP_INSTALL_DIR=$(mktemp -d)
+cat << EOC >  $AFM_APP_INSTALL_DIR/runxdg.toml
+[application]
+role = "WebBrowser"
+method = "POSIX"
+path = "/usr/bin/qt5/qmlscene"
+params = [
+     "$1",
+     "/usr/bin/web-runtime.qml"
+]
+EOC
+/usr/bin/runxdg "$port" "$token"
+rm -rf $AFM_APP_INSTALL_DIR
diff --git a/recipes-graphics/web-runtime/web-runtime_0.1.bb b/recipes-graphics/web-runtime/web-runtime_0.1.bb
index bdfcbecb0..ea5acbbf7 100644
--- a/recipes-graphics/web-runtime/web-runtime_0.1.bb
+++ b/recipes-graphics/web-runtime/web-runtime_0.1.bb
@@ -16,6 +16,9 @@ RDEPENDS_${PN} = "\
   qtdeclarative-tools \
   qtwayland-qmlplugins \
   qtquickcontrols-qmlplugins \
+  qtwebengine \
+  runxdg \
+  bash \
 "
 
 PROVIDES += "virtual/webruntime"
-- 
2.16.6