Update to 75.0.3770.90-3

3 files changed, 43 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0f374009a600..0beedfeba086 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = chromium-no-extras
 	pkgdesc = Chromium without hangout services, widevine, pipewire
 	pkgver = 75.0.3770.90
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.chromium.org/Home
 	install = chromium.install
 	arch = x86_64
@@ -58,6 +58,7 @@ pkgbase = chromium-no-extras
 	source = chromium-launcher-6.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v6.tar.gz
 	source = chromium-system-icu.patch
 	source = libstdc-do-not-assume-unique_ptr-has-ostream-operator.patch
+	source = disallow-partial-swaps-for-linux-based-on-gl_version.patch
 	source = chromium-fix-window-flash-for-some-WMs.patch
 	source = chromium-widevine.patch
 	source = chromium-skia-harmony.patch
@@ -65,6 +66,7 @@ pkgbase = chromium-no-extras
 	sha256sums = 04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1
 	sha256sums = e2d284311f49c529ea45083438a768db390bde52949995534034d2a814beab89
 	sha256sums = e309dfd9d790f32cb1d23103726ac25e405b6ae6757a1c957a8395667d753908
+	sha256sums = 1e4686de75c019f38a3ed947463e429a777d5387fd29310deef2108c58617b07
 	sha256sums = 183d8cc712f0bcf1afcb01ce90c4c104a4c8d8070a06f94974a28b007d9e2ce4
 	sha256sums = d081f2ef8793544685aad35dea75a7e6264a2cb987ff3541e6377f4a3650a28b
 	sha256sums = 5887f78b55c4ecbbcba5930f3f0bb7bc0117c2a41c2f761805fcf7f46f1ca2b3
diff --git a/PKGBUILD b/PKGBUILD
index 1c914f4f652d..97b0289f8485 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname=chromium-no-extras
 _pkgname=chromium
 pkgver=75.0.3770.90
-pkgrel=2
+pkgrel=3
 _launcher_ver=6
 pkgdesc="Chromium without hangout services, widevine, pipewire"
 arch=('x86_64')
@@ -29,6 +29,7 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/$_pkg
         chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz
         chromium-system-icu.patch
         libstdc-do-not-assume-unique_ptr-has-ostream-operator.patch
+        disallow-partial-swaps-for-linux-based-on-gl_version.patch
         chromium-fix-window-flash-for-some-WMs.patch
         chromium-widevine.patch
         chromium-skia-harmony.patch)
@@ -36,6 +37,7 @@ sha256sums=('b1b59abbe19ecb88c17d99fa68f5c1c5585a5d66c100858f944aa3b93b943839'
             '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1'
             'e2d284311f49c529ea45083438a768db390bde52949995534034d2a814beab89'
             'e309dfd9d790f32cb1d23103726ac25e405b6ae6757a1c957a8395667d753908'
+            '1e4686de75c019f38a3ed947463e429a777d5387fd29310deef2108c58617b07'
             '183d8cc712f0bcf1afcb01ce90c4c104a4c8d8070a06f94974a28b007d9e2ce4'
             'd081f2ef8793544685aad35dea75a7e6264a2cb987ff3541e6377f4a3650a28b'
             '5887f78b55c4ecbbcba5930f3f0bb7bc0117c2a41c2f761805fcf7f46f1ca2b3')
@@ -91,6 +93,9 @@ prepare() {
   # https://chromium-review.googlesource.com/1584292
   patch -Np1 -i ../libstdc-do-not-assume-unique_ptr-has-ostream-operator.patch
 
+  # https://crbug.com/973216
+  patch -Np1 -i ../disallow-partial-swaps-for-linux-based-on-gl_version.patch
+
   # https://crbug.com/956061
   patch -Np1 -i ../chromium-fix-window-flash-for-some-WMs.patch
 
diff --git a/disallow-partial-swaps-for-linux-based-on-gl_version.patch b/disallow-partial-swaps-for-linux-based-on-gl_version.patch
new file mode 100644
index 000000000000..879cccf92a1b
--- /dev/null
+++ b/disallow-partial-swaps-for-linux-based-on-gl_version.patch
@@ -0,0 +1,34 @@
+From e6a0cdf0b7045e7f9029cce287bcc539052ef79a Mon Sep 17 00:00:00 2001
+From: Jonathan Backer <backer@chromium.org>
+Date: Mon, 17 Jun 2019 16:46:37 +0000
+Subject: [PATCH] Disallow partial swaps for linux based on gl_version_string
+
+This was missed in https://chromium-review.googlesource.com/c/chromium/src/+/1601182
+
+Bug: 973216,941670,957541,948640
+Change-Id: I3d2002c38fe09d87c9a3db951dfc2ab112319caf
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1662528
+Reviewed-by: Peng Huang <penghuang@chromium.org>
+Commit-Queue: Peng Huang <penghuang@chromium.org>
+Commit-Queue: Jonathan Backer <backer@chromium.org>
+Auto-Submit: Jonathan Backer <backer@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#669701}
+---
+ gpu/config/gpu_driver_bug_list.json | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json
+index 591a0642e8..e4a123ccd0 100644
+--- a/gpu/config/gpu_driver_bug_list.json
++++ b/gpu/config/gpu_driver_bug_list.json
+@@ -1865,10 +1865,6 @@
+       },
+       "gl_type": "gl",
+       "gl_version_string": ".*Mesa.*",
+-      "direct_rendering_version": {
+-        "op" : "<",
+-        "value": "2.3"
+-      },
+       "features": [
+         "disable_post_sub_buffers_for_onscreen_surfaces"
+       ]