12 files changed, 233 insertions, 239 deletions
diff --git a/chromium/chromium/chromium-base-cstdint.patch b/chromium/chromium/chromium-base-cstdint.patch
deleted file mode 100644
index 2cd68cd..0000000
--- a/chromium/chromium/chromium-base-cstdint.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/base/debug/profiler.h b/base/debug/profiler.h
-index 5f0deadd5d301..7d3eeaf35fa51 100644
---- a/base/debug/profiler.h
-+++ b/base/debug/profiler.h
-@@ -7,6 +7,7 @@
- 
- #include <stddef.h>
- 
-+#include <cstdint>
- #include <string>
- 
- #include "base/base_export.h"
diff --git a/chromium/chromium/chromium-gcc-12-r1111077.patch b/chromium/chromium/chromium-gcc-12-r1111077.patch
deleted file mode 100644
index ebd9c1b..0000000
--- a/chromium/chromium/chromium-gcc-12-r1111077.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From f2ea90d9cf667612b2913a6f30636a4773bad026 Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Tue, 28 Feb 2023 18:38:25 +0000
-Subject: [PATCH] IWYU: include blink::URLLoader for unique_ptr usage in
- WebLocalFrameClient
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Recent refactor broke again libstdc++ build by not including URLLoader
-header. But the reason for that change was removing in public code
-includes of non public code, as URLLoader.
-
-To fix the problem, move the implementation exposing the problem
-to the .cc file.
-
-Fixes build error with libstdc++:
-    /usr/include/c++/12/bits/unique_ptr.h: In instantiation of ‘void std::default_delete<_Tp>::operator()(_Tp*) const [with _Tp = blink::URLLoader]’:
-    /usr/include/c++/12/bits/unique_ptr.h:396:17:   required from ‘std::unique_ptr<_Tp, _Dp>::~unique_ptr() [with _Tp = blink::URLLoader; _Dp = std::default_delete<blink::URLLoader>]’
-    ../../third_party/blink/public/web/web_local_frame_client.h:678:12:   required from here
-    /usr/include/c++/12/bits/unique_ptr.h:93:23: error: invalid application of ‘sizeof’ to incomplete type ‘blink::URLLoader’
-
-Bug: 957519
-Change-Id: I0db2f86603fba4fe8f10d6c4370ad1ff4c9ca70b
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4276241
-Reviewed-by: Daniel Cheng <dcheng@chromium.org>
-Commit-Queue: José Dapena Paz <jdapena@igalia.com>
-Cr-Commit-Position: refs/heads/main@{#1111077}
----
- third_party/blink/public/web/web_local_frame_client.h       | 4 +---
- .../blink/renderer/core/frame/web_local_frame_client.cc     | 6 ++++++
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
-index d6bb89671f9d7..246d2ff90ea00 100644
---- a/third_party/blink/public/web/web_local_frame_client.h
-+++ b/third_party/blink/public/web/web_local_frame_client.h
-@@ -674,9 +674,7 @@ class BLINK_EXPORT WebLocalFrameClient {
-     return nullptr;
-   }
- 
--  virtual std::unique_ptr<URLLoader> CreateURLLoaderForTesting() {
--    return nullptr;
--  }
-+  virtual std::unique_ptr<URLLoader> CreateURLLoaderForTesting();
- 
-   virtual void OnStopLoading() {}
- 
-diff --git a/third_party/blink/renderer/core/frame/web_local_frame_client.cc b/third_party/blink/renderer/core/frame/web_local_frame_client.cc
-index a3617af5117d2..3adcd7cdd9c4e 100644
---- a/third_party/blink/renderer/core/frame/web_local_frame_client.cc
-+++ b/third_party/blink/renderer/core/frame/web_local_frame_client.cc
-@@ -7,6 +7,7 @@
- #include "mojo/public/cpp/bindings/pending_remote.h"
- #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
- #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
-+#include "third_party/blink/renderer/platform/loader/fetch/url_loader/url_loader.h"
- 
- namespace blink {
- 
-@@ -25,4 +26,9 @@ WebLocalFrameClient::GetRemoteNavigationAssociatedInterfaces() {
-   // have this implementation in the base class.
-   return AssociatedInterfaceProvider::GetEmptyAssociatedInterfaceProvider();
- }
-+
-+std::unique_ptr<URLLoader> WebLocalFrameClient::CreateURLLoaderForTesting() {
-+  return nullptr;
-+}
-+
- }  // namespace blink
--- 
-2.39.2
-
diff --git a/chromium/chromium/chromium-gcc-12-r1113983.patch b/chromium/chromium/chromium-gcc-12-r1113983.patch
deleted file mode 100644
index 60c36e9..0000000
--- a/chromium/chromium/chromium-gcc-12-r1113983.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From aaeaf2a563682f2f63196f924a842dcca42be8ef Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Tue, 7 Mar 2023 16:54:09 +0000
-Subject: [PATCH] IWYU: libstdc++ unique_ptr cast from nullptr requires
- declaration of type
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-fallback_linux_ui.cc returns a nullptr as a result of several
-calls returning a std::unique_ptr of a type that has not been declared
-and that's not allowed in libstdc++ implementation.
-
-Fix build errors:
-    /usr/include/c++/12/bits/unique_ptr.h: In instantiation of ‘void std::default_delete<_Tp>::operator()(_Tp*) const [with _Tp = ui::LinuxInputMethodContext]’:
-    /usr/include/c++/12/bits/unique_ptr.h:396:17:   required from ‘std::unique_ptr<_Tp, _Dp>::~unique_ptr() [with _Tp = ui::LinuxInputMethodContext; _Dp = std::default_delete<ui::LinuxInputMethodContext>]’
-    ../../ui/linux/fallback_linux_ui.cc:35:10:   required from here
-    /usr/include/c++/12/bits/unique_ptr.h:93:23: error: invalid application of ‘sizeof’ to incomplete type ‘ui::LinuxInputMethodContext’
-       93 |         static_assert(sizeof(_Tp)>0,
-          |                       ^~~~~~~~~~~
-    /usr/include/c++/12/bits/unique_ptr.h: In instantiation of ‘void std::default_delete<_Tp>::operator()(_Tp*) const [with _Tp = ui::NavButtonProvider]’:
-    /usr/include/c++/12/bits/unique_ptr.h:396:17:   required from ‘std::unique_ptr<_Tp, _Dp>::~unique_ptr() [with _Tp = ui::NavButtonProvider; _Dp = std::default_delete<ui::NavButtonProvider>]’
-    ../../ui/linux/fallback_linux_ui.cc:133:10:   required from here
-    /usr/include/c++/12/bits/unique_ptr.h:93:23: error: invalid application of ‘sizeof’ to incomplete type ‘ui::NavButtonProvider’
-
-Bug: 957519
-Change-Id: I5e7f096003d8f5de8f5be36137ac4427799bf7a5
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4310671
-Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
-Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1113983}
----
- ui/linux/BUILD.gn             | 1 +
- ui/linux/fallback_linux_ui.cc | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/ui/linux/BUILD.gn b/ui/linux/BUILD.gn
-index eb72461b549c4..8662261518293 100644
---- a/ui/linux/BUILD.gn
-+++ b/ui/linux/BUILD.gn
-@@ -52,6 +52,7 @@ component("linux_ui_factory") {
-   deps = [
-     "//base",
-     "//ui/base:buildflags",
-+    "//ui/base/ime/linux:linux",
-     "//ui/events:dom_keyboard_layout",
-     "//ui/gfx",
-     "//ui/native_theme",
-diff --git a/ui/linux/fallback_linux_ui.cc b/ui/linux/fallback_linux_ui.cc
-index ee3e7b96eba0a..5f5abeeb78372 100644
---- a/ui/linux/fallback_linux_ui.cc
-+++ b/ui/linux/fallback_linux_ui.cc
-@@ -5,11 +5,13 @@
- #include "ui/linux/fallback_linux_ui.h"
- 
- #include "base/time/time.h"
-+#include "ui/base/ime/linux/linux_input_method_context.h"
- #include "ui/events/keycodes/dom/dom_keyboard_layout_map.h"
- #include "ui/gfx/color_palette.h"
- #include "ui/gfx/geometry/size.h"
- #include "ui/gfx/image/image.h"
- #include "ui/gfx/platform_font.h"
-+#include "ui/linux/nav_button_provider.h"
- #include "ui/native_theme/native_theme.h"
- #include "ui/shell_dialogs/select_file_policy.h"
- #include "ui/views/controls/textfield/textfield.h"
--- 
-2.39.2
-
diff --git a/chromium/chromium/chromium-gcc-12-r1122463.patch b/chromium/chromium/chromium-gcc-12-r1122463.patch
new file mode 100644
index 0000000..813b00a
--- /dev/null
+++ b/chromium/chromium/chromium-gcc-12-r1122463.patch
@@ -0,0 +1,44 @@
+From e55c0bf35f4c54610c3bb40fcdc1b961bfd9f763 Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Mon, 27 Mar 2023 16:38:29 +0000
+Subject: [PATCH] Do not use std::monospace for absl::variant
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+authenticator_request_dialog_model.h introduced usage of
+std::monospace, though no include was added for it. But in this file
+it is using absl::variant. For uniformity, keep using absl::monospace
+before all the file moves to use std variants.
+
+This fixes a break in libstdc++ build.
+
+Bug: 957519
+Change-Id: I16adf924e935d2517916969000f8e94efc118c53
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4372590
+Commit-Queue: José Dapena Paz <jdapena@igalia.com>
+Reviewed-by: Nina Satragno <nsatragno@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1122463}
+---
+ chrome/browser/webauthn/authenticator_request_dialog_model.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/chrome/browser/webauthn/authenticator_request_dialog_model.h b/chrome/browser/webauthn/authenticator_request_dialog_model.h
+index f4992a74bd66b..6a4bcf68bcdf6 100644
+--- a/chrome/browser/webauthn/authenticator_request_dialog_model.h
++++ b/chrome/browser/webauthn/authenticator_request_dialog_model.h
+@@ -181,9 +181,9 @@ class AuthenticatorRequestDialogModel {
+     // These types describe the type of Mechanism.
+     using Transport =
+         base::StrongAlias<class TransportTag, AuthenticatorTransport>;
+-    using WindowsAPI = base::StrongAlias<class WindowsAPITag, std::monostate>;
++    using WindowsAPI = base::StrongAlias<class WindowsAPITag, absl::monostate>;
+     using Phone = base::StrongAlias<class PhoneTag, std::string>;
+-    using AddPhone = base::StrongAlias<class AddPhoneTag, std::monostate>;
++    using AddPhone = base::StrongAlias<class AddPhoneTag, absl::monostate>;
+     using Type = absl::variant<Transport, WindowsAPI, Phone, AddPhone>;
+ 
+     Mechanism(Type type,
+-- 
+2.40.1
+
diff --git a/chromium/chromium/chromium-gcc-12-r1123011.patch b/chromium/chromium/chromium-gcc-12-r1123011.patch
new file mode 100644
index 0000000..4c3b95c
--- /dev/null
+++ b/chromium/chromium/chromium-gcc-12-r1123011.patch
@@ -0,0 +1,30 @@
+From 2e14a3ac178ee87aa9154e5a15dcd986af1b6059 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Tue, 28 Mar 2023 14:34:55 +0000
+Subject: [PATCH] IWYU: add cstring for std::strlen in web_view_impl.cc
+
+Bug: 957519
+Change-Id: I15ad1e905eda3d96bbf164f5df8f3cf8e02bc370
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4376772
+Reviewed-by: Alex Ilin <alexilin@chromium.org>
+Commit-Queue: Alex Ilin <alexilin@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1123011}
+---
+ chrome/test/chromedriver/chrome/web_view_impl.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/chrome/test/chromedriver/chrome/web_view_impl.cc b/chrome/test/chromedriver/chrome/web_view_impl.cc
+index f726627e88def..d96d481d0bc40 100644
+--- a/chrome/test/chromedriver/chrome/web_view_impl.cc
++++ b/chrome/test/chromedriver/chrome/web_view_impl.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <stddef.h>
+ #include <algorithm>
++#include <cstring>
+ #include <memory>
+ #include <queue>
+ #include <utility>
+-- 
+2.40.1
+
diff --git a/chromium/chromium/chromium-gcc-12-r1127041.patch b/chromium/chromium/chromium-gcc-12-r1127041.patch
new file mode 100644
index 0000000..12ba461
--- /dev/null
+++ b/chromium/chromium/chromium-gcc-12-r1127041.patch
@@ -0,0 +1,47 @@
+From c8b965be5b61c2412df938e1feb380b69bd92ee9 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 6 Apr 2023 07:15:03 +0000
+Subject: [PATCH] [unbundle] do not use ZipAnalyzer traits header
+
+It is enough to include chrome/common/safe_browsing/archive_analyzer_results.h.
+
+Bug: None
+Change-Id: Ia63a66b77c073fa4fdb8470db34b4c24722293cc
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4373706
+Reviewed-by: Daniel Rubery <drubery@chromium.org>
+Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
+Cr-Commit-Position: refs/heads/main@{#1127041}
+---
+ chrome/services/file_util/public/mojom/BUILD.gn   | 3 ++-
+ chrome/services/file_util/safe_archive_analyzer.h | 1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/chrome/services/file_util/public/mojom/BUILD.gn b/chrome/services/file_util/public/mojom/BUILD.gn
+index b9e80cc748e8f..461d2d00b5e51 100644
+--- a/chrome/services/file_util/public/mojom/BUILD.gn
++++ b/chrome/services/file_util/public/mojom/BUILD.gn
+@@ -55,7 +55,8 @@ mojom("mojom") {
+           cpp = "::safe_browsing::ArchiveAnalyzerResults"
+         },
+       ]
+-      traits_headers = [ "//chrome/common/safe_browsing/zip_analyzer.h" ]
++      traits_headers =
++          [ "//chrome/common/safe_browsing/archive_analyzer_results.h" ]
+       traits_private_headers = [ "safe_archive_analyzer_param_traits.h" ]
+       traits_public_deps = [
+         "//chrome/common/safe_browsing:proto",
+diff --git a/chrome/services/file_util/safe_archive_analyzer.h b/chrome/services/file_util/safe_archive_analyzer.h
+index 62307b87839a2..0231205377c7f 100644
+--- a/chrome/services/file_util/safe_archive_analyzer.h
++++ b/chrome/services/file_util/safe_archive_analyzer.h
+@@ -7,6 +7,7 @@
+ 
+ #include "chrome/common/safe_browsing/archive_analyzer_results.h"
+ #include "chrome/common/safe_browsing/rar_analyzer.h"
++#include "chrome/common/safe_browsing/zip_analyzer.h"
+ #include "chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom.h"
+ #include "mojo/public/cpp/bindings/remote.h"
+ 
+-- 
+2.40.1
+
diff --git a/chromium/chromium/chromium-gcc-13-r1125558.patch b/chromium/chromium/chromium-gcc-13-r1125558.patch
new file mode 100644
index 0000000..5b72850
--- /dev/null
+++ b/chromium/chromium/chromium-gcc-13-r1125558.patch
@@ -0,0 +1,43 @@
+From afbe6c6ee713519263305d7e2d91cc9f1379afe2 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Mon, 3 Apr 2023 20:41:40 +0000
+Subject: [PATCH] IWYU: add stdint.h for various int types in //base
+
+Bug: 957519
+Change-Id: I750de80f0d27d93ef3383052ddb4eefd5ee13abe
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4394430
+Reviewed-by: Daniel Cheng <dcheng@chromium.org>
+Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
+Cr-Commit-Position: refs/heads/main@{#1125558}
+---
+ base/debug/profiler.h       | 1 +
+ base/strings/string_piece.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/base/debug/profiler.h b/base/debug/profiler.h
+index 5f0deadd5d301..035affc7c4d9d 100644
+--- a/base/debug/profiler.h
++++ b/base/debug/profiler.h
+@@ -6,6 +6,7 @@
+ #define BASE_DEBUG_PROFILER_H_
+ 
+ #include <stddef.h>
++#include <stdint.h>
+ 
+ #include <string>
+ 
+diff --git a/base/strings/string_piece.h b/base/strings/string_piece.h
+index 899b654cbe8e6..9dde6ec29bbf0 100644
+--- a/base/strings/string_piece.h
++++ b/base/strings/string_piece.h
+@@ -22,6 +22,7 @@
+ #define BASE_STRINGS_STRING_PIECE_H_
+ 
+ #include <stddef.h>
++#include <stdint.h>
+ 
+ #include <algorithm>
+ #include <iosfwd>
+-- 
+2.40.1
+
diff --git a/chromium/chromium/chromium-perfetto-cstdint.patch b/chromium/chromium/chromium-perfetto-cstdint.patch
deleted file mode 100644
index 812d1e8..0000000
--- a/chromium/chromium/chromium-perfetto-cstdint.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/include/perfetto/ext/base/uuid.h b/include/perfetto/ext/base/uuid.h
-index a23be40a6..3b3d5d5ad 100644
---- a/third_party/perfetto/include/perfetto/ext/base/uuid.h
-+++ b/third_party/perfetto/include/perfetto/ext/base/uuid.h
-@@ -18,6 +18,7 @@
- #define INCLUDE_PERFETTO_EXT_BASE_UUID_H_
- 
- #include <array>
-+#include <cstdint>
- #include <string>
- 
- #include "perfetto/ext/base/optional.h"
diff --git a/chromium/chromium/chromium-quiche-cstdint.patch b/chromium/chromium/chromium-quiche-cstdint.patch
deleted file mode 100644
index 78f8d8f..0000000
--- a/chromium/chromium/chromium-quiche-cstdint.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/quiche/quic/core/crypto/quic_hkdf.h b/quiche/quic/core/crypto/quic_hkdf.h
-index 6a300ed0..3e30f1cb 100644
---- a/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h
-+++ b/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h
-@@ -5,6 +5,7 @@
- #ifndef QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_
- #define QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_
- 
-+#include <cstdint>
- #include <vector>
- 
- #include "absl/strings/string_view.h"
-diff --git a/quiche/quic/core/quic_connection_id.h b/quiche/quic/core/quic_connection_id.h
-index 49943495..b4e25fec 100644
---- a/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h
-+++ b/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h
-@@ -5,6 +5,7 @@
- #ifndef QUICHE_QUIC_CORE_QUIC_CONNECTION_ID_H_
- #define QUICHE_QUIC_CORE_QUIC_CONNECTION_ID_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
diff --git a/chromium/chromium/chromium-vulkan-validation-layers-gcc-13.patch b/chromium/chromium/chromium-vulkan-validation-layers-gcc-13.patch
new file mode 100644
index 0000000..4072b76
--- /dev/null
+++ b/chromium/chromium/chromium-vulkan-validation-layers-gcc-13.patch
@@ -0,0 +1,50 @@
+From c0c44a6452c9594ed1d36f28b7d1f7dfbda4ca03 Mon Sep 17 00:00:00 2001
+From: Nathaniel Cesario <nathaniel@lunarg.com>
+Date: Wed, 19 Apr 2023 10:03:44 -0600
+Subject: [PATCH] build: Fixes for GCC 13
+
+- Update VMA to ff37e927
+- Update googletest v1.13.0
+---
+ layers/external/vma/vk_mem_alloc.h | 807 ++++++++++++++++-------------
+ layers/stateless/parameter_name.h  |   1 +
+ scripts/known_good.json            |   2 +-
+ 3 files changed, 435 insertions(+), 375 deletions(-)
+
+diff --git a/layers/external/vma/vk_mem_alloc.h b/layers/external/vma/vk_mem_alloc.h
+index b47bd730c..823cef8ad 100644
+--- a/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
++++ b/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
+@@ -2591,27 +2614,10 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(
+     #include <bit> // For std::popcount
+ #endif
+ 
+-#if defined(__GNUC__)
+-#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+-#pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wtype-limits"
+-#pragma GCC diagnostic ignored "-Wunused-variable"
+-#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+-#if defined(__clang__)
+-#pragma clang diagnostic push
+-#pragma clang diagnostic ignored "-Wtautological-compare"
+-#pragma clang diagnostic ignored "-Wnullability-completeness"
+-#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
+-#endif
+-#if GCC_VERSION >= 80000
+-#pragma GCC diagnostic ignored "-Wclass-memaccess"
+-#endif
+-#if defined(ANDROID)
+-#pragma GCC diagnostic ignored "-Wunused-private-field"
+-#endif
++#if VMA_STATS_STRING_ENABLED
++    #include <cstdio> // For snprintf
+ #endif
+ 
+-
+ /*******************************************************************************
+ CONFIGURATION SECTION
+ 
+-- 
+2.40.1
+
diff --git a/chromium/chromium/chromium-webrtc-gcc-13.patch b/chromium/chromium/chromium-webrtc-gcc-13.patch
deleted file mode 100644
index 9a6d94d..0000000
--- a/chromium/chromium/chromium-webrtc-gcc-13.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 86eb6ba2079259f410b1c559f900080ffeac12c8 Mon Sep 17 00:00:00 2001
-From: Bruno Pitrus <brunopitrus@hotmail.com>
-Date: Fri, 10 Mar 2023 19:27:38 +0000
-Subject: [PATCH] Add missing header causing build error with GCC13
-
-Bug: chromium:957519
-Change-Id: I0146fdb18764b683b502e9804bce1c7b2ab05294
-Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/296980
-Reviewed-by: Harald Alvestrand <hta@webrtc.org>
-Commit-Queue: Harald Alvestrand <hta@webrtc.org>
-Auto-Submit: Bruno Pitrus <brunopitrus@hotmail.com>
-Cr-Commit-Position: refs/heads/main@{#39536}
----
- rtc_base/third_party/base64/base64.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/rtc_base/third_party/base64/base64.h b/rtc_base/third_party/base64/base64.h
-index 4190a79dc0..5d42513323 100644
---- a/third_party/webrtc/rtc_base/third_party/base64/base64.h
-+++ b/third_party/webrtc/rtc_base/third_party/base64/base64.h
-@@ -12,6 +12,8 @@
- #ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
- #define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
- 
-+#include <cstddef>
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
--- 
-2.39.2
-
diff --git a/chromium/chromium/chromium.spec b/chromium/chromium/chromium.spec
index 6bc5506..4317980 100644
--- a/chromium/chromium/chromium.spec
+++ b/chromium/chromium/chromium.spec
@@ -29,8 +29,8 @@
 %bcond_with system_harfbuzz
 %endif
 
-# Require libaom >= 3.4.0 for AOM_IMG_FMT_NV12
-%if 0%{?fedora} >= 37
+# Require libaom > 3.6.0 for AV1E_SET_QUANTIZER_ONE_PASS
+%if 0
 %bcond_without system_libaom
 %else
 %bcond_with system_libaom
@@ -70,7 +70,7 @@
 %bcond_with fedora_compilation_flags
 
 Name:       chromium
-Version:    112.0.5615.165
+Version:    113.0.5672.63
 Release:    100%{?dist}
 Summary:    A WebKit (Blink) powered web browser
 
@@ -124,15 +124,16 @@ Patch3:     chromium-media-mojo-services-opus.patch
 Patch4:     chromium-v8-WasmArray-incomplete-type.patch
 
 # Pull upstream patches
-Patch10:    chromium-gcc-12-r1111077.patch
-Patch11:    chromium-gcc-12-r1113983.patch
-Patch12:    chromium-gcc-13-r1126024.patch
-Patch13:    chromium-vulkan_memory_allocator-gcc-13.patch
-Patch14:    chromium-webrtc-gcc-13.patch
+Patch10:    chromium-gcc-12-r1122463.patch
+Patch11:    chromium-gcc-12-r1123011.patch
+Patch12:    chromium-gcc-12-r1127041.patch
+Patch13:    chromium-gcc-13-r1125558.patch
+Patch14:    chromium-gcc-13-r1126024.patch
+Patch15:    chromium-vulkan_memory_allocator-gcc-13.patch
+Patch16:    chromium-vulkan-validation-layers-gcc-13.patch
 
 # Fix missing includes
 Patch20:    chromium-autofill-cstdint.patch
-Patch21:    chromium-base-cstdint.patch
 Patch22:    chromium-blink-cstdint.patch
 Patch23:    chromium-cc-cstdint.patch
 Patch24:    chromium-chrome-cstdint.patch
@@ -149,14 +150,12 @@ Patch34:    chromium-password_manager-cstdint.patch
 Patch35:    chromium-payments-cstdint.patch
 Patch36:    chromium-pdf-cstdint.patch
 Patch37:    chromium-pdfium-cstdint.patch
-Patch38:    chromium-perfetto-cstdint.patch
-Patch39:    chromium-quiche-cstdint.patch
-Patch40:    chromium-ruy-string.patch
-Patch41:    chromium-s2cellid-cstdint.patch
-Patch42:    chromium-swiftshader-cstdint.patch
-Patch43:    chromium-tflite-cstdint.patch
-Patch44:    chromium-ui-cstdint.patch
-Patch45:    chromium-viz-cstdint.patch
+Patch38:    chromium-ruy-string.patch
+Patch39:    chromium-s2cellid-cstdint.patch
+Patch40:    chromium-swiftshader-cstdint.patch
+Patch41:    chromium-tflite-cstdint.patch
+Patch42:    chromium-ui-cstdint.patch
+Patch43:    chromium-viz-cstdint.patch
 
 # I don't have time to test whether it work on other architectures
 ExclusiveArch: x86_64
@@ -801,6 +800,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue May 09 2023 - Ting-Wei Lan <lantw44@gmail.com> - 113.0.5672.63-100
+- Update to 113.0.5672.63
+
 * Sat Apr 22 2023 - Ting-Wei Lan <lantw44@gmail.com> - 112.0.5615.165-100
 - Update to 112.0.5615.165