X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-wam%2Fwam%2Ffiles%2Ftrunc-webapp-roles.patch;fp=recipes-wam%2Fwam%2Ffiles%2Ftrunc-webapp-roles.patch;h=0000000000000000000000000000000000000000;hb=4f068a70332bc9e64c85146a8cbf54c747928795;hp=829abe07fa660214a2df8e1b6e2a211349a65741;hpb=e82b00a13a62499fdbca9505daaa69b35bf2f77d;p=AGL%2Fmeta-agl-demo.git

diff --git a/recipes-wam/wam/files/trunc-webapp-roles.patch b/recipes-wam/wam/files/trunc-webapp-roles.patch
deleted file mode 100644
index 829abe07f..000000000
--- a/recipes-wam/wam/files/trunc-webapp-roles.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From f31e93261f34abaa3dcdc4959963f5b5a8983002 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan-Simon=20M=C3=B6ller?= <jsmoeller@linuxfoundation.org>
-Date: Thu, 25 Jun 2020 19:47:24 +0200
-Subject: [PATCH] Set webapp roles that are max 12 characters long.
-
-From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
-
-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 aed928b..efd2ee4 100644
---- a/src/agl/WebRuntimeAGL.cpp
-+++ b/src/agl/WebRuntimeAGL.cpp
-@@ -274,7 +274,6 @@ int WebAppLauncherRuntime::run(int argc, const char** argv) {
- 
-   m_id = getAppId(args);
-   m_url = getAppUrl(args);
--  m_role = "WebApp";
- 
-   setup_signals();
- 
-@@ -326,15 +325,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);
-       }
-     }
- 
-@@ -375,6 +368,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], width=[%s], height[%s], surface_type[%d], panel_type[%d]",
-             m_id.c_str(), m_name.c_str(), m_role.c_str(), m_url.c_str(),