Merge pull request #9454 from IdrisKalp/master

chromium-browser 91.0.4472.77 fix

network/web/chromium-browser/files/chromium-91-java-only-allowed-in-android-builds.patch

@@ -0,0 +1,17 @@
+References: https://bugs.chromium.org/p/chromium/issues/detail?id=1192875
+
+Index: chromium-91.0.4472.57/third_party/closure_compiler/compiler.py
+===================================================================
+--- chromium-91.0.4472.57.orig/third_party/closure_compiler/compiler.py
++++ chromium-91.0.4472.57/third_party/closure_compiler/compiler.py
+@@ -13,8 +13,7 @@ import subprocess
+ 
+ 
+ _CURRENT_DIR = os.path.join(os.path.dirname(__file__))
+-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
+-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
++_JAVA_PATH = "java"
+ 
+ class Compiler(object):
+   """Runs the Closure compiler on given source files to typecheck them
+ 

network/web/chromium-browser/files/chromium-buildname.patch

@@ -0,0 +1,14 @@
+Index: chromium-73.0.3683.27/components/version_ui_strings.grdp
+===================================================================
+--- chromium-73.0.3683.27.orig/components/version_ui_strings.grdp
++++ chromium-73.0.3683.27/components/version_ui_strings.grdp
+@@ -7,7 +7,7 @@
+     Official Build
+   </message>
+   <message name="IDS_VERSION_UI_UNOFFICIAL" desc="unofficial build on the about:version page">
+-    Developer Build
++    PisiLinux Build
+   </message>
+   <message name="IDS_VERSION_UI_32BIT" desc="32-bit on the chrome://version page">
+     (32-bit)
+ 

network/web/chromium-browser/pspec.xml

@@ -106,6 +106,8 @@
             <Patch level="1">fix-crash-in-ThemeService.patch</Patch>
             <Patch level="1">sql-make-VirtualCursor-standard-layout-type.patch</Patch>
             <Patch level="1">use-oauth2-client-switches-as-default.patch</Patch>
+            <Patch level="1">chromium-91-java-only-allowed-in-android-builds.patch</Patch>
+            <Patch level="1">chromium-buildname.patch</Patch>
             <Patch level="1">wayland-egl.patch</Patch>
             <!-- Chromium Patchset -->
             <!-- Source: https://github.com/stha09/chromium-patches -->