diff options
author | Lorenzo Tilve <ltilve@igalia.com> | 2020-01-24 17:39:56 +0100 |
---|---|---|
committer | Lorenzo Tilve <ltilve@igalia.com> | 2020-01-24 18:40:03 +0100 |
commit | 686a0a6dd2acf07b0cbbd7c71156319c26713081 (patch) | |
tree | dd8048627f9161cad6a1a2a08b341fe248776d37 /meta-agl-profile-graphical-html5/recipes-wam/wam/files | |
parent | 3df10d0f1f92a3ec378a330cb98a1416980781b2 (diff) |
wam: revision bump, fix WAM on icefishicefish_8.99.5icefish/8.99.58.99.5
Included changes:
* a9e0093 Disable tinyproxy integration
* c0def20 [agl] Fix regex scanning
* c7b5db7 [agl] Handle hostname of application
* 4a00711 [agl] Retrieve token from environmen
* 7d4c91e Hard-code windowmanager roles for certain app ids
* files/trunc-webapp-roles.patch workaround repeated roles
Bumps WAM version and includes workaround for SPEC-3127. To
prevent repeated roles as much as possible, I'm using the
appid as a basis instead of "Webapp-" + host + port, which has
many chances to be redundant in the first 12 chars.
Bug-AGL: SPEC-2550
Bug-AGL: SPEC-3127
Signed-off-by: Lorenzo Tilve <ltilve@igalia.com>
Change-Id: I59c37ce79fec61ecd6ef36ff3f74902714a6b575
Diffstat (limited to 'meta-agl-profile-graphical-html5/recipes-wam/wam/files')
-rw-r--r-- | meta-agl-profile-graphical-html5/recipes-wam/wam/files/trunc-webapp-roles.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/meta-agl-profile-graphical-html5/recipes-wam/wam/files/trunc-webapp-roles.patch b/meta-agl-profile-graphical-html5/recipes-wam/wam/files/trunc-webapp-roles.patch new file mode 100644 index 00000000..63ad8208 --- /dev/null +++ b/meta-agl-profile-graphical-html5/recipes-wam/wam/files/trunc-webapp-roles.patch @@ -0,0 +1,53 @@ +From 870dd9c0e80d2f7ce843399f606299629ae7b570 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com> +Date: Thu, 23 Jan 2020 11:57:23 +0100 +Subject: [PATCH] Set webapp roles that are max 12 characters long. + +This is a workaround for SPEC-3127. To prevent repeated roles as much +as possible, I'm using the appid as a basis instead of "Webapp-" + +host + port, which has many chances to be redundant in the first 12 +chars. + +Bug-AGL: SPEC-3127 +--- + src/agl/WebRuntimeAGL.cpp | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +diff --git a/src/agl/WebRuntimeAGL.cpp b/src/agl/WebRuntimeAGL.cpp +index a919759..baa2708 100644 +--- a/src/agl/WebRuntimeAGL.cpp ++++ b/src/agl/WebRuntimeAGL.cpp +@@ -162,7 +162,6 @@ int WebAppLauncherRuntime::run(int argc, const char** argv) { + bool isWaitHostService = isWaitForHostService(args); + m_id = getAppId(args); + m_url = getAppUrl(args); +- m_role = "WebApp"; + + if(isWaitHostService) { + while(!WebAppManagerServiceAGL::instance()->isHostServiceRunning()) { +@@ -220,15 +219,9 @@ bool WebAppLauncherRuntime::init() { + if (n != std::string::npos) { + std::string sport = authority.substr(n+1); + m_host = authority.substr(0, n); +- m_role.push_back('-'); +- m_role.append(m_host); +- m_role.push_back('-'); +- m_role.append(sport); + m_port = stringTo<int>(sport); + } else { + m_host = authority; +- m_role.push_back('-'); +- m_role.append(m_host); + } + } + +@@ -265,6 +258,9 @@ bool WebAppLauncherRuntime::init() { + m_role = "homescreen"; + else if (m_id.rfind("webapps-homescreen", 0) == 0) + m_role = "homescreen"; ++ else { ++ m_role = m_id.substr(0,12); ++ } + + LOG_DEBUG("id=[%s], name=[%s], role=[%s], url=[%s], host=[%s], port=%d, token=[%s]", + m_id.c_str(), m_name.c_str(), m_role.c_str(), m_url.c_str(), |