Update to 91.0.4472.106-1

5 files changed, 48 insertions, 80 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cc3aa57eb167..c7006d7a82f0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = chromium-no-extras
 	pkgdesc = Chromium without hangout services, widevine, pipewire, or chromedriver
-	pkgver = 91.0.4472.77
+	pkgver = 91.0.4472.106
 	pkgrel = 1
 	url = https://www.chromium.org/Home
 	arch = x86_64
@@ -48,28 +48,25 @@ pkgbase = chromium-no-extras
 	optdepends = kdialog: support for native dialogs in Plasma
 	optdepends = org.freedesktop.secrets: password storage backend on GNOME / Xfce
 	optdepends = kwallet: support for storing passwords in KWallet on Plasma
-	provides = chromium=91.0.4472.77
+	provides = chromium=91.0.4472.106
 	conflicts = chromium
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-91.0.4472.77.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-91.0.4472.106.tar.xz
 	source = https://github.com/foutrelis/chromium-launcher/archive/v7/chromium-launcher-7.tar.gz
 	source = https://github.com/stha09/chromium-patches/releases/download/chromium-91-patchset-5/chromium-91-patchset-5.tar.xz
 	source = fix-crash-in-ThemeService.patch
 	source = unbundle-use-char16_t-as-UCHAR_TYPE.patch
-	source = add-clang-nomerge-attribute-to-CheckError.patch
+	source = extend-enable-accelerated-video-decode-flag.patch
 	source = sql-make-VirtualCursor-standard-layout-type.patch
 	source = chromium-glibc-2.33.patch
-	source = unexpire-accelerated-video-decode-flag.patch
 	source = use-oauth2-client-switches-as-default.patch
-	sha256sums = 45d5a43ef798d20313c78fa8a075be0c22055e39c8481eb53eabda81df901b31
+	sha256sums = 545e38cd7dce0008c16ab5736ac9764655149e65d353630adac601da040dbebb
 	sha256sums = 86859c11cfc8ba106a3826479c0bc759324a62150b271dd35d1a0f96e890f52f
 	sha256sums = 171525009003a9ed1182cfcb6f407d7169d9a731a474304e263029376719f55a
 	sha256sums = 3cfe46e181cb9d337c454b5b5adbf5297052f29cd617cdee4380eeb1943825d8
 	sha256sums = 59a59a60a08b335fe8647fdf0f9d2288d236ebf2cc9626396d0c4d032fd2b25d
-	sha256sums = 50133dd196d288ad538bb536aa51dccd6cb4aacfd9a60160f77e8fb16034b460
+	sha256sums = 66db9132d6f5e06aa26e5de0924f814224a76a9bdf4b61afce161fb1d7643b22
 	sha256sums = dd317f85e5abfdcfc89c6f23f4c8edbcdebdd5e083dcec770e5da49ee647d150
 	sha256sums = 2fccecdcd4509d4c36af873988ca9dbcba7fdb95122894a9fdf502c33a1d7a4b
-	sha256sums = 82a85105fc33b92a84dabb7ed6725ccbb56f1075c11f9f3f43bb8ff724f88847
 	sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711
 
 pkgname = chromium-no-extras
-
diff --git a/PKGBUILD b/PKGBUILD
index 5700294ab2c1..d361bd0f7439 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=chromium-no-extras
-pkgver=91.0.4472.77
+pkgver=91.0.4472.106
 pkgrel=1
 _pkgname=chromium
 _launcher_ver=7
@@ -30,20 +30,18 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/$_pkg
         https://github.com/stha09/chromium-patches/releases/download/chromium-${pkgver%%.*}-patchset-$_gcc_patchset/chromium-${pkgver%%.*}-patchset-$_gcc_patchset.tar.xz
         fix-crash-in-ThemeService.patch
         unbundle-use-char16_t-as-UCHAR_TYPE.patch
-        add-clang-nomerge-attribute-to-CheckError.patch
+        extend-enable-accelerated-video-decode-flag.patch
         sql-make-VirtualCursor-standard-layout-type.patch
         chromium-glibc-2.33.patch
-        unexpire-accelerated-video-decode-flag.patch
         use-oauth2-client-switches-as-default.patch)
-sha256sums=('45d5a43ef798d20313c78fa8a075be0c22055e39c8481eb53eabda81df901b31'
+sha256sums=('545e38cd7dce0008c16ab5736ac9764655149e65d353630adac601da040dbebb'
             '86859c11cfc8ba106a3826479c0bc759324a62150b271dd35d1a0f96e890f52f'
             '171525009003a9ed1182cfcb6f407d7169d9a731a474304e263029376719f55a'
             '3cfe46e181cb9d337c454b5b5adbf5297052f29cd617cdee4380eeb1943825d8'
             '59a59a60a08b335fe8647fdf0f9d2288d236ebf2cc9626396d0c4d032fd2b25d'
-            '50133dd196d288ad538bb536aa51dccd6cb4aacfd9a60160f77e8fb16034b460'
+            '66db9132d6f5e06aa26e5de0924f814224a76a9bdf4b61afce161fb1d7643b22'
             'dd317f85e5abfdcfc89c6f23f4c8edbcdebdd5e083dcec770e5da49ee647d150'
             '2fccecdcd4509d4c36af873988ca9dbcba7fdb95122894a9fdf502c33a1d7a4b'
-            '82a85105fc33b92a84dabb7ed6725ccbb56f1075c11f9f3f43bb8ff724f88847'
             'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711')
 
 # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
@@ -98,18 +96,13 @@ prepare() {
   # runtime -- this allows signing into Chromium without baked-in values
   patch -Np1 -i ../use-oauth2-client-switches-as-default.patch
 
-  # https://crbug.com/1207478
-  patch -Np0 -i ../unexpire-accelerated-video-decode-flag.patch
-
   # https://crbug.com/1164975
   patch -Np1 -i ../chromium-glibc-2.33.patch
 
   # Upstream fixes
   patch -Np1 -i ../fix-crash-in-ThemeService.patch
   patch -Np1 -i ../unbundle-use-char16_t-as-UCHAR_TYPE.patch
-
-  # Revert addition of [[clang::nomerge]] attribute; not supported by clang 11
-  patch -Rp1 -i ../add-clang-nomerge-attribute-to-CheckError.patch
+  patch -Np1 -i ../extend-enable-accelerated-video-decode-flag.patch
 
   # https://chromium-review.googlesource.com/c/chromium/src/+/2862724
   patch -Np1 -i ../sql-make-VirtualCursor-standard-layout-type.patch
@@ -143,9 +136,8 @@ prepare() {
 }
 
 build() {
-  # optionally hard code makepkg defaults/modify to fit your specific hardware
-  #unset CFLAGS CXXFLAGS
-  #CFLAGS="-march=haswell -O2 -pipe -fno-plt -fexceptions -Wp,-D_FORTIFY_SOURCE=2,-D_GLIBCXX_ASSERTIONS -Wformat -Werror=format-security -fstack-clash-protection -fcf-protection"
+  # optionally modify to fit your specific hardware
+  #CFLAGS=" -march=haswell -mtune=haswell"
   #CXXFLAGS="${CFLAGS}"
 
   make -C chromium-launcher-$_launcher_ver
@@ -162,7 +154,6 @@ build() {
     'host_toolchain="//build/toolchain/linux/unbundle:default"'
     'clang_use_chrome_plugins=false'
     'is_official_build=true' # implies is_cfi=true on x86_64
-    'chrome_pgo_phase=0' # needs newer clang to read the bundled PGO profile
     'treat_warnings_as_errors=false'
     'fieldtrial_testing_like_official_build=true'
     'ffmpeg_branding="Chrome"'
diff --git a/add-clang-nomerge-attribute-to-CheckError.patch b/add-clang-nomerge-attribute-to-CheckError.patch
deleted file mode 100644
index 4154df66c6b9..000000000000
--- a/add-clang-nomerge-attribute-to-CheckError.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 9909f146b28d56c9c0411329a056ed959b33f76a Mon Sep 17 00:00:00 2001
-From: Zequan Wu <zequanwu@google.com>
-Date: Wed, 10 Feb 2021 03:26:00 +0000
-Subject: [PATCH] Reland "Add [[clang::nomerge]] attribute to ~CheckError()."
-
-This is a reland of 8860253376c38c090d585bda4b20b801e3aa3ce3
-
-Original change's description:
-> Add [[clang::nomerge]] attribute to ~CheckError().
->
-> To disable merging multiple ~CheckError() destructor for accurate crash logs.
->
-> Bug: 1153188
-> Change-Id: If6d153661667a63f13b645f6d284eb3d5ea3a300
-> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2611331
-> Commit-Queue: Nico Weber <thakis@chromium.org>
-> Auto-Submit: Zequan Wu <zequanwu@google.com>
-> Reviewed-by: Nico Weber <thakis@chromium.org>
-> Cr-Commit-Position: refs/heads/master@{#844989}
-
-Bug: 1153188
-Change-Id: I303c5ff9fb88f7a30663400622b327a910d0b108
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2686331
-Reviewed-by: Nico Weber <thakis@chromium.org>
-Commit-Queue: Nico Weber <thakis@chromium.org>
-Commit-Queue: Zequan Wu <zequanwu@google.com>
-Cr-Commit-Position: refs/heads/master@{#852453}
----
- base/check.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/base/check.h b/base/check.h
-index c94ab68db90..17048e45539 100644
---- a/base/check.h
-+++ b/base/check.h
-@@ -85,7 +85,7 @@ class BASE_EXPORT CheckError {
-   // Stream for adding optional details to the error message.
-   std::ostream& stream();
- 
--  ~CheckError();
-+  NOMERGE ~CheckError();
- 
-   CheckError(const CheckError& other) = delete;
-   CheckError& operator=(const CheckError& other) = delete;
diff --git a/extend-enable-accelerated-video-decode-flag.patch b/extend-enable-accelerated-video-decode-flag.patch
new file mode 100644
index 000000000000..51e346fa4355
--- /dev/null
+++ b/extend-enable-accelerated-video-decode-flag.patch
@@ -0,0 +1,35 @@
+From e48f18eba0eae199ba7bc8a6a09ebf39799447c1 Mon Sep 17 00:00:00 2001
+From: Ted Meyer <tmathmeyer@chromium.org>
+Date: Wed, 2 Jun 2021 05:35:22 +0000
+Subject: [PATCH] Extend enable-accelerated-video-decode flag for linux to m93
+
+It appears that there is insistence that the flag be totally removed or
+have its end-milestone increased, I can't just let it wait until the
+feature is working again and then re-enable it. So i've moved it to 93.
+
+R=dalecurtis
+
+Fixed: 1207478
+Change-Id: I26a5e790cd390825516b4a4b6af88e89b2d4f4eb
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2918478
+Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
+Reviewed-by: Ted Meyer <tmathmeyer@chromium.org>
+Commit-Queue: Ted Meyer <tmathmeyer@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#888312}
+---
+ chrome/browser/flag-metadata.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
+index 67e0330436..34542671f2 100644
+--- a/chrome/browser/flag-metadata.json
++++ b/chrome/browser/flag-metadata.json
+@@ -1193,7 +1193,7 @@
+   {
+     "name": "enable-accelerated-video-decode",
+     "owners": [ "media-dev@chromium.org" ],
+-    "expiry_milestone": 90
++    "expiry_milestone": 93
+   },
+   {
+     "name": "enable-accessibility-live-caption",
diff --git a/unexpire-accelerated-video-decode-flag.patch b/unexpire-accelerated-video-decode-flag.patch
deleted file mode 100644
index 25823feecdc4..000000000000
--- a/unexpire-accelerated-video-decode-flag.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/flag-metadata.json.orig	2021-05-20 15:34:12.194906381 +0000
-+++ chrome/browser/flag-metadata.json	2021-05-20 15:17:31.632112834 +0000
-@@ -1253,7 +1253,7 @@
-   {
-     "name": "enable-accelerated-video-decode",
-     "owners": [ "media-dev@chromium.org" ],
--    "expiry_milestone": 90
-+    "expiry_milestone": 91
-   },
-   {
-     "name": "enable-accessibility-live-caption",