gentoo auto-resync : 23:04:2023 - 18:08:08

2 files changed, 51 insertions, 3 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index d756379f5e23..bf491dba0884 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -8,7 +8,7 @@ AUX chromium-112-gcc-mno-outline.patch 1203 BLAKE2B 82dcb024fbd4e032a998b0fbaf21
 AUX chromium-112-libstdc++-1.patch 3045 BLAKE2B 195dd794a4a00fb0a354ca6e8c56c102112c672ffeb28363874788aff1f3ffbf620b23fa39f824923bf5c009424f6bf01050950d5d277abf59c9944159166aa1 SHA512 29f422a076120f0de98b6af6eb2936bf4a924fd9d5cc5c4fa5bda9f6cf51288f51ba32149233030f9cb5c1382330601a67cb824bdd33cddb5c26ea5cea16606b
 AUX chromium-112-libstdc++.patch 2874 BLAKE2B f354b06944a761556b6d0465aee2a1dd701b18cdd272a1aa4aa68405ad05f575d1f0ef04ca2b05d5e65ce54efab31cfdf95e8963613ef7c811aaf343662e4b62 SHA512 b0307d10708b0ea9f94e941b9b734a16b4f74b7149e11cd6b30532835074e773c3499f954f38935bf7f16ebbda6dcf53695b513e56ff5bb0d810b4b1a6f4d3ac
 AUX chromium-112-sql-relax.patch 2064 BLAKE2B 37f362da2af26481f15f705466ce1eb282759ddad0cdc34a967120e26a2894bd5a1f22b69f6b3749a84bd1b155c55cbaeffebb2b7405d5eb80c7c59124a90ba4 SHA512 83e852e6710a748030b001fccede282830c00db102f338dfd92a0a86865d0f25456ae9adc3ab5b33719b156b8f0274df347c18e4670c53e57568afdeaf874804
-AUX chromium-112-swiftshader.patch 3030 BLAKE2B 58add1fc66fbc2b81f075f382fb01d9412c92e0e4c8b6b3c1c6ffcc0d7ae0fd9c4dbf547f7669b8a2cbc1dcad0f39291bf5ce409170ae1eda87abc3bd2a281af SHA512 ee0c949eff70c8687d7491f4f78b6c5f6b7f55c7b693fbeaf18d618604e0c87793826246398aa4d896a07d4481a72824d64140237cd39750649dd61ecc0f2acc
+AUX chromium-112-swiftshader.patch 4852 BLAKE2B d1e5008b6d2f2150d7b86b8a4495532f5c8e458e6cdcdce565d8efde2d1f2c72409218bdaab02b56f451ca141df4f0ca7afca41c1dd0ffe83db2362675aa2c3b SHA512 62c18e64acbfc6d91b82a4501a01c86a59d2aa46eb446fa0cf036f42b73b7e91f6bc3603ccca8a06eaf3da9ffcbd052dc1d77f86148777cad709ee7eaadbfd7f
 AUX chromium-98-gtk4-build.patch 3044 BLAKE2B 782dfd31a3a82d62dc0b8ffbb85cf2dbbef1c6cc47dbd8409dc0777be8d019c4ca082d75e6114b09f880f4f3e886d0f4b9631e66d46a3129e41468b70d71404c SHA512 e8acbf85274813ec81d575727b0e5d107749242d1df80e05035c9273ca0466d7358a8d7cece16c09f6996cb49ad3b1e0dcdf052af45023236f53fa6262b4e441
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
 AUX chromium-cross-compile.patch 323 BLAKE2B 8d5091ce5287422c9688ede2563360a96b8bd34b9750dc1c8f0b6ca9aeff2c066fac2da169396baa131d971c087c78f9af53999df0e102d1f57176f5e8d3dd57 SHA512 06d3afc1aa19e57daac0e4bad37e1f365a68408240430e5e818e5a4f12e3b7519214eafa463633e447e7029f4ae13ea864ca347ad1fac117702a0be88718a954
diff --git a/www-client/chromium/files/chromium-112-swiftshader.patch b/www-client/chromium/files/chromium-112-swiftshader.patch
index 5f703d919555..9d67841a1dea 100644
--- a/www-client/chromium/files/chromium-112-swiftshader.patch
+++ b/www-client/chromium/files/chromium-112-swiftshader.patch
@@ -1,4 +1,5 @@
 https://bugs.gentoo.org/904725
+https://bugs.gentoo.org/904850
 
 From 451fb9470e4e1cd183ff05d5e171dc21bae6e47c Mon Sep 17 00:00:00 2001
 From: Jose Dapena Paz <jdapena@igalia.com>
@@ -29,8 +30,6 @@ Tested-by: Shahbaz Youssefi <syoussefi@google.com>
 Commit-Queue: Shahbaz Youssefi <syoussefi@google.com>
 ---
 
-diff --git a/third_party/llvm-10.0/llvm/include/llvm/ADT/STLExtras.h b/third_party/llvm-10.0/llvm/include/llvm/ADT/STLExtras.h
-index 620209b..d0a48e8 100644
 --- a/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/ADT/STLExtras.h
 +++ b/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/ADT/STLExtras.h
 @@ -1415,9 +1415,9 @@
@@ -72,3 +71,52 @@ index 620209b..d0a48e8 100644
      Result = Other.Result;
      return *this;
    }
+From e4dea744b7838470757f010fc2ff4b92f02b3fac Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Thu, 16 Mar 2023 13:29:54 +0100
+Subject: [PATCH] More C++20 fixes
+
+Partial backport of llvm-project patch:
+    commit 2ccf0b76bcaf0895e04f14e3ff53c59dd96f9f0f
+    Author: Evgeny Mandrikov <mandrikov@gmail.com>
+    Date:   Thu Jan 6 17:01:05 2022 +0100
+
+    Fix build failure with GCC 11 in C++20 mode
+
+    See https://wg21.link/cwg2237
+
+    Reviewed By: shafik, dexonsmith
+
+    Differential Revision: https://reviews.llvm.org/D115355
+
+Bug: chromium:819294
+Change-Id: I90d58b6fc601f9a4f615e2f6edc13a73ce848e4f
+Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/71089
+Reviewed-by: Shahbaz Youssefi <syoussefi@google.com>
+Tested-by: Shahbaz Youssefi <syoussefi@google.com>
+Kokoro-Result: kokoro <noreply+kokoro@google.com>
+Commit-Queue: Shahbaz Youssefi <syoussefi@google.com>
+---
+
+--- a/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/CodeGen/LiveInterval.h
++++ b/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/CodeGen/LiveInterval.h
+@@ -718,7 +718,7 @@
+       T *P;
+ 
+     public:
+-      SingleLinkedListIterator<T>(T *P) : P(P) {}
++      SingleLinkedListIterator(T *P) : P(P) {}
+ 
+       SingleLinkedListIterator<T> &operator++() {
+         P = P->Next;
+--- a/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/Support/BinaryStreamArray.h
++++ b/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/Support/BinaryStreamArray.h
+@@ -324,7 +324,7 @@
+   FixedStreamArrayIterator(const FixedStreamArray<T> &Array, uint32_t Index)
+       : Array(Array), Index(Index) {}
+ 
+-  FixedStreamArrayIterator<T>(const FixedStreamArrayIterator<T> &Other)
++  FixedStreamArrayIterator(const FixedStreamArrayIterator<T> &Other)
+       : Array(Other.Array), Index(Other.Index) {}
+   FixedStreamArrayIterator<T> &
+   operator=(const FixedStreamArrayIterator<T> &Other) {