From 2b75334dbb3846715b55436da35f59b4848afd7d Mon Sep 17 00:00:00 2001
From: Roger Zanoni <rzanoni@igalia.com>
Date: Wed, 14 Apr 2021 13:32:10 +0200
Subject: Update run scripts for chromium84

Bug-AGL: SPEC-3830
Signed-off-by: Roger Zanoni <rzanoni@igalia.com>
Change-Id: I910ec4d01ba9ec52647b24d79180a8dd732fe1d7
---
 CMakeLists.txt            | 18 +++++-------------
 README.md                 | 14 +++++++-------
 conf.d/cmake/config.cmake |  6 +++---
 runchrome.sh              | 26 ++++++++++++++++++++++++++
 runxdg.sh                 |  2 --
 runxdg.toml               | 19 -------------------
 6 files changed, 41 insertions(+), 44 deletions(-)
 create mode 100644 runchrome.sh
 delete mode 100644 runxdg.sh
 delete mode 100644 runxdg.toml

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b732286..723a5c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,19 +20,11 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.3)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/cmake/config.cmake)
 
-add_custom_command(OUTPUT ${PROJECT_PKG_BUILD_DIR}/runxdg.toml
-  COMMAND mkdir -p ${PROJECT_PKG_BUILD_DIR}
-  COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/runxdg.toml ${PROJECT_PKG_BUILD_DIR}/runxdg.toml
-)
-
-add_custom_target(runxdg_toml DEPENDS ${PROJECT_PKG_BUILD_DIR}/runxdg.toml)
-add_dependencies(widget runxdg_toml)
-
-add_custom_command(OUTPUT ${PACKAGE_BINDIR}/runxdg
+add_custom_command(OUTPUT ${PACKAGE_BINDIR}/runchrome
   COMMAND mkdir -p ${PACKAGE_BINDIR}
-  COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/runxdg.sh ${PACKAGE_BINDIR}/runxdg
-  COMMAND chmod +x ${PACKAGE_BINDIR}/runxdg
+  COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/runchrome.sh ${PACKAGE_BINDIR}/runchrome
+  COMMAND chmod +x ${PACKAGE_BINDIR}/runchrome
 )
 
-add_custom_target(runxdg_script DEPENDS ${PACKAGE_BINDIR}/runxdg)
-add_dependencies(widget runxdg_script)
+add_custom_target(runchrome_script DEPENDS ${PACKAGE_BINDIR}/runchrome)
+add_dependencies(widget runchrome_script)
diff --git a/README.md b/README.md
index d21c82a..17e416d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Chromium68 browser service
+# Chromium84 browser service
 
 ## Overview
 
@@ -15,13 +15,13 @@ application framework recipes.
 ## Implementation notes
 
 This package does not contain the browser itself:
-* chromium68 recipe will build Chromium68, and the WAM webview.
-* chromium68 installed package will contain libcbe.so, that is a shared
-  library used both by Chromium68 browser and by WAM.
-* chromium68-browser installed package contains the actual executable
+* chromium84 recipe will build Chromium84, and the WAM webview.
+* chromium84 installed package will contain libcbe.so, that is a shared
+  library used both by Chromium84 browser and by WAM.
+* chromium84-browser installed package contains the actual executable
   and resources that are specific to the browser, but not used by WAM.
-* chromium68-browser-service prepares a wgt file that points to the
-  executable installed by chromium68-browser.
+* chromium84-browser-service prepares a wgt file that points to the
+  executable installed by chromium84-browser.
 
 ## Copyright and License Information
 Copyright (c) 2018 LG Electronics, Inc.
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index ec913a3..0736e7b 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -18,8 +18,8 @@
 
 # Project Info
 # ------------------
-set(PROJECT_NAME chromium68-browser-service)
-set(PROJECT_PRETTY_NAME "Chromium68 browser service")
+set(PROJECT_NAME chromium84-browser-service)
+set(PROJECT_PRETTY_NAME "Chromium84 browser service")
 set(PROJECT_DESCRIPTION "AGL widget service for Chromium browser")
 set(PROJECT_URL "https://webosose.org")
 set(PROJECT_VERSION "1.0")
@@ -151,7 +151,7 @@ set(WIDGET_TYPE application/vnd.agl.native)
 # This is the file that will be executed, loaded,
 # at launch time by the application framework.
 #
-set(WIDGET_ENTRY_POINT bin/runxdg)
+set(WIDGET_ENTRY_POINT bin/runchrome)
 
 # Optional dependencies order
 # ---------------------------
diff --git a/runchrome.sh b/runchrome.sh
new file mode 100644
index 0000000..5e6d3c5
--- /dev/null
+++ b/runchrome.sh
@@ -0,0 +1,26 @@
+# Copyright 2021 Igalia, S.L.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#!/bin/sh
+
+PORT=$1
+
+exec /opt/chromium84/chrome \
+  --agl-appid="browser"\
+  --hs-port=$1\
+  --in-process-gpu\
+  --no-sandbox\
+  --enable-features=UseOzonePlatform\
+  --user-data-dir="/home/0/chrome"\
+  --ozone-platform=wayland
diff --git a/runxdg.sh b/runxdg.sh
deleted file mode 100644
index dac903c..0000000
--- a/runxdg.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/runxdg $@
diff --git a/runxdg.toml b/runxdg.toml
deleted file mode 100644
index dea4009..0000000
--- a/runxdg.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[application]
-# role: identifier for WindowManager (used in layers.json)
-# e.g. role = "WebBrowser"
-#role = "WebBrowser"
-role = "browser"
-
-# launch by "POSIX"(fork/exec), "AFM_DBUS"(afm via dbus),  "AFM_WEBSOCKET"(afm via websockt)
-method = "POSIX"
-
-# path: path to the executable
-# e.g.
-#   path = "/usr/bin/chromium"
-path = "/opt/chromium68/chrome"
-
-params = [
-  "--in-process-gpu",
-  "--no-sandbox"
-]
-
-- 
cgit 1.2.3-korg