From 777af0d4c8117a6e0b1717a23e2f82475d6c9b86 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 18 Oct 2024 18:23:59 +0200
Subject: [PATCH] chromium: update to 130.0.6723.58.

---
 .../files/musl-patches/musl-sandbox.patch     |  2 +-
 .../chromium-125-iwyu-webauthn-variant.patch  | 10 ---------
 ...omium-128-perfetto-musl-prctl_mm_map.patch | 21 -------------------
 ...rdware_destructive_interference_size.patch | 21 +++++++++++++++++++
 srcpkgs/chromium/template                     |  4 ++--
 5 files changed, 24 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/chromium/patches/chromium-125-iwyu-webauthn-variant.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-128-perfetto-musl-prctl_mm_map.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-130-hardware_destructive_interference_size.patch

diff --git a/srcpkgs/chromium/files/musl-patches/musl-sandbox.patch b/srcpkgs/chromium/files/musl-patches/musl-sandbox.patch
index 22d865aa42f5d4..f318e21a104ba4 100644
--- a/srcpkgs/chromium/files/musl-patches/musl-sandbox.patch
+++ b/srcpkgs/chromium/files/musl-patches/musl-sandbox.patch
@@ -63,9 +63,9 @@ index d9d1882..0567557 100644
  #if !defined(__mips__) && !defined(__aarch64__)
      case __NR_vfork:
 @@ -514,6 +514,8 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
-     case __NR_mlock:
      case __NR_munlock:
      case __NR_munmap:
+     case __NR_mseal:
 +    case __NR_mremap:
 +    case __NR_membarrier:
        return true;
diff --git a/srcpkgs/chromium/patches/chromium-125-iwyu-webauthn-variant.patch b/srcpkgs/chromium/patches/chromium-125-iwyu-webauthn-variant.patch
deleted file mode 100644
index 52448e49f0d24a..00000000000000
--- a/srcpkgs/chromium/patches/chromium-125-iwyu-webauthn-variant.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/chrome/browser/webauthn/authenticator_request_dialog_model.h
-+++ b/chrome/browser/webauthn/authenticator_request_dialog_model.h
-@@ -9,6 +9,7 @@
- #include <optional>
- #include <string>
- #include <string_view>
-+#include <variant>
- #include <vector>
- 
- #include "base/containers/span.h"
diff --git a/srcpkgs/chromium/patches/chromium-128-perfetto-musl-prctl_mm_map.patch b/srcpkgs/chromium/patches/chromium-128-perfetto-musl-prctl_mm_map.patch
deleted file mode 100644
index 5b58548b655a98..00000000000000
--- a/srcpkgs/chromium/patches/chromium-128-perfetto-musl-prctl_mm_map.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 3c48d6b9fc82dccbb0bfb905cf808f73a7a02e71 Mon Sep 17 00:00:00 2001
-From: "lauren n. liberda" <lauren@selfisekai.rocks>
-Date: Wed, 31 Jul 2024 05:14:42 +0200
-Subject: [PATCH] musl: remove conflicting prctl.h include
-
----
- src/base/utils.cc | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/third_party/perfetto/src/base/utils.cc b/third_party/perfetto/src/base/utils.cc
-index 0d9318c136..419c7dbc1a 100644
---- a/third_party/perfetto/src/base/utils.cc
-+++ b/third_party/perfetto/src/base/utils.cc
-@@ -40,7 +40,6 @@
- 
- #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
-     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
--#include <linux/prctl.h>
- #include <sys/prctl.h>
- 
- #ifndef PR_GET_TAGGED_ADDR_CTRL
diff --git a/srcpkgs/chromium/patches/chromium-130-hardware_destructive_interference_size.patch b/srcpkgs/chromium/patches/chromium-130-hardware_destructive_interference_size.patch
new file mode 100644
index 00000000000000..8d02fd9b5e3ef2
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-130-hardware_destructive_interference_size.patch
@@ -0,0 +1,21 @@
+diff -up chromium-130.0.6723.44/components/media_router/common/providers/cast/channel/enum_table.h.me chromium-130.0.6723.44/components/media_router/common/providers/cast/channel/enum_table.h
+--- chromium-130.0.6723.44/components/media_router/common/providers/cast/channel/enum_table.h.me	2024-10-15 09:58:39.571798463 +0200
++++ chromium-130.0.6723.44/components/media_router/common/providers/cast/channel/enum_table.h	2024-10-15 09:59:46.209147226 +0200
+@@ -12,7 +12,6 @@
+ 
+ #include <cstdint>
+ #include <cstring>
+-#include <new>
+ #include <optional>
+ #include <ostream>
+ #include <string_view>
+@@ -368,7 +367,8 @@ class EnumTable {
+ 
+  private:
+ #ifdef ARCH_CPU_64_BITS
+-  alignas(std::hardware_destructive_interference_size)
++  // Align the data on a cache line boundary.
++  alignas(64)
+ #endif
+       std::initializer_list<Entry> data_;
+   bool is_sorted_;
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 3003c9c632f314..eb528b4b86faa3 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=129.0.6668.58
+version=130.0.6723.58
 revision=1
 archs="i686* x86_64* aarch64* armv7l*"
 hostmakedepends="
@@ -28,7 +28,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=eaf850183d32627ce0cde9f3d3f853bc11c217ef7f41540303214ed47803d96d
+checksum=aa296edec7275d19feade5ef32cbe7dfdd41594d4c0c1afd94bbf4d310c38c4e
 
 lib32disabled=yes