update/port to 95.0.4638.50

args.gn

@@ -3,8 +3,8 @@ target_os = "android"
 target_cpu = "arm64"
 
 android_channel = "stable"
-android_default_version_name = "94.0.4606.85"
-android_default_version_code = "460608500"
+android_default_version_name = "95.0.4638.50"
+android_default_version_code = "463805000"
 
 is_component_build = false
 is_debug = false

patches/0001-disable-checkout_nacl.patch

@@ -1,14 +1,14 @@
-From 37f548af699d80d69bfa0dfe6af6e114f8db9d0b Mon Sep 17 00:00:00 2001
+From a272cbabe582ea0b9fa12492a880ef4d1f5bf9f4 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Sat, 21 Nov 2020 01:30:06 -0500
-Subject: [PATCH 01/76] disable checkout_nacl
+Subject: [PATCH 01/77] disable checkout_nacl
 
 ---
  DEPS | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/DEPS b/DEPS
-index c9e3829fcc236..778904f718844 100644
+index 3d8b7c4ac2f20..375cf7085d66e 100644
 --- a/DEPS
 +++ b/DEPS
 @@ -111,7 +111,7 @@ vars = {
@@ -21,5 +21,5 @@ index c9e3829fcc236..778904f718844 100644
    # By default, do not check out src-internal. This can be overridden e.g. with
    # custom_vars.
 -- 
-2.33.0
+2.33.1
 

patches/0002-use-64-bit-WebView-processes.patch

@@ -1,7 +1,7 @@
-From 2057205ca28fb8fa0f58cb4a94e25be00dd4f73d Mon Sep 17 00:00:00 2001
+From 07df55ccc14c76d6a497a91c1a8b35e668b8c58f Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Thu, 26 Jan 2017 01:30:12 -0500
-Subject: [PATCH 02/76] use 64-bit WebView processes
+Subject: [PATCH 02/77] use 64-bit WebView processes
 
 ---
  android_webview/nonembedded/java/AndroidManifest.xml | 1 -
@@ -20,5 +20,5 @@ index 640cc51d9eac1..289fd730f116d 100644
          {# This part is shared between stand-alone WebView and Monochrome #}
          {% macro common(manifest_package, webview_lib) %}
 -- 
-2.33.0
+2.33.1
 

patches/0003-switch-to-fstack-protector-strong.patch

@@ -1,17 +1,17 @@
-From 5a3b9160bc513ac522e454e10f666226264dd9c4 Mon Sep 17 00:00:00 2001
+From 8755f90fc2fc8bac21d60d306f3a963f4a998c1c Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Wed, 26 Dec 2018 10:20:24 -0500
-Subject: [PATCH 03/76] switch to -fstack-protector-strong
+Subject: [PATCH 03/77] switch to -fstack-protector-strong
 
 ---
  build/config/compiler/BUILD.gn | 6 +-----
  1 file changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index d7073ad38f0bf..c6b72a7894d9b 100644
+index 219a2be0e1a1f..5e9d9df4be186 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -333,16 +333,12 @@ config("compiler") {
+@@ -334,16 +334,12 @@ config("compiler") {
          cflags += [ "-fstack-protector" ]
        }
      } else if ((is_posix && !is_chromeos_ash && !is_nacl) || is_fuchsia) {
@@ -30,5 +30,5 @@ index d7073ad38f0bf..c6b72a7894d9b 100644
      }
 
 -- 
-2.33.0
+2.33.1
 

patches/0004-enable-fwrapv-in-Clang-for-non-UBSan-builds.patch

@@ -1,17 +1,17 @@
-From c98f2542c510ddf6660f9f2998037f120ce4747e Mon Sep 17 00:00:00 2001
+From 1e1b175766600d403d58ae2eaff7fd540819ae78 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Thu, 22 Dec 2016 07:15:34 -0500
-Subject: [PATCH 04/76] enable -fwrapv in Clang for non-UBSan builds
+Subject: [PATCH 04/77] enable -fwrapv in Clang for non-UBSan builds
 
 ---
  build/config/compiler/BUILD.gn | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index c6b72a7894d9b..7d48076798362 100644
+index 5e9d9df4be186..e86b68cec1660 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -349,6 +349,10 @@ config("compiler") {
+@@ -350,6 +350,10 @@ config("compiler") {
        }
      }
 
@@ -23,5 +23,5 @@ index c6b72a7894d9b..7d48076798362 100644
      if (fatal_linker_warnings && !is_apple && current_os != "aix") {
        ldflags += [ "-Wl,--fatal-warnings" ]
 -- 
-2.33.0
+2.33.1
 

patches/0005-enable-ftrivial-auto-var-init-zero.patch

@@ -1,17 +1,17 @@
-From d526e3c3d9665c5f30a2ad6301375d336cb710a2 Mon Sep 17 00:00:00 2001
+From ae00db5ad9b6d22167ed6d2b79855ef8fea89774 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Wed, 8 Apr 2020 20:48:17 -0400
-Subject: [PATCH 05/76] enable -ftrivial-auto-var-init=zero
+Subject: [PATCH 05/77] enable -ftrivial-auto-var-init=zero
 
 ---
  build/config/compiler/BUILD.gn | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 7d48076798362..25f3ffbeff64d 100644
+index e86b68cec1660..72fa768bcb698 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -353,6 +353,10 @@ config("compiler") {
+@@ -354,6 +354,10 @@ config("compiler") {
        cflags += [ "-fwrapv" ]
      }
 
@@ -23,5 +23,5 @@ index 7d48076798362..25f3ffbeff64d 100644
      if (fatal_linker_warnings && !is_apple && current_os != "aix") {
        ldflags += [ "-Wl,--fatal-warnings" ]
 -- 
-2.33.0
+2.33.1
 

patches/0006-disable-broken-warning-for-auto-var-init.patch

@@ -1,17 +1,17 @@
-From f557330bc1268e0eb4540d4b2f3afbc9af92424b Mon Sep 17 00:00:00 2001
+From cf0f0ed49498d56e71f91107dd75ad69ec308b03 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Thu, 21 May 2020 14:07:54 -0400
-Subject: [PATCH 06/76] disable broken warning for auto var init
+Subject: [PATCH 06/77] disable broken warning for auto var init
 
 ---
  build/config/compiler/BUILD.gn | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 25f3ffbeff64d..7c4192ae293d6 100644
+index 72fa768bcb698..26b5f90f28750 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -354,7 +354,7 @@ config("compiler") {
+@@ -355,7 +355,7 @@ config("compiler") {
      }
 
      if (is_clang) {
@@ -21,5 +21,5 @@ index 25f3ffbeff64d..7c4192ae293d6 100644
 
      # Linker warnings.
 -- 
-2.33.0
+2.33.1
 

patches/0007-Vanadium-branding.patch

@@ -1,7 +1,7 @@
-From b18555e2cd7357bb25c98c19f690a911e8530e5d Mon Sep 17 00:00:00 2001
-From: Daniel Micay <danielmicay@gmail.com>
-Date: Sun, 6 Aug 2017 12:45:14 -0400
-Subject: [PATCH 07/76] Vanadium branding
+From 82ad281d20f88b729ca0a96f8b5e86e0cf277023 Mon Sep 17 00:00:00 2001
+From: fgei <fgei@gmail.com>
+Date: Tue, 19 Oct 2021 02:21:18 +0000
+Subject: [PATCH 07/77] Vanadium branding
 
 Current incantation of the recolor command:
 
@@ -27,8 +27,8 @@ Current incantation of the recolor command:
  .../mipmap-xhdpi/app_icon.png                 | Bin 0 -> 3727 bytes
  .../mipmap-xxhdpi/app_icon.png                | Bin 0 -> 6160 bytes
  .../mipmap-xxxhdpi/app_icon.png               | Bin 0 -> 9104 bytes
- .../values/channel_constants.xml              |  11 +++
- 21 files changed, 63 insertions(+), 32 deletions(-)
+ .../values/channel_constants.xml              |  13 ++++
+ 21 files changed, 65 insertions(+), 32 deletions(-)
  create mode 100644 chrome/android/java/res_vanadium/DIR_METADATA
  create mode 100644 chrome/android/java/res_vanadium/OWNERS
  create mode 100644 chrome/android/java/res_vanadium/drawable-hdpi/fre_product_logo.png
@@ -51,7 +51,7 @@ Current incantation of the recolor command:
  create mode 100644 chrome/android/java/res_vanadium_base/values/channel_constants.xml
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index dd4823f855818..a7f0f8079601b 100644
+index d440e71a0d886..0ce403ecb6457 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
 @@ -174,12 +174,12 @@ android_resources("chrome_base_module_resources") {
@@ -100,7 +100,7 @@ index dd4823f855818..a7f0f8079601b 100644
    ]
 
    deps = [
-@@ -1726,16 +1726,16 @@ if (enable_vr || enable_arcore) {
+@@ -1787,16 +1787,16 @@ if (enable_vr || enable_arcore) {
  android_resources("chrome_public_apk_resources") {
    resource_overlay = true
    sources = [
@@ -127,7 +127,7 @@ index dd4823f855818..a7f0f8079601b 100644
    ]
 
    # Dep needed to ensure override works properly.
-@@ -1746,12 +1746,12 @@ android_resources("chrome_public_apk_resources") {
+@@ -1807,12 +1807,12 @@ android_resources("chrome_public_apk_resources") {
  android_resources("chrome_public_apk_base_module_resources") {
    resource_overlay = true
    sources = [
@@ -3013,10 +3013,10 @@ Hc-jL100001
 
 diff --git a/chrome/android/java/res_vanadium_base/values/channel_constants.xml b/chrome/android/java/res_vanadium_base/values/channel_constants.xml
 new file mode 100644
-index 0000000000000..3fb97b4d5dc97
+index 0000000000000..5f6ad0acfe41f
 --- /dev/null
 +++ b/chrome/android/java/res_vanadium_base/values/channel_constants.xml
-@@ -0,0 +1,11 @@
+@@ -0,0 +1,13 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<!-- Copyright 2015 The Chromium Authors. All rights reserved.
 +     Use of this source code is governed by a BSD-style license that can be
@@ -3027,7 +3027,9 @@ index 0000000000000..3fb97b4d5dc97
 +    <string name="app_name" translatable="false">Vanadium</string>
 +    <string name="bookmark_widget_title" translatable="false">Vanadium bookmarks</string>
 +    <string name="search_widget_title" translatable="false">Vanadium search</string>
++    <string name="quick_action_search_widget_title" translatable="false">Vanadium quick action search</string>
++    <string name="dino_widget_title" translatable="false">Vanadiium dino</string>
 +</resources>
 -- 
-2.33.0
+2.33.1
 

patches/0008-Vanadium-branding-for-WebView.patch

@@ -1,7 +1,7 @@
-From ab5235d637236237508d20f967ca9eb85c164526 Mon Sep 17 00:00:00 2001
+From 78274805c80bb8aaf7b5bfa438aefa632efb3eaf Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Sun, 16 Feb 2020 13:40:14 -0500
-Subject: [PATCH 08/76] Vanadium branding for WebView
+Subject: [PATCH 08/77] Vanadium branding for WebView
 
 ---
  android_webview/nonembedded/java/AndroidManifest.xml | 2 +-
@@ -21,5 +21,5 @@ index 289fd730f116d..74a938c989acb 100644
                   android:name="{{ application_name|default('org.chromium.android_webview.nonembedded.WebViewApkApplication') }}"
                   android:multiArch="true"
 -- 
-2.33.0
+2.33.1