* [PR PATCH] chromium: update to 115.0.5790.98.
@ 2023-07-19 12:44 Duncaen
2023-07-19 19:00 ` [PR PATCH] [Updated] " Duncaen
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Duncaen @ 2023-07-19 12:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 406 bytes --]
There is a new pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages chromium-115
https://github.com/void-linux/void-packages/pull/45130
chromium: update to 115.0.5790.98.
[ci skip]
* [ ] x86_64-glibc
* [ ] x86_64-musl
* [ ] aarch64-musl
* [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/45130.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-115-45130.patch --]
[-- Type: text/x-diff, Size: 27506 bytes --]
From 75a0710c22020fd6bee4fdfff8d4399bbc96e982 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 19 Jul 2023 14:35:14 +0200
Subject: [PATCH] chromium: update to 115.0.5790.98.
---
...typename-s-that-are-required-in-C-17.patch | 45 ----------
.../chromium-114-maldoca-include.patch | 25 ++++++
.../chromium-115-compiler-SkColor4f.patch | 27 ++++++
...ium-115-emplace_back_on_vector-c++20.patch | 22 +++++
.../patches/chromium-115-skia-include.patch | 26 ++++++
.../patches/chromium-115-typename.patch | 49 +++++++++++
...romium-115-verify_name_match-include.patch | 25 ++++++
...around_clang_bug-structured_binding.patch} | 83 ++++++++++---------
.../patches/download-bubble-typename.patch | 42 ----------
srcpkgs/chromium/patches/random-fixes.patch | 15 ++++
srcpkgs/chromium/template | 10 ++-
11 files changed, 238 insertions(+), 131 deletions(-)
delete mode 100644 srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
create mode 100644 srcpkgs/chromium/patches/chromium-114-maldoca-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-compiler-SkColor4f.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-emplace_back_on_vector-c++20.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-skia-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-typename.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-verify_name_match-include.patch
rename srcpkgs/chromium/patches/{chromium-114-workaround_clang_bug-structured_binding.patch => chromium-115-workaround_clang_bug-structured_binding.patch} (51%)
delete mode 100644 srcpkgs/chromium/patches/download-bubble-typename.patch
create mode 100644 srcpkgs/chromium/patches/random-fixes.patch
diff --git a/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch b/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
deleted file mode 100644
index 35b7152cbbdb..000000000000
--- a/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2914039316d4ed3f53c3393dc2ba48f637807689 Mon Sep 17 00:00:00 2001
-From: Peter Kasting <pkasting@chromium.org>
-Date: Fri, 12 May 2023 16:40:53 +0000
-Subject: [PATCH] Add some "typename"s that are required in C++17.
-
-Bug: 1444563
-Change-Id: I7801f5e82a40305c357eeda219678dda558f5752
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4526465
-Commit-Queue: Alan Screen <awscreen@chromium.org>
-Reviewed-by: Alan Screen <awscreen@chromium.org>
-Auto-Submit: Peter Kasting <pkasting@chromium.org>
-Commit-Queue: Peter Kasting <pkasting@chromium.org>
-Code-Coverage: Findit <findit-for-me@appspot.gserviceaccount.com>
-Cr-Commit-Position: refs/heads/main@{#1143319}
----
- chrome/browser/printing/print_backend_service_manager.cc | 2 +-
- chrome/browser/printing/print_backend_service_manager.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/chrome/browser/printing/print_backend_service_manager.cc b/chrome/browser/printing/print_backend_service_manager.cc
-index b5a4b525a2d..224369cd58c 100644
---- a/chrome/browser/printing/print_backend_service_manager.cc
-+++ b/chrome/browser/printing/print_backend_service_manager.cc
-@@ -1477,7 +1477,7 @@ template <class... T>
- void PrintBackendServiceManager::RunSavedCallbacks(
- RemoteSavedCallbacks<T...>& saved_callbacks,
- const RemoteId& remote_id,
-- std::remove_reference<T>::type... result) {
-+ typename std::remove_reference<T>::type... result) {
- auto found_callbacks_map = saved_callbacks.find(remote_id);
- if (found_callbacks_map == saved_callbacks.end())
- return; // No callbacks to run.
-diff --git a/chrome/browser/printing/print_backend_service_manager.h b/chrome/browser/printing/print_backend_service_manager.h
-index 41788f42a95..6aa7479c1fd 100644
---- a/chrome/browser/printing/print_backend_service_manager.h
-+++ b/chrome/browser/printing/print_backend_service_manager.h
-@@ -588,7 +588,7 @@ class PrintBackendServiceManager {
- template <class... T>
- void RunSavedCallbacks(RemoteSavedCallbacks<T...>& saved_callbacks,
- const RemoteId& remote_id,
-- std::remove_reference<T>::type... result);
-+ typename std::remove_reference<T>::type... result);
-
- // Test support for client ID management.
- static void SetClientsForTesting(
diff --git a/srcpkgs/chromium/patches/chromium-114-maldoca-include.patch b/srcpkgs/chromium/patches/chromium-114-maldoca-include.patch
new file mode 100644
index 000000000000..0259cb9b0d01
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-114-maldoca-include.patch
@@ -0,0 +1,25 @@
+From 345c58f1d85286b394c05bb8d871ac8173be90a3 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 31 Mar 2023 16:26:06 +0000
+Subject: [PATCH] IWYU: add stdint.h for int types in maldoca
+
+---
+ third_party/maldoca/src/maldoca/ole/header.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/third_party/maldoca/src/maldoca/ole/header.h b/third_party/maldoca/src/maldoca/ole/header.h
+index 174f704..41c41d5 100644
+--- a/third_party/maldoca/src/maldoca/ole/header.h
++++ b/third_party/maldoca/src/maldoca/ole/header.h
+@@ -43,6 +43,8 @@
+ #ifndef MALDOCA_OLE_HEADER_H_
+ #define MALDOCA_OLE_HEADER_H_
+
++#include <stdint.h>
++
+ #include "absl/strings/string_view.h"
+
+ namespace maldoca {
+--
+2.39.2
+
diff --git a/srcpkgs/chromium/patches/chromium-115-compiler-SkColor4f.patch b/srcpkgs/chromium/patches/chromium-115-compiler-SkColor4f.patch
new file mode 100644
index 000000000000..ffa0e7ed108c
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-compiler-SkColor4f.patch
@@ -0,0 +1,27 @@
+Patch-Source: https://src.fedoraproject.org/rpms/chromium/blob/1f8fd846d2cc72c90c73c9867619f0da43b9c816/f/chromium-115-compiler-SkColor4f.patch
+diff -up chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc.me chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc
+--- chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc.me 2023-06-24 10:38:11.011511463 +0200
++++ chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc 2023-06-24 13:07:35.865375884 +0200
+@@ -84,6 +84,7 @@ CanvasStyle::CanvasStyle(const CanvasSty
+
+ void CanvasStyle::ApplyToFlags(cc::PaintFlags& flags,
+ float global_alpha) const {
++ SkColor4f custom_color = SkColor4f{0.0f, 0.0f, 0.0f, global_alpha};
+ switch (type_) {
+ case kColor:
+ ApplyColorToFlags(flags, global_alpha);
+@@ -91,12 +92,12 @@ void CanvasStyle::ApplyToFlags(cc::Paint
+ case kGradient:
+ GetCanvasGradient()->GetGradient()->ApplyToFlags(flags, SkMatrix::I(),
+ ImageDrawOptions());
+- flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha));
++ flags.setColor(custom_color);
+ break;
+ case kImagePattern:
+ GetCanvasPattern()->GetPattern()->ApplyToFlags(
+ flags, AffineTransformToSkMatrix(GetCanvasPattern()->GetTransform()));
+- flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha));
++ flags.setColor(custom_color);
+ break;
+ default:
+ NOTREACHED();
diff --git a/srcpkgs/chromium/patches/chromium-115-emplace_back_on_vector-c++20.patch b/srcpkgs/chromium/patches/chromium-115-emplace_back_on_vector-c++20.patch
new file mode 100644
index 000000000000..92dbbf984676
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-emplace_back_on_vector-c++20.patch
@@ -0,0 +1,22 @@
+Patch-Source: https://src.fedoraproject.org/rpms/chromium/blob/1f8fd846d2cc72c90c73c9867619f0da43b9c816/f/chromium-115-emplace_back_on_vector-c++20.patch
+diff -up chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc.me chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc
+--- chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc.me 2023-06-25 10:06:58.445990069 +0200
++++ chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc 2023-06-25 10:51:17.640818231 +0200
+@@ -355,7 +355,7 @@ Status ParseMobileEmulation(const base::
+ "'version' field of type string");
+ }
+
+- brands.emplace_back(*brand, *version);
++ brands.emplace_back() = {*brand, *version};
+ }
+
+ client_hints.brands = std::move(brands);
+@@ -392,7 +392,7 @@ Status ParseMobileEmulation(const base::
+ "a 'version' field of type string");
+ }
+
+- full_version_list.emplace_back(*brand, *version);
++ full_version_list.emplace_back() = {*brand, *version};
+ }
+
+ client_hints.full_version_list = std::move(full_version_list);
diff --git a/srcpkgs/chromium/patches/chromium-115-skia-include.patch b/srcpkgs/chromium/patches/chromium-115-skia-include.patch
new file mode 100644
index 000000000000..b32481bf6465
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-skia-include.patch
@@ -0,0 +1,26 @@
+From 76f7e61f1a7b3e3d445b4f6c32e29c5f05fa2c71 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Tue, 30 May 2023 20:27:03 +0000
+Subject: [PATCH] IWYU: add cmath for various math functions in //skia
+
+Bug: 957519
+Change-Id: I4616f7f161330feb3fb2299da094874663655189
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4545069
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1150817}
+---
+
+diff --git a/skia/ext/skcolorspace_trfn.cc b/skia/ext/skcolorspace_trfn.cc
+index c0d6bd2..97c4dfa 100644
+--- a/skia/ext/skcolorspace_trfn.cc
++++ b/skia/ext/skcolorspace_trfn.cc
+@@ -4,6 +4,8 @@
+
+ #include "skia/ext/skcolorspace_trfn.h"
+
++#include <cmath>
++
+ namespace skia {
+
+ namespace {
diff --git a/srcpkgs/chromium/patches/chromium-115-typename.patch b/srcpkgs/chromium/patches/chromium-115-typename.patch
new file mode 100644
index 000000000000..f0e59d5e48c9
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-typename.patch
@@ -0,0 +1,49 @@
+Patch-Source: https://src.fedoraproject.org/rpms/chromium/blob/1f8fd846d2cc72c90c73c9867619f0da43b9c816/f/chromium-115-typename.patch
+diff -up chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc.typename chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc
+--- chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc.typename 2023-06-17 14:50:56.342591702 +0200
++++ chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc 2023-06-17 14:57:48.024377375 +0200
+@@ -91,7 +91,7 @@ ItemSortKey GetSortKey(const Item& item)
+ // Helper to get an iterator to the last element in the cache. The cache
+ // must not be empty.
+ template <typename Item>
+-SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
++typename SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
+ CHECK(!cache.empty());
+ auto it = cache.end();
+ return std::prev(it);
+@@ -967,9 +967,9 @@ bool DownloadBubbleUpdateService::CacheM
+ }
+
+ template <typename Id, typename Item>
+-SortedItems<Item>::iterator
++typename SortedItems<Item>::iterator
+ DownloadBubbleUpdateService::CacheManager::RemoveItemFromCacheByIter(
+- SortedItems<Item>::iterator iter,
++ typename SortedItems<Item>::iterator iter,
+ SortedItems<Item>& cache,
+ IterMap<Id, Item>& iter_map) {
+ CHECK(iter != cache.end());
+diff -up chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h.me chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h
+--- chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h.me 2023-06-18 21:52:53.515625237 +0200
++++ chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h 2023-06-18 21:53:06.881881293 +0200
+@@ -189,7 +189,7 @@ class TFLiteModelExecutor : public Model
+ void SendForBatchExecution(
+ BatchExecutionCallback callback_on_complete,
+ base::TimeTicks start_time,
+- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
++ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
+ override {
+ DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+diff -up chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.me1 chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
+--- chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.me1 2023-06-19 10:03:32.319218678 +0200
++++ chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc 2023-06-19 10:04:12.023942232 +0200
+@@ -169,7 +169,7 @@ class HTMLFastPathParser {
+ using Span = base::span<const Char>;
+ using USpan = base::span<const UChar>;
+ // 32 matches that used by HTMLToken::Attribute.
+- typedef std::conditional<std::is_same_v<Char, UChar>,
++ typedef typename std::conditional<std::is_same_v<Char, UChar>,
+ UCharLiteralBuffer<32>,
+ LCharLiteralBuffer<32>>::type LiteralBufferType;
+ typedef UCharLiteralBuffer<32> UCharLiteralBufferType;
diff --git a/srcpkgs/chromium/patches/chromium-115-verify_name_match-include.patch b/srcpkgs/chromium/patches/chromium-115-verify_name_match-include.patch
new file mode 100644
index 000000000000..264531087712
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-verify_name_match-include.patch
@@ -0,0 +1,25 @@
+From 74c464ae56275f4de46b7d1f7e103fa758a637d2 Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Wed, 31 May 2023 17:03:02 +0000
+Subject: [PATCH] IWYU: std::vector used in verify_name_match.h without include
+
+Bug: 957519
+Change-Id: Ie753fadae35adb293f854a0f8d4f675e67a2fc31
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4533815
+Reviewed-by: David Benjamin <davidben@chromium.org>
+Commit-Queue: José Dapena Paz <jdapena@igalia.com>
+Cr-Commit-Position: refs/heads/main@{#1151307}
+---
+
+diff --git a/net/cert/pki/verify_name_match.h b/net/cert/pki/verify_name_match.h
+index d22cf7f..e30b221 100644
+--- a/net/cert/pki/verify_name_match.h
++++ b/net/cert/pki/verify_name_match.h
+@@ -6,6 +6,7 @@
+ #define NET_CERT_PKI_VERIFY_NAME_MATCH_H_
+
+ #include <string>
++#include <vector>
+
+ #include "net/base/net_export.h"
+
diff --git a/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch b/srcpkgs/chromium/patches/chromium-115-workaround_clang_bug-structured_binding.patch
similarity index 51%
rename from srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
rename to srcpkgs/chromium/patches/chromium-115-workaround_clang_bug-structured_binding.patch
index af8e737059c7..6492e2eba2b1 100644
--- a/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
+++ b/srcpkgs/chromium/patches/chromium-115-workaround_clang_bug-structured_binding.patch
@@ -1,6 +1,21 @@
-diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
---- chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding 2023-05-11 03:36:27.000000000 +0200
-+++ chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-05-14 11:49:42.558129164 +0200
+Patch-Source: https://src.fedoraproject.org/rpms/chromium/blob/rawhide/f/chromium-115-workaround_clang_bug-structured_binding.patch
+diff -up chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc.workaround_clang_bug-structured_binding chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc
+--- chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc.workaround_clang_bug-structured_binding 2023-06-07 21:48:37.000000000 +0200
++++ chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc 2023-06-17 16:53:20.216628557 +0200
+@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui
+ void CdmPromiseAdapter::Clear(ClearReason reason) {
+ // Reject all outstanding promises.
+ DCHECK(thread_checker_.CalledOnValidThread());
+- for (auto& [promise_id, promise] : promises_) {
++ for (auto& [p_i, p_e] : promises_) {
++ auto& promise_id = p_i;
++ auto& promise = p_e;
+ TRACE_EVENT_NESTABLE_ASYNC_END1(
+ "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
+ "status", "cleared");
+diff -up chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
+--- chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding 2023-06-07 21:48:41.000000000 +0200
++++ chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-06-17 18:47:06.001403966 +0200
@@ -238,7 +238,10 @@ const NGLayoutResult* NGGridLayoutAlgori
: BuildGridSizingTree(&oof_children);
@@ -13,20 +28,7 @@ diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/n
if (IsBreakInside(BreakToken())) {
// TODO(layout-dev): When we support variable inline-size fragments we'll
-@@ -520,8 +523,10 @@ wtf_size_t NGGridLayoutAlgorithm::BuildG
- row_auto_repetitions);
-
- bool has_nested_subgrid = false;
-- auto& [grid_items, layout_data, subtree_size] =
-- sizing_tree->CreateSizingData(opt_subgrid_data);
-+ auto& [g_i, l_d, s_s] = sizing_tree->CreateSizingData(opt_subgrid_data);
-+ auto& grid_items = g_i;
-+ auto& layout_data = l_d;
-+ auto& subtree_size = s_s;
-
- if (!must_ignore_children) {
- // Construct grid items that are not subgridded.
-@@ -650,8 +655,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
+@@ -655,8 +658,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
NGGridSizingTree sizing_tree;
if (const auto* layout_subtree = ConstraintSpace().GridLayoutSubtree()) {
@@ -39,8 +41,8 @@ diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/n
const auto& node = Node();
grid_items =
-@@ -1640,8 +1647,10 @@ void NGGridLayoutAlgorithm::InitializeTr
- const absl::optional<GridTrackSizingDirection>& opt_track_direction) const {
+@@ -1798,8 +1803,10 @@ void NGGridLayoutAlgorithm::CompleteTrac
+ bool* opt_needs_additional_pass) const {
DCHECK(sizing_subtree);
- auto& [grid_items, layout_data, subtree_size] =
@@ -50,12 +52,12 @@ diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/n
+ auto& layout_data = l_d;
+ auto& subtree_size = s_s;
- auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) {
- InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data);
-@@ -1825,8 +1834,10 @@ void NGGridLayoutAlgorithm::CompleteTrac
- bool* opt_needs_additional_pass) const {
- DCHECK(sizing_subtree);
-
+ const bool is_for_columns = track_direction == kForColumns;
+ const bool has_non_definite_track =
+@@ -1924,8 +1931,10 @@ template <typename CallbackFunc>
+ void NGGridLayoutAlgorithm::ForEachSubgrid(
+ const NGGridSizingSubtree& sizing_subtree,
+ const CallbackFunc& callback_func) const {
- auto& [grid_items, layout_data, subtree_size] =
- sizing_subtree.SubtreeRootData();
+ auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
@@ -63,19 +65,18 @@ diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/n
+ auto& layout_data = l_d;
+ auto& subtree_size = s_s;
- const bool is_for_columns = track_direction == kForColumns;
- const bool has_non_definite_track =
-diff -up chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc
---- chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me 2023-05-14 17:35:00.446844465 +0200
-+++ chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc 2023-05-14 17:39:22.991733926 +0200
-@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui
- void CdmPromiseAdapter::Clear(ClearReason reason) {
- // Reject all outstanding promises.
- DCHECK(thread_checker_.CalledOnValidThread());
-- for (auto& [promise_id, promise] : promises_) {
-+ for (auto& [p_i, p_e] : promises_) {
-+ auto& promise_id = p_i;
-+ auto& promise = p_e;
- TRACE_EVENT_NESTABLE_ASYNC_END1(
- "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
- "status", "cleared");
+ // If we know this subtree doesn't have nested subgrids we can exit early
+ // instead of iterating over every grid item looking for them.
+diff -up chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc.me chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc
+--- chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc.me 2023-06-19 08:04:02.287072722 +0200
++++ chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc 2023-06-19 08:18:24.576814950 +0200
+@@ -1393,7 +1393,8 @@ void ServiceWorkerContextWrapper::MaybeP
+ return;
+ }
+
+- auto [document_url, key, callback] = std::move(*request);
++ auto [d_u, key, callback] = std::move(*request);
++ auto document_url = d_u;
+
+ DCHECK(document_url.is_valid());
+ TRACE_EVENT1("ServiceWorker",
diff --git a/srcpkgs/chromium/patches/download-bubble-typename.patch b/srcpkgs/chromium/patches/download-bubble-typename.patch
deleted file mode 100644
index 8edb46974a5b..000000000000
--- a/srcpkgs/chromium/patches/download-bubble-typename.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Patch-Source: https://github.com/archlinux/svntogit-packages/blob/79b774aedeaecd4d31b2adb84e3e4b901dc980aa/trunk/download-bubble-typename.patch
---
-diff --git a/chrome/browser/download/bubble/download_bubble_update_service.cc b/chrome/browser/download/bubble/download_bubble_update_service.cc
-index 13460309d0e..a18d2f8a272 100644
---- a/chrome/browser/download/bubble/download_bubble_update_service.cc
-+++ b/chrome/browser/download/bubble/download_bubble_update_service.cc
-@@ -87,7 +87,7 @@ ItemSortKey GetSortKey(const Item& item) {
- // Helper to get an iterator to the last element in the cache. The cache
- // must not be empty.
- template <typename Item>
--SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) {
-+typename SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) {
- CHECK(!cache.empty());
- auto it = cache.end();
- return std::prev(it);
-@@ -656,9 +656,9 @@ bool DownloadBubbleUpdateService::RemoveItemFromCacheImpl(
- }
-
- template <typename Id, typename Item>
--SortedItems<Item>::iterator
-+typename SortedItems<Item>::iterator
- DownloadBubbleUpdateService::RemoveItemFromCacheByIter(
-- SortedItems<Item>::iterator iter,
-+ typename SortedItems<Item>::iterator iter,
- SortedItems<Item>& cache,
- IterMap<Id, Item>& iter_map) {
- CHECK(iter != cache.end());
-diff --git a/chrome/browser/download/bubble/download_bubble_update_service.h b/chrome/browser/download/bubble/download_bubble_update_service.h
-index 4c3c0bc1193..38048873aa9 100644
---- a/chrome/browser/download/bubble/download_bubble_update_service.h
-+++ b/chrome/browser/download/bubble/download_bubble_update_service.h
-@@ -179,8 +179,8 @@ class DownloadBubbleUpdateService
-
- // Removes item if we already have the iterator to it. Returns next iterator.
- template <typename Id, typename Item>
-- SortedItems<Item>::iterator RemoveItemFromCacheByIter(
-- SortedItems<Item>::iterator iter,
-+ typename SortedItems<Item>::iterator RemoveItemFromCacheByIter(
-+ typename SortedItems<Item>::iterator iter,
- SortedItems<Item>& cache,
- IterMap<Id, Item>& iter_map);
-
diff --git a/srcpkgs/chromium/patches/random-fixes.patch b/srcpkgs/chromium/patches/random-fixes.patch
new file mode 100644
index 000000000000..8513634b69ec
--- /dev/null
+++ b/srcpkgs/chromium/patches/random-fixes.patch
@@ -0,0 +1,15 @@
+Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/chromium/-/blob/c073b0c20935d7eb452732e0f3b2860a96c3db21/random-build-fixes.patch
+--
+diff --git a/chrome/browser/download/bubble/download_bubble_update_service.cc b/chrome/browser/download/bubble/download_bubble_update_service.cc
+index 41b647f7b44..8940c6bb7fc 100644
+--- a/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.cc
++++ b/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.cc
+@@ -103,6 +103,6 @@ void BoundSessionRefreshCookieFetcherImpl::OnURLLoaderComplete(
+ net::Error net_error = static_cast<net::Error>(url_loader_->NetError());
+
+ std::move(callback_).Run(
+- Result(net_error, headers ? absl::optional<int>(headers->response_code())
+- : absl::nullopt));
++ Result({net_error, headers ? absl::optional<int>(headers->response_code())
++ : absl::nullopt}));
+ }
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index b4a39dfd3815..3eb657ab23d2 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,13 +1,14 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=114.0.5735.106
+version=115.0.5790.98
revision=1
archs="i686* x86_64* aarch64* armv7l*"
hostmakedepends="
$(vopt_if clang "clang lld llvm15")
bison git gperf hwids ninja nodejs perl pkg-config python3
- libatomic-devel libepoxy-devel libevent-devel libglib-devel"
+ libatomic-devel libepoxy-devel libevent-devel libglib-devel
+ rust"
makedepends="
alsa-lib-devel libdav1d-devel brotli-devel cups-devel elfutils-devel ffmpeg-devel
fontconfig-devel freetype-devel gtk+3-devel jsoncpp-devel libXScrnSaver-devel
@@ -27,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=df18b0b28bf52b1c099acde54e568fbfa2c9225150108bce9d53d8b31f71304a
+checksum=ffbe630ecf8fc8a250be05fdbec6c94d5881b5fcbbc5fb2b93e54ddc78d56af1
lib32disabled=yes
@@ -193,6 +194,9 @@ do_configure() {
'use_custom_libcxx=false'
'use_gold=false'
+ 'rust=true'
+ 'rust_sysroot_absolute="/usr"'
+
# is_debug makes the build a debug build, changes some things.
# might be useful for real debugging vs just debug symbols.
"is_debug=false"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] chromium: update to 115.0.5790.98.
2023-07-19 12:44 [PR PATCH] chromium: update to 115.0.5790.98 Duncaen
@ 2023-07-19 19:00 ` Duncaen
2023-07-19 19:12 ` Duncaen
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Duncaen @ 2023-07-19 19:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 411 bytes --]
There is an updated pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages chromium-115
https://github.com/void-linux/void-packages/pull/45130
chromium: update to 115.0.5790.98.
[ci skip]
* [ ] x86_64-glibc
* [ ] x86_64-musl
* [ ] aarch64-musl
* [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/45130.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-115-45130.patch --]
[-- Type: text/x-diff, Size: 27506 bytes --]
From bcb1ae62367468ce00a8af27d3752acba8a19f42 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 19 Jul 2023 14:35:14 +0200
Subject: [PATCH] chromium: update to 115.0.5790.98.
---
...typename-s-that-are-required-in-C-17.patch | 45 ----------
.../chromium-114-maldoca-include.patch | 25 ++++++
.../chromium-115-compiler-SkColor4f.patch | 27 ++++++
...ium-115-emplace_back_on_vector-c++20.patch | 22 +++++
.../patches/chromium-115-skia-include.patch | 26 ++++++
.../patches/chromium-115-typename.patch | 49 +++++++++++
...romium-115-verify_name_match-include.patch | 25 ++++++
...around_clang_bug-structured_binding.patch} | 83 ++++++++++---------
.../patches/download-bubble-typename.patch | 42 ----------
srcpkgs/chromium/patches/random-fixes.patch | 15 ++++
srcpkgs/chromium/template | 10 ++-
11 files changed, 238 insertions(+), 131 deletions(-)
delete mode 100644 srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
create mode 100644 srcpkgs/chromium/patches/chromium-114-maldoca-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-compiler-SkColor4f.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-emplace_back_on_vector-c++20.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-skia-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-typename.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-verify_name_match-include.patch
rename srcpkgs/chromium/patches/{chromium-114-workaround_clang_bug-structured_binding.patch => chromium-115-workaround_clang_bug-structured_binding.patch} (51%)
delete mode 100644 srcpkgs/chromium/patches/download-bubble-typename.patch
create mode 100644 srcpkgs/chromium/patches/random-fixes.patch
diff --git a/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch b/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
deleted file mode 100644
index 35b7152cbbdb..000000000000
--- a/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2914039316d4ed3f53c3393dc2ba48f637807689 Mon Sep 17 00:00:00 2001
-From: Peter Kasting <pkasting@chromium.org>
-Date: Fri, 12 May 2023 16:40:53 +0000
-Subject: [PATCH] Add some "typename"s that are required in C++17.
-
-Bug: 1444563
-Change-Id: I7801f5e82a40305c357eeda219678dda558f5752
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4526465
-Commit-Queue: Alan Screen <awscreen@chromium.org>
-Reviewed-by: Alan Screen <awscreen@chromium.org>
-Auto-Submit: Peter Kasting <pkasting@chromium.org>
-Commit-Queue: Peter Kasting <pkasting@chromium.org>
-Code-Coverage: Findit <findit-for-me@appspot.gserviceaccount.com>
-Cr-Commit-Position: refs/heads/main@{#1143319}
----
- chrome/browser/printing/print_backend_service_manager.cc | 2 +-
- chrome/browser/printing/print_backend_service_manager.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/chrome/browser/printing/print_backend_service_manager.cc b/chrome/browser/printing/print_backend_service_manager.cc
-index b5a4b525a2d..224369cd58c 100644
---- a/chrome/browser/printing/print_backend_service_manager.cc
-+++ b/chrome/browser/printing/print_backend_service_manager.cc
-@@ -1477,7 +1477,7 @@ template <class... T>
- void PrintBackendServiceManager::RunSavedCallbacks(
- RemoteSavedCallbacks<T...>& saved_callbacks,
- const RemoteId& remote_id,
-- std::remove_reference<T>::type... result) {
-+ typename std::remove_reference<T>::type... result) {
- auto found_callbacks_map = saved_callbacks.find(remote_id);
- if (found_callbacks_map == saved_callbacks.end())
- return; // No callbacks to run.
-diff --git a/chrome/browser/printing/print_backend_service_manager.h b/chrome/browser/printing/print_backend_service_manager.h
-index 41788f42a95..6aa7479c1fd 100644
---- a/chrome/browser/printing/print_backend_service_manager.h
-+++ b/chrome/browser/printing/print_backend_service_manager.h
-@@ -588,7 +588,7 @@ class PrintBackendServiceManager {
- template <class... T>
- void RunSavedCallbacks(RemoteSavedCallbacks<T...>& saved_callbacks,
- const RemoteId& remote_id,
-- std::remove_reference<T>::type... result);
-+ typename std::remove_reference<T>::type... result);
-
- // Test support for client ID management.
- static void SetClientsForTesting(
diff --git a/srcpkgs/chromium/patches/chromium-114-maldoca-include.patch b/srcpkgs/chromium/patches/chromium-114-maldoca-include.patch
new file mode 100644
index 000000000000..0259cb9b0d01
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-114-maldoca-include.patch
@@ -0,0 +1,25 @@
+From 345c58f1d85286b394c05bb8d871ac8173be90a3 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 31 Mar 2023 16:26:06 +0000
+Subject: [PATCH] IWYU: add stdint.h for int types in maldoca
+
+---
+ third_party/maldoca/src/maldoca/ole/header.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/third_party/maldoca/src/maldoca/ole/header.h b/third_party/maldoca/src/maldoca/ole/header.h
+index 174f704..41c41d5 100644
+--- a/third_party/maldoca/src/maldoca/ole/header.h
++++ b/third_party/maldoca/src/maldoca/ole/header.h
+@@ -43,6 +43,8 @@
+ #ifndef MALDOCA_OLE_HEADER_H_
+ #define MALDOCA_OLE_HEADER_H_
+
++#include <stdint.h>
++
+ #include "absl/strings/string_view.h"
+
+ namespace maldoca {
+--
+2.39.2
+
diff --git a/srcpkgs/chromium/patches/chromium-115-compiler-SkColor4f.patch b/srcpkgs/chromium/patches/chromium-115-compiler-SkColor4f.patch
new file mode 100644
index 000000000000..ffa0e7ed108c
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-compiler-SkColor4f.patch
@@ -0,0 +1,27 @@
+Patch-Source: https://src.fedoraproject.org/rpms/chromium/blob/1f8fd846d2cc72c90c73c9867619f0da43b9c816/f/chromium-115-compiler-SkColor4f.patch
+diff -up chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc.me chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc
+--- chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc.me 2023-06-24 10:38:11.011511463 +0200
++++ chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc 2023-06-24 13:07:35.865375884 +0200
+@@ -84,6 +84,7 @@ CanvasStyle::CanvasStyle(const CanvasSty
+
+ void CanvasStyle::ApplyToFlags(cc::PaintFlags& flags,
+ float global_alpha) const {
++ SkColor4f custom_color = SkColor4f{0.0f, 0.0f, 0.0f, global_alpha};
+ switch (type_) {
+ case kColor:
+ ApplyColorToFlags(flags, global_alpha);
+@@ -91,12 +92,12 @@ void CanvasStyle::ApplyToFlags(cc::Paint
+ case kGradient:
+ GetCanvasGradient()->GetGradient()->ApplyToFlags(flags, SkMatrix::I(),
+ ImageDrawOptions());
+- flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha));
++ flags.setColor(custom_color);
+ break;
+ case kImagePattern:
+ GetCanvasPattern()->GetPattern()->ApplyToFlags(
+ flags, AffineTransformToSkMatrix(GetCanvasPattern()->GetTransform()));
+- flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha));
++ flags.setColor(custom_color);
+ break;
+ default:
+ NOTREACHED();
diff --git a/srcpkgs/chromium/patches/chromium-115-emplace_back_on_vector-c++20.patch b/srcpkgs/chromium/patches/chromium-115-emplace_back_on_vector-c++20.patch
new file mode 100644
index 000000000000..92dbbf984676
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-emplace_back_on_vector-c++20.patch
@@ -0,0 +1,22 @@
+Patch-Source: https://src.fedoraproject.org/rpms/chromium/blob/1f8fd846d2cc72c90c73c9867619f0da43b9c816/f/chromium-115-emplace_back_on_vector-c++20.patch
+diff -up chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc.me chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc
+--- chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc.me 2023-06-25 10:06:58.445990069 +0200
++++ chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc 2023-06-25 10:51:17.640818231 +0200
+@@ -355,7 +355,7 @@ Status ParseMobileEmulation(const base::
+ "'version' field of type string");
+ }
+
+- brands.emplace_back(*brand, *version);
++ brands.emplace_back() = {*brand, *version};
+ }
+
+ client_hints.brands = std::move(brands);
+@@ -392,7 +392,7 @@ Status ParseMobileEmulation(const base::
+ "a 'version' field of type string");
+ }
+
+- full_version_list.emplace_back(*brand, *version);
++ full_version_list.emplace_back() = {*brand, *version};
+ }
+
+ client_hints.full_version_list = std::move(full_version_list);
diff --git a/srcpkgs/chromium/patches/chromium-115-skia-include.patch b/srcpkgs/chromium/patches/chromium-115-skia-include.patch
new file mode 100644
index 000000000000..b32481bf6465
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-skia-include.patch
@@ -0,0 +1,26 @@
+From 76f7e61f1a7b3e3d445b4f6c32e29c5f05fa2c71 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Tue, 30 May 2023 20:27:03 +0000
+Subject: [PATCH] IWYU: add cmath for various math functions in //skia
+
+Bug: 957519
+Change-Id: I4616f7f161330feb3fb2299da094874663655189
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4545069
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1150817}
+---
+
+diff --git a/skia/ext/skcolorspace_trfn.cc b/skia/ext/skcolorspace_trfn.cc
+index c0d6bd2..97c4dfa 100644
+--- a/skia/ext/skcolorspace_trfn.cc
++++ b/skia/ext/skcolorspace_trfn.cc
+@@ -4,6 +4,8 @@
+
+ #include "skia/ext/skcolorspace_trfn.h"
+
++#include <cmath>
++
+ namespace skia {
+
+ namespace {
diff --git a/srcpkgs/chromium/patches/chromium-115-typename.patch b/srcpkgs/chromium/patches/chromium-115-typename.patch
new file mode 100644
index 000000000000..f0e59d5e48c9
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-typename.patch
@@ -0,0 +1,49 @@
+Patch-Source: https://src.fedoraproject.org/rpms/chromium/blob/1f8fd846d2cc72c90c73c9867619f0da43b9c816/f/chromium-115-typename.patch
+diff -up chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc.typename chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc
+--- chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc.typename 2023-06-17 14:50:56.342591702 +0200
++++ chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc 2023-06-17 14:57:48.024377375 +0200
+@@ -91,7 +91,7 @@ ItemSortKey GetSortKey(const Item& item)
+ // Helper to get an iterator to the last element in the cache. The cache
+ // must not be empty.
+ template <typename Item>
+-SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
++typename SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
+ CHECK(!cache.empty());
+ auto it = cache.end();
+ return std::prev(it);
+@@ -967,9 +967,9 @@ bool DownloadBubbleUpdateService::CacheM
+ }
+
+ template <typename Id, typename Item>
+-SortedItems<Item>::iterator
++typename SortedItems<Item>::iterator
+ DownloadBubbleUpdateService::CacheManager::RemoveItemFromCacheByIter(
+- SortedItems<Item>::iterator iter,
++ typename SortedItems<Item>::iterator iter,
+ SortedItems<Item>& cache,
+ IterMap<Id, Item>& iter_map) {
+ CHECK(iter != cache.end());
+diff -up chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h.me chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h
+--- chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h.me 2023-06-18 21:52:53.515625237 +0200
++++ chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h 2023-06-18 21:53:06.881881293 +0200
+@@ -189,7 +189,7 @@ class TFLiteModelExecutor : public Model
+ void SendForBatchExecution(
+ BatchExecutionCallback callback_on_complete,
+ base::TimeTicks start_time,
+- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
++ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
+ override {
+ DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+diff -up chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.me1 chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
+--- chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.me1 2023-06-19 10:03:32.319218678 +0200
++++ chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc 2023-06-19 10:04:12.023942232 +0200
+@@ -169,7 +169,7 @@ class HTMLFastPathParser {
+ using Span = base::span<const Char>;
+ using USpan = base::span<const UChar>;
+ // 32 matches that used by HTMLToken::Attribute.
+- typedef std::conditional<std::is_same_v<Char, UChar>,
++ typedef typename std::conditional<std::is_same_v<Char, UChar>,
+ UCharLiteralBuffer<32>,
+ LCharLiteralBuffer<32>>::type LiteralBufferType;
+ typedef UCharLiteralBuffer<32> UCharLiteralBufferType;
diff --git a/srcpkgs/chromium/patches/chromium-115-verify_name_match-include.patch b/srcpkgs/chromium/patches/chromium-115-verify_name_match-include.patch
new file mode 100644
index 000000000000..264531087712
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-verify_name_match-include.patch
@@ -0,0 +1,25 @@
+From 74c464ae56275f4de46b7d1f7e103fa758a637d2 Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Wed, 31 May 2023 17:03:02 +0000
+Subject: [PATCH] IWYU: std::vector used in verify_name_match.h without include
+
+Bug: 957519
+Change-Id: Ie753fadae35adb293f854a0f8d4f675e67a2fc31
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4533815
+Reviewed-by: David Benjamin <davidben@chromium.org>
+Commit-Queue: José Dapena Paz <jdapena@igalia.com>
+Cr-Commit-Position: refs/heads/main@{#1151307}
+---
+
+diff --git a/net/cert/pki/verify_name_match.h b/net/cert/pki/verify_name_match.h
+index d22cf7f..e30b221 100644
+--- a/net/cert/pki/verify_name_match.h
++++ b/net/cert/pki/verify_name_match.h
+@@ -6,6 +6,7 @@
+ #define NET_CERT_PKI_VERIFY_NAME_MATCH_H_
+
+ #include <string>
++#include <vector>
+
+ #include "net/base/net_export.h"
+
diff --git a/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch b/srcpkgs/chromium/patches/chromium-115-workaround_clang_bug-structured_binding.patch
similarity index 51%
rename from srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
rename to srcpkgs/chromium/patches/chromium-115-workaround_clang_bug-structured_binding.patch
index af8e737059c7..6492e2eba2b1 100644
--- a/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
+++ b/srcpkgs/chromium/patches/chromium-115-workaround_clang_bug-structured_binding.patch
@@ -1,6 +1,21 @@
-diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
---- chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding 2023-05-11 03:36:27.000000000 +0200
-+++ chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-05-14 11:49:42.558129164 +0200
+Patch-Source: https://src.fedoraproject.org/rpms/chromium/blob/rawhide/f/chromium-115-workaround_clang_bug-structured_binding.patch
+diff -up chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc.workaround_clang_bug-structured_binding chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc
+--- chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc.workaround_clang_bug-structured_binding 2023-06-07 21:48:37.000000000 +0200
++++ chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc 2023-06-17 16:53:20.216628557 +0200
+@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui
+ void CdmPromiseAdapter::Clear(ClearReason reason) {
+ // Reject all outstanding promises.
+ DCHECK(thread_checker_.CalledOnValidThread());
+- for (auto& [promise_id, promise] : promises_) {
++ for (auto& [p_i, p_e] : promises_) {
++ auto& promise_id = p_i;
++ auto& promise = p_e;
+ TRACE_EVENT_NESTABLE_ASYNC_END1(
+ "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
+ "status", "cleared");
+diff -up chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
+--- chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding 2023-06-07 21:48:41.000000000 +0200
++++ chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-06-17 18:47:06.001403966 +0200
@@ -238,7 +238,10 @@ const NGLayoutResult* NGGridLayoutAlgori
: BuildGridSizingTree(&oof_children);
@@ -13,20 +28,7 @@ diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/n
if (IsBreakInside(BreakToken())) {
// TODO(layout-dev): When we support variable inline-size fragments we'll
-@@ -520,8 +523,10 @@ wtf_size_t NGGridLayoutAlgorithm::BuildG
- row_auto_repetitions);
-
- bool has_nested_subgrid = false;
-- auto& [grid_items, layout_data, subtree_size] =
-- sizing_tree->CreateSizingData(opt_subgrid_data);
-+ auto& [g_i, l_d, s_s] = sizing_tree->CreateSizingData(opt_subgrid_data);
-+ auto& grid_items = g_i;
-+ auto& layout_data = l_d;
-+ auto& subtree_size = s_s;
-
- if (!must_ignore_children) {
- // Construct grid items that are not subgridded.
-@@ -650,8 +655,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
+@@ -655,8 +658,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
NGGridSizingTree sizing_tree;
if (const auto* layout_subtree = ConstraintSpace().GridLayoutSubtree()) {
@@ -39,8 +41,8 @@ diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/n
const auto& node = Node();
grid_items =
-@@ -1640,8 +1647,10 @@ void NGGridLayoutAlgorithm::InitializeTr
- const absl::optional<GridTrackSizingDirection>& opt_track_direction) const {
+@@ -1798,8 +1803,10 @@ void NGGridLayoutAlgorithm::CompleteTrac
+ bool* opt_needs_additional_pass) const {
DCHECK(sizing_subtree);
- auto& [grid_items, layout_data, subtree_size] =
@@ -50,12 +52,12 @@ diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/n
+ auto& layout_data = l_d;
+ auto& subtree_size = s_s;
- auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) {
- InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data);
-@@ -1825,8 +1834,10 @@ void NGGridLayoutAlgorithm::CompleteTrac
- bool* opt_needs_additional_pass) const {
- DCHECK(sizing_subtree);
-
+ const bool is_for_columns = track_direction == kForColumns;
+ const bool has_non_definite_track =
+@@ -1924,8 +1931,10 @@ template <typename CallbackFunc>
+ void NGGridLayoutAlgorithm::ForEachSubgrid(
+ const NGGridSizingSubtree& sizing_subtree,
+ const CallbackFunc& callback_func) const {
- auto& [grid_items, layout_data, subtree_size] =
- sizing_subtree.SubtreeRootData();
+ auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
@@ -63,19 +65,18 @@ diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/n
+ auto& layout_data = l_d;
+ auto& subtree_size = s_s;
- const bool is_for_columns = track_direction == kForColumns;
- const bool has_non_definite_track =
-diff -up chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc
---- chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me 2023-05-14 17:35:00.446844465 +0200
-+++ chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc 2023-05-14 17:39:22.991733926 +0200
-@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui
- void CdmPromiseAdapter::Clear(ClearReason reason) {
- // Reject all outstanding promises.
- DCHECK(thread_checker_.CalledOnValidThread());
-- for (auto& [promise_id, promise] : promises_) {
-+ for (auto& [p_i, p_e] : promises_) {
-+ auto& promise_id = p_i;
-+ auto& promise = p_e;
- TRACE_EVENT_NESTABLE_ASYNC_END1(
- "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
- "status", "cleared");
+ // If we know this subtree doesn't have nested subgrids we can exit early
+ // instead of iterating over every grid item looking for them.
+diff -up chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc.me chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc
+--- chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc.me 2023-06-19 08:04:02.287072722 +0200
++++ chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc 2023-06-19 08:18:24.576814950 +0200
+@@ -1393,7 +1393,8 @@ void ServiceWorkerContextWrapper::MaybeP
+ return;
+ }
+
+- auto [document_url, key, callback] = std::move(*request);
++ auto [d_u, key, callback] = std::move(*request);
++ auto document_url = d_u;
+
+ DCHECK(document_url.is_valid());
+ TRACE_EVENT1("ServiceWorker",
diff --git a/srcpkgs/chromium/patches/download-bubble-typename.patch b/srcpkgs/chromium/patches/download-bubble-typename.patch
deleted file mode 100644
index 8edb46974a5b..000000000000
--- a/srcpkgs/chromium/patches/download-bubble-typename.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Patch-Source: https://github.com/archlinux/svntogit-packages/blob/79b774aedeaecd4d31b2adb84e3e4b901dc980aa/trunk/download-bubble-typename.patch
---
-diff --git a/chrome/browser/download/bubble/download_bubble_update_service.cc b/chrome/browser/download/bubble/download_bubble_update_service.cc
-index 13460309d0e..a18d2f8a272 100644
---- a/chrome/browser/download/bubble/download_bubble_update_service.cc
-+++ b/chrome/browser/download/bubble/download_bubble_update_service.cc
-@@ -87,7 +87,7 @@ ItemSortKey GetSortKey(const Item& item) {
- // Helper to get an iterator to the last element in the cache. The cache
- // must not be empty.
- template <typename Item>
--SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) {
-+typename SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) {
- CHECK(!cache.empty());
- auto it = cache.end();
- return std::prev(it);
-@@ -656,9 +656,9 @@ bool DownloadBubbleUpdateService::RemoveItemFromCacheImpl(
- }
-
- template <typename Id, typename Item>
--SortedItems<Item>::iterator
-+typename SortedItems<Item>::iterator
- DownloadBubbleUpdateService::RemoveItemFromCacheByIter(
-- SortedItems<Item>::iterator iter,
-+ typename SortedItems<Item>::iterator iter,
- SortedItems<Item>& cache,
- IterMap<Id, Item>& iter_map) {
- CHECK(iter != cache.end());
-diff --git a/chrome/browser/download/bubble/download_bubble_update_service.h b/chrome/browser/download/bubble/download_bubble_update_service.h
-index 4c3c0bc1193..38048873aa9 100644
---- a/chrome/browser/download/bubble/download_bubble_update_service.h
-+++ b/chrome/browser/download/bubble/download_bubble_update_service.h
-@@ -179,8 +179,8 @@ class DownloadBubbleUpdateService
-
- // Removes item if we already have the iterator to it. Returns next iterator.
- template <typename Id, typename Item>
-- SortedItems<Item>::iterator RemoveItemFromCacheByIter(
-- SortedItems<Item>::iterator iter,
-+ typename SortedItems<Item>::iterator RemoveItemFromCacheByIter(
-+ typename SortedItems<Item>::iterator iter,
- SortedItems<Item>& cache,
- IterMap<Id, Item>& iter_map);
-
diff --git a/srcpkgs/chromium/patches/random-fixes.patch b/srcpkgs/chromium/patches/random-fixes.patch
new file mode 100644
index 000000000000..8513634b69ec
--- /dev/null
+++ b/srcpkgs/chromium/patches/random-fixes.patch
@@ -0,0 +1,15 @@
+Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/chromium/-/blob/c073b0c20935d7eb452732e0f3b2860a96c3db21/random-build-fixes.patch
+--
+diff --git a/chrome/browser/download/bubble/download_bubble_update_service.cc b/chrome/browser/download/bubble/download_bubble_update_service.cc
+index 41b647f7b44..8940c6bb7fc 100644
+--- a/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.cc
++++ b/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.cc
+@@ -103,6 +103,6 @@ void BoundSessionRefreshCookieFetcherImpl::OnURLLoaderComplete(
+ net::Error net_error = static_cast<net::Error>(url_loader_->NetError());
+
+ std::move(callback_).Run(
+- Result(net_error, headers ? absl::optional<int>(headers->response_code())
+- : absl::nullopt));
++ Result({net_error, headers ? absl::optional<int>(headers->response_code())
++ : absl::nullopt}));
+ }
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index b4a39dfd3815..3eb657ab23d2 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,13 +1,14 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=114.0.5735.106
+version=115.0.5790.98
revision=1
archs="i686* x86_64* aarch64* armv7l*"
hostmakedepends="
$(vopt_if clang "clang lld llvm15")
bison git gperf hwids ninja nodejs perl pkg-config python3
- libatomic-devel libepoxy-devel libevent-devel libglib-devel"
+ libatomic-devel libepoxy-devel libevent-devel libglib-devel
+ rust"
makedepends="
alsa-lib-devel libdav1d-devel brotli-devel cups-devel elfutils-devel ffmpeg-devel
fontconfig-devel freetype-devel gtk+3-devel jsoncpp-devel libXScrnSaver-devel
@@ -27,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=df18b0b28bf52b1c099acde54e568fbfa2c9225150108bce9d53d8b31f71304a
+checksum=ffbe630ecf8fc8a250be05fdbec6c94d5881b5fcbbc5fb2b93e54ddc78d56af1
lib32disabled=yes
@@ -193,6 +194,9 @@ do_configure() {
'use_custom_libcxx=false'
'use_gold=false'
+ 'rust=true'
+ 'rust_sysroot_absolute="/usr"'
+
# is_debug makes the build a debug build, changes some things.
# might be useful for real debugging vs just debug symbols.
"is_debug=false"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] chromium: update to 115.0.5790.98.
2023-07-19 12:44 [PR PATCH] chromium: update to 115.0.5790.98 Duncaen
2023-07-19 19:00 ` [PR PATCH] [Updated] " Duncaen
@ 2023-07-19 19:12 ` Duncaen
2023-07-20 0:16 ` Duncaen
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Duncaen @ 2023-07-19 19:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 411 bytes --]
There is an updated pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages chromium-115
https://github.com/void-linux/void-packages/pull/45130
chromium: update to 115.0.5790.98.
[ci skip]
* [ ] x86_64-glibc
* [ ] x86_64-musl
* [ ] aarch64-musl
* [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/45130.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-115-45130.patch --]
[-- Type: text/x-diff, Size: 27506 bytes --]
From b9c9450a321cefd5e00c8794b089b82b05591849 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 19 Jul 2023 14:35:14 +0200
Subject: [PATCH] chromium: update to 115.0.5790.98.
---
...typename-s-that-are-required-in-C-17.patch | 45 ----------
.../chromium-114-maldoca-include.patch | 25 ++++++
.../chromium-115-compiler-SkColor4f.patch | 27 ++++++
...ium-115-emplace_back_on_vector-c++20.patch | 22 +++++
.../patches/chromium-115-skia-include.patch | 26 ++++++
.../patches/chromium-115-typename.patch | 49 +++++++++++
...romium-115-verify_name_match-include.patch | 25 ++++++
...around_clang_bug-structured_binding.patch} | 83 ++++++++++---------
.../patches/download-bubble-typename.patch | 42 ----------
srcpkgs/chromium/patches/random-fixes.patch | 15 ++++
srcpkgs/chromium/template | 10 ++-
11 files changed, 238 insertions(+), 131 deletions(-)
delete mode 100644 srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
create mode 100644 srcpkgs/chromium/patches/chromium-114-maldoca-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-compiler-SkColor4f.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-emplace_back_on_vector-c++20.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-skia-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-typename.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-verify_name_match-include.patch
rename srcpkgs/chromium/patches/{chromium-114-workaround_clang_bug-structured_binding.patch => chromium-115-workaround_clang_bug-structured_binding.patch} (51%)
delete mode 100644 srcpkgs/chromium/patches/download-bubble-typename.patch
create mode 100644 srcpkgs/chromium/patches/random-fixes.patch
diff --git a/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch b/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
deleted file mode 100644
index 35b7152cbbdb..000000000000
--- a/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2914039316d4ed3f53c3393dc2ba48f637807689 Mon Sep 17 00:00:00 2001
-From: Peter Kasting <pkasting@chromium.org>
-Date: Fri, 12 May 2023 16:40:53 +0000
-Subject: [PATCH] Add some "typename"s that are required in C++17.
-
-Bug: 1444563
-Change-Id: I7801f5e82a40305c357eeda219678dda558f5752
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4526465
-Commit-Queue: Alan Screen <awscreen@chromium.org>
-Reviewed-by: Alan Screen <awscreen@chromium.org>
-Auto-Submit: Peter Kasting <pkasting@chromium.org>
-Commit-Queue: Peter Kasting <pkasting@chromium.org>
-Code-Coverage: Findit <findit-for-me@appspot.gserviceaccount.com>
-Cr-Commit-Position: refs/heads/main@{#1143319}
----
- chrome/browser/printing/print_backend_service_manager.cc | 2 +-
- chrome/browser/printing/print_backend_service_manager.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/chrome/browser/printing/print_backend_service_manager.cc b/chrome/browser/printing/print_backend_service_manager.cc
-index b5a4b525a2d..224369cd58c 100644
---- a/chrome/browser/printing/print_backend_service_manager.cc
-+++ b/chrome/browser/printing/print_backend_service_manager.cc
-@@ -1477,7 +1477,7 @@ template <class... T>
- void PrintBackendServiceManager::RunSavedCallbacks(
- RemoteSavedCallbacks<T...>& saved_callbacks,
- const RemoteId& remote_id,
-- std::remove_reference<T>::type... result) {
-+ typename std::remove_reference<T>::type... result) {
- auto found_callbacks_map = saved_callbacks.find(remote_id);
- if (found_callbacks_map == saved_callbacks.end())
- return; // No callbacks to run.
-diff --git a/chrome/browser/printing/print_backend_service_manager.h b/chrome/browser/printing/print_backend_service_manager.h
-index 41788f42a95..6aa7479c1fd 100644
---- a/chrome/browser/printing/print_backend_service_manager.h
-+++ b/chrome/browser/printing/print_backend_service_manager.h
-@@ -588,7 +588,7 @@ class PrintBackendServiceManager {
- template <class... T>
- void RunSavedCallbacks(RemoteSavedCallbacks<T...>& saved_callbacks,
- const RemoteId& remote_id,
-- std::remove_reference<T>::type... result);
-+ typename std::remove_reference<T>::type... result);
-
- // Test support for client ID management.
- static void SetClientsForTesting(
diff --git a/srcpkgs/chromium/patches/chromium-114-maldoca-include.patch b/srcpkgs/chromium/patches/chromium-114-maldoca-include.patch
new file mode 100644
index 000000000000..0259cb9b0d01
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-114-maldoca-include.patch
@@ -0,0 +1,25 @@
+From 345c58f1d85286b394c05bb8d871ac8173be90a3 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 31 Mar 2023 16:26:06 +0000
+Subject: [PATCH] IWYU: add stdint.h for int types in maldoca
+
+---
+ third_party/maldoca/src/maldoca/ole/header.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/third_party/maldoca/src/maldoca/ole/header.h b/third_party/maldoca/src/maldoca/ole/header.h
+index 174f704..41c41d5 100644
+--- a/third_party/maldoca/src/maldoca/ole/header.h
++++ b/third_party/maldoca/src/maldoca/ole/header.h
+@@ -43,6 +43,8 @@
+ #ifndef MALDOCA_OLE_HEADER_H_
+ #define MALDOCA_OLE_HEADER_H_
+
++#include <stdint.h>
++
+ #include "absl/strings/string_view.h"
+
+ namespace maldoca {
+--
+2.39.2
+
diff --git a/srcpkgs/chromium/patches/chromium-115-compiler-SkColor4f.patch b/srcpkgs/chromium/patches/chromium-115-compiler-SkColor4f.patch
new file mode 100644
index 000000000000..ffa0e7ed108c
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-compiler-SkColor4f.patch
@@ -0,0 +1,27 @@
+Patch-Source: https://src.fedoraproject.org/rpms/chromium/blob/1f8fd846d2cc72c90c73c9867619f0da43b9c816/f/chromium-115-compiler-SkColor4f.patch
+diff -up chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc.me chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc
+--- chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc.me 2023-06-24 10:38:11.011511463 +0200
++++ chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc 2023-06-24 13:07:35.865375884 +0200
+@@ -84,6 +84,7 @@ CanvasStyle::CanvasStyle(const CanvasSty
+
+ void CanvasStyle::ApplyToFlags(cc::PaintFlags& flags,
+ float global_alpha) const {
++ SkColor4f custom_color = SkColor4f{0.0f, 0.0f, 0.0f, global_alpha};
+ switch (type_) {
+ case kColor:
+ ApplyColorToFlags(flags, global_alpha);
+@@ -91,12 +92,12 @@ void CanvasStyle::ApplyToFlags(cc::Paint
+ case kGradient:
+ GetCanvasGradient()->GetGradient()->ApplyToFlags(flags, SkMatrix::I(),
+ ImageDrawOptions());
+- flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha));
++ flags.setColor(custom_color);
+ break;
+ case kImagePattern:
+ GetCanvasPattern()->GetPattern()->ApplyToFlags(
+ flags, AffineTransformToSkMatrix(GetCanvasPattern()->GetTransform()));
+- flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha));
++ flags.setColor(custom_color);
+ break;
+ default:
+ NOTREACHED();
diff --git a/srcpkgs/chromium/patches/chromium-115-emplace_back_on_vector-c++20.patch b/srcpkgs/chromium/patches/chromium-115-emplace_back_on_vector-c++20.patch
new file mode 100644
index 000000000000..92dbbf984676
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-emplace_back_on_vector-c++20.patch
@@ -0,0 +1,22 @@
+Patch-Source: https://src.fedoraproject.org/rpms/chromium/blob/1f8fd846d2cc72c90c73c9867619f0da43b9c816/f/chromium-115-emplace_back_on_vector-c++20.patch
+diff -up chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc.me chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc
+--- chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc.me 2023-06-25 10:06:58.445990069 +0200
++++ chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc 2023-06-25 10:51:17.640818231 +0200
+@@ -355,7 +355,7 @@ Status ParseMobileEmulation(const base::
+ "'version' field of type string");
+ }
+
+- brands.emplace_back(*brand, *version);
++ brands.emplace_back() = {*brand, *version};
+ }
+
+ client_hints.brands = std::move(brands);
+@@ -392,7 +392,7 @@ Status ParseMobileEmulation(const base::
+ "a 'version' field of type string");
+ }
+
+- full_version_list.emplace_back(*brand, *version);
++ full_version_list.emplace_back() = {*brand, *version};
+ }
+
+ client_hints.full_version_list = std::move(full_version_list);
diff --git a/srcpkgs/chromium/patches/chromium-115-skia-include.patch b/srcpkgs/chromium/patches/chromium-115-skia-include.patch
new file mode 100644
index 000000000000..b32481bf6465
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-skia-include.patch
@@ -0,0 +1,26 @@
+From 76f7e61f1a7b3e3d445b4f6c32e29c5f05fa2c71 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Tue, 30 May 2023 20:27:03 +0000
+Subject: [PATCH] IWYU: add cmath for various math functions in //skia
+
+Bug: 957519
+Change-Id: I4616f7f161330feb3fb2299da094874663655189
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4545069
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1150817}
+---
+
+diff --git a/skia/ext/skcolorspace_trfn.cc b/skia/ext/skcolorspace_trfn.cc
+index c0d6bd2..97c4dfa 100644
+--- a/skia/ext/skcolorspace_trfn.cc
++++ b/skia/ext/skcolorspace_trfn.cc
+@@ -4,6 +4,8 @@
+
+ #include "skia/ext/skcolorspace_trfn.h"
+
++#include <cmath>
++
+ namespace skia {
+
+ namespace {
diff --git a/srcpkgs/chromium/patches/chromium-115-typename.patch b/srcpkgs/chromium/patches/chromium-115-typename.patch
new file mode 100644
index 000000000000..f0e59d5e48c9
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-typename.patch
@@ -0,0 +1,49 @@
+Patch-Source: https://src.fedoraproject.org/rpms/chromium/blob/1f8fd846d2cc72c90c73c9867619f0da43b9c816/f/chromium-115-typename.patch
+diff -up chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc.typename chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc
+--- chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc.typename 2023-06-17 14:50:56.342591702 +0200
++++ chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc 2023-06-17 14:57:48.024377375 +0200
+@@ -91,7 +91,7 @@ ItemSortKey GetSortKey(const Item& item)
+ // Helper to get an iterator to the last element in the cache. The cache
+ // must not be empty.
+ template <typename Item>
+-SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
++typename SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
+ CHECK(!cache.empty());
+ auto it = cache.end();
+ return std::prev(it);
+@@ -967,9 +967,9 @@ bool DownloadBubbleUpdateService::CacheM
+ }
+
+ template <typename Id, typename Item>
+-SortedItems<Item>::iterator
++typename SortedItems<Item>::iterator
+ DownloadBubbleUpdateService::CacheManager::RemoveItemFromCacheByIter(
+- SortedItems<Item>::iterator iter,
++ typename SortedItems<Item>::iterator iter,
+ SortedItems<Item>& cache,
+ IterMap<Id, Item>& iter_map) {
+ CHECK(iter != cache.end());
+diff -up chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h.me chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h
+--- chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h.me 2023-06-18 21:52:53.515625237 +0200
++++ chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h 2023-06-18 21:53:06.881881293 +0200
+@@ -189,7 +189,7 @@ class TFLiteModelExecutor : public Model
+ void SendForBatchExecution(
+ BatchExecutionCallback callback_on_complete,
+ base::TimeTicks start_time,
+- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
++ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
+ override {
+ DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+diff -up chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.me1 chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
+--- chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.me1 2023-06-19 10:03:32.319218678 +0200
++++ chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc 2023-06-19 10:04:12.023942232 +0200
+@@ -169,7 +169,7 @@ class HTMLFastPathParser {
+ using Span = base::span<const Char>;
+ using USpan = base::span<const UChar>;
+ // 32 matches that used by HTMLToken::Attribute.
+- typedef std::conditional<std::is_same_v<Char, UChar>,
++ typedef typename std::conditional<std::is_same_v<Char, UChar>,
+ UCharLiteralBuffer<32>,
+ LCharLiteralBuffer<32>>::type LiteralBufferType;
+ typedef UCharLiteralBuffer<32> UCharLiteralBufferType;
diff --git a/srcpkgs/chromium/patches/chromium-115-verify_name_match-include.patch b/srcpkgs/chromium/patches/chromium-115-verify_name_match-include.patch
new file mode 100644
index 000000000000..264531087712
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-verify_name_match-include.patch
@@ -0,0 +1,25 @@
+From 74c464ae56275f4de46b7d1f7e103fa758a637d2 Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Wed, 31 May 2023 17:03:02 +0000
+Subject: [PATCH] IWYU: std::vector used in verify_name_match.h without include
+
+Bug: 957519
+Change-Id: Ie753fadae35adb293f854a0f8d4f675e67a2fc31
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4533815
+Reviewed-by: David Benjamin <davidben@chromium.org>
+Commit-Queue: José Dapena Paz <jdapena@igalia.com>
+Cr-Commit-Position: refs/heads/main@{#1151307}
+---
+
+diff --git a/net/cert/pki/verify_name_match.h b/net/cert/pki/verify_name_match.h
+index d22cf7f..e30b221 100644
+--- a/net/cert/pki/verify_name_match.h
++++ b/net/cert/pki/verify_name_match.h
+@@ -6,6 +6,7 @@
+ #define NET_CERT_PKI_VERIFY_NAME_MATCH_H_
+
+ #include <string>
++#include <vector>
+
+ #include "net/base/net_export.h"
+
diff --git a/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch b/srcpkgs/chromium/patches/chromium-115-workaround_clang_bug-structured_binding.patch
similarity index 51%
rename from srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
rename to srcpkgs/chromium/patches/chromium-115-workaround_clang_bug-structured_binding.patch
index af8e737059c7..6492e2eba2b1 100644
--- a/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
+++ b/srcpkgs/chromium/patches/chromium-115-workaround_clang_bug-structured_binding.patch
@@ -1,6 +1,21 @@
-diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
---- chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding 2023-05-11 03:36:27.000000000 +0200
-+++ chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-05-14 11:49:42.558129164 +0200
+Patch-Source: https://src.fedoraproject.org/rpms/chromium/blob/rawhide/f/chromium-115-workaround_clang_bug-structured_binding.patch
+diff -up chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc.workaround_clang_bug-structured_binding chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc
+--- chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc.workaround_clang_bug-structured_binding 2023-06-07 21:48:37.000000000 +0200
++++ chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc 2023-06-17 16:53:20.216628557 +0200
+@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui
+ void CdmPromiseAdapter::Clear(ClearReason reason) {
+ // Reject all outstanding promises.
+ DCHECK(thread_checker_.CalledOnValidThread());
+- for (auto& [promise_id, promise] : promises_) {
++ for (auto& [p_i, p_e] : promises_) {
++ auto& promise_id = p_i;
++ auto& promise = p_e;
+ TRACE_EVENT_NESTABLE_ASYNC_END1(
+ "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
+ "status", "cleared");
+diff -up chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
+--- chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding 2023-06-07 21:48:41.000000000 +0200
++++ chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-06-17 18:47:06.001403966 +0200
@@ -238,7 +238,10 @@ const NGLayoutResult* NGGridLayoutAlgori
: BuildGridSizingTree(&oof_children);
@@ -13,20 +28,7 @@ diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/n
if (IsBreakInside(BreakToken())) {
// TODO(layout-dev): When we support variable inline-size fragments we'll
-@@ -520,8 +523,10 @@ wtf_size_t NGGridLayoutAlgorithm::BuildG
- row_auto_repetitions);
-
- bool has_nested_subgrid = false;
-- auto& [grid_items, layout_data, subtree_size] =
-- sizing_tree->CreateSizingData(opt_subgrid_data);
-+ auto& [g_i, l_d, s_s] = sizing_tree->CreateSizingData(opt_subgrid_data);
-+ auto& grid_items = g_i;
-+ auto& layout_data = l_d;
-+ auto& subtree_size = s_s;
-
- if (!must_ignore_children) {
- // Construct grid items that are not subgridded.
-@@ -650,8 +655,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
+@@ -655,8 +658,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
NGGridSizingTree sizing_tree;
if (const auto* layout_subtree = ConstraintSpace().GridLayoutSubtree()) {
@@ -39,8 +41,8 @@ diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/n
const auto& node = Node();
grid_items =
-@@ -1640,8 +1647,10 @@ void NGGridLayoutAlgorithm::InitializeTr
- const absl::optional<GridTrackSizingDirection>& opt_track_direction) const {
+@@ -1798,8 +1803,10 @@ void NGGridLayoutAlgorithm::CompleteTrac
+ bool* opt_needs_additional_pass) const {
DCHECK(sizing_subtree);
- auto& [grid_items, layout_data, subtree_size] =
@@ -50,12 +52,12 @@ diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/n
+ auto& layout_data = l_d;
+ auto& subtree_size = s_s;
- auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) {
- InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data);
-@@ -1825,8 +1834,10 @@ void NGGridLayoutAlgorithm::CompleteTrac
- bool* opt_needs_additional_pass) const {
- DCHECK(sizing_subtree);
-
+ const bool is_for_columns = track_direction == kForColumns;
+ const bool has_non_definite_track =
+@@ -1924,8 +1931,10 @@ template <typename CallbackFunc>
+ void NGGridLayoutAlgorithm::ForEachSubgrid(
+ const NGGridSizingSubtree& sizing_subtree,
+ const CallbackFunc& callback_func) const {
- auto& [grid_items, layout_data, subtree_size] =
- sizing_subtree.SubtreeRootData();
+ auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
@@ -63,19 +65,18 @@ diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/n
+ auto& layout_data = l_d;
+ auto& subtree_size = s_s;
- const bool is_for_columns = track_direction == kForColumns;
- const bool has_non_definite_track =
-diff -up chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc
---- chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me 2023-05-14 17:35:00.446844465 +0200
-+++ chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc 2023-05-14 17:39:22.991733926 +0200
-@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui
- void CdmPromiseAdapter::Clear(ClearReason reason) {
- // Reject all outstanding promises.
- DCHECK(thread_checker_.CalledOnValidThread());
-- for (auto& [promise_id, promise] : promises_) {
-+ for (auto& [p_i, p_e] : promises_) {
-+ auto& promise_id = p_i;
-+ auto& promise = p_e;
- TRACE_EVENT_NESTABLE_ASYNC_END1(
- "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
- "status", "cleared");
+ // If we know this subtree doesn't have nested subgrids we can exit early
+ // instead of iterating over every grid item looking for them.
+diff -up chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc.me chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc
+--- chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc.me 2023-06-19 08:04:02.287072722 +0200
++++ chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc 2023-06-19 08:18:24.576814950 +0200
+@@ -1393,7 +1393,8 @@ void ServiceWorkerContextWrapper::MaybeP
+ return;
+ }
+
+- auto [document_url, key, callback] = std::move(*request);
++ auto [d_u, key, callback] = std::move(*request);
++ auto document_url = d_u;
+
+ DCHECK(document_url.is_valid());
+ TRACE_EVENT1("ServiceWorker",
diff --git a/srcpkgs/chromium/patches/download-bubble-typename.patch b/srcpkgs/chromium/patches/download-bubble-typename.patch
deleted file mode 100644
index 8edb46974a5b..000000000000
--- a/srcpkgs/chromium/patches/download-bubble-typename.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Patch-Source: https://github.com/archlinux/svntogit-packages/blob/79b774aedeaecd4d31b2adb84e3e4b901dc980aa/trunk/download-bubble-typename.patch
---
-diff --git a/chrome/browser/download/bubble/download_bubble_update_service.cc b/chrome/browser/download/bubble/download_bubble_update_service.cc
-index 13460309d0e..a18d2f8a272 100644
---- a/chrome/browser/download/bubble/download_bubble_update_service.cc
-+++ b/chrome/browser/download/bubble/download_bubble_update_service.cc
-@@ -87,7 +87,7 @@ ItemSortKey GetSortKey(const Item& item) {
- // Helper to get an iterator to the last element in the cache. The cache
- // must not be empty.
- template <typename Item>
--SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) {
-+typename SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) {
- CHECK(!cache.empty());
- auto it = cache.end();
- return std::prev(it);
-@@ -656,9 +656,9 @@ bool DownloadBubbleUpdateService::RemoveItemFromCacheImpl(
- }
-
- template <typename Id, typename Item>
--SortedItems<Item>::iterator
-+typename SortedItems<Item>::iterator
- DownloadBubbleUpdateService::RemoveItemFromCacheByIter(
-- SortedItems<Item>::iterator iter,
-+ typename SortedItems<Item>::iterator iter,
- SortedItems<Item>& cache,
- IterMap<Id, Item>& iter_map) {
- CHECK(iter != cache.end());
-diff --git a/chrome/browser/download/bubble/download_bubble_update_service.h b/chrome/browser/download/bubble/download_bubble_update_service.h
-index 4c3c0bc1193..38048873aa9 100644
---- a/chrome/browser/download/bubble/download_bubble_update_service.h
-+++ b/chrome/browser/download/bubble/download_bubble_update_service.h
-@@ -179,8 +179,8 @@ class DownloadBubbleUpdateService
-
- // Removes item if we already have the iterator to it. Returns next iterator.
- template <typename Id, typename Item>
-- SortedItems<Item>::iterator RemoveItemFromCacheByIter(
-- SortedItems<Item>::iterator iter,
-+ typename SortedItems<Item>::iterator RemoveItemFromCacheByIter(
-+ typename SortedItems<Item>::iterator iter,
- SortedItems<Item>& cache,
- IterMap<Id, Item>& iter_map);
-
diff --git a/srcpkgs/chromium/patches/random-fixes.patch b/srcpkgs/chromium/patches/random-fixes.patch
new file mode 100644
index 000000000000..8513634b69ec
--- /dev/null
+++ b/srcpkgs/chromium/patches/random-fixes.patch
@@ -0,0 +1,15 @@
+Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/chromium/-/blob/c073b0c20935d7eb452732e0f3b2860a96c3db21/random-build-fixes.patch
+--
+diff --git a/chrome/browser/download/bubble/download_bubble_update_service.cc b/chrome/browser/download/bubble/download_bubble_update_service.cc
+index 41b647f7b44..8940c6bb7fc 100644
+--- a/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.cc
++++ b/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.cc
+@@ -103,6 +103,6 @@ void BoundSessionRefreshCookieFetcherImpl::OnURLLoaderComplete(
+ net::Error net_error = static_cast<net::Error>(url_loader_->NetError());
+
+ std::move(callback_).Run(
+- Result(net_error, headers ? absl::optional<int>(headers->response_code())
+- : absl::nullopt));
++ Result({net_error, headers ? absl::optional<int>(headers->response_code())
++ : absl::nullopt}));
+ }
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index b4a39dfd3815..3eb657ab23d2 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,13 +1,14 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=114.0.5735.106
+version=115.0.5790.98
revision=1
archs="i686* x86_64* aarch64* armv7l*"
hostmakedepends="
$(vopt_if clang "clang lld llvm15")
bison git gperf hwids ninja nodejs perl pkg-config python3
- libatomic-devel libepoxy-devel libevent-devel libglib-devel"
+ libatomic-devel libepoxy-devel libevent-devel libglib-devel
+ rust"
makedepends="
alsa-lib-devel libdav1d-devel brotli-devel cups-devel elfutils-devel ffmpeg-devel
fontconfig-devel freetype-devel gtk+3-devel jsoncpp-devel libXScrnSaver-devel
@@ -27,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=df18b0b28bf52b1c099acde54e568fbfa2c9225150108bce9d53d8b31f71304a
+checksum=ffbe630ecf8fc8a250be05fdbec6c94d5881b5fcbbc5fb2b93e54ddc78d56af1
lib32disabled=yes
@@ -193,6 +194,9 @@ do_configure() {
'use_custom_libcxx=false'
'use_gold=false'
+ 'rust=true'
+ 'rust_sysroot_absolute="/usr"'
+
# is_debug makes the build a debug build, changes some things.
# might be useful for real debugging vs just debug symbols.
"is_debug=false"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] chromium: update to 115.0.5790.98.
2023-07-19 12:44 [PR PATCH] chromium: update to 115.0.5790.98 Duncaen
2023-07-19 19:00 ` [PR PATCH] [Updated] " Duncaen
2023-07-19 19:12 ` Duncaen
@ 2023-07-20 0:16 ` Duncaen
2023-07-20 0:20 ` Duncaen
2023-07-20 0:20 ` [PR PATCH] [Merged]: " Duncaen
4 siblings, 0 replies; 6+ messages in thread
From: Duncaen @ 2023-07-20 0:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 411 bytes --]
There is an updated pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages chromium-115
https://github.com/void-linux/void-packages/pull/45130
chromium: update to 115.0.5790.98.
[ci skip]
* [x] x86_64-glibc
* [x] x86_64-musl
* [ ] aarch64-musl
* [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/45130.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-115-45130.patch --]
[-- Type: text/x-diff, Size: 28467 bytes --]
From 2c320a008fac59c086319854fb4f984ad66a2431 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 19 Jul 2023 14:35:14 +0200
Subject: [PATCH] chromium: update to 115.0.5790.98.
---
...typename-s-that-are-required-in-C-17.patch | 45 ----------
.../chromium-114-maldoca-include.patch | 25 ++++++
.../chromium-115-compiler-SkColor4f.patch | 27 ++++++
...ium-115-emplace_back_on_vector-c++20.patch | 22 +++++
.../patches/chromium-115-skia-include.patch | 26 ++++++
.../patches/chromium-115-typename.patch | 49 +++++++++++
...romium-115-verify_name_match-include.patch | 25 ++++++
...around_clang_bug-structured_binding.patch} | 83 ++++++++++---------
.../patches/download-bubble-typename.patch | 42 ----------
srcpkgs/chromium/patches/no-mte.patch | 14 ++++
srcpkgs/chromium/patches/random-fixes.patch | 15 ++++
srcpkgs/chromium/template | 10 ++-
12 files changed, 252 insertions(+), 131 deletions(-)
delete mode 100644 srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
create mode 100644 srcpkgs/chromium/patches/chromium-114-maldoca-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-compiler-SkColor4f.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-emplace_back_on_vector-c++20.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-skia-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-typename.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-verify_name_match-include.patch
rename srcpkgs/chromium/patches/{chromium-114-workaround_clang_bug-structured_binding.patch => chromium-115-workaround_clang_bug-structured_binding.patch} (51%)
delete mode 100644 srcpkgs/chromium/patches/download-bubble-typename.patch
create mode 100644 srcpkgs/chromium/patches/no-mte.patch
create mode 100644 srcpkgs/chromium/patches/random-fixes.patch
diff --git a/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch b/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
deleted file mode 100644
index 35b7152cbbdb..000000000000
--- a/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2914039316d4ed3f53c3393dc2ba48f637807689 Mon Sep 17 00:00:00 2001
-From: Peter Kasting <pkasting@chromium.org>
-Date: Fri, 12 May 2023 16:40:53 +0000
-Subject: [PATCH] Add some "typename"s that are required in C++17.
-
-Bug: 1444563
-Change-Id: I7801f5e82a40305c357eeda219678dda558f5752
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4526465
-Commit-Queue: Alan Screen <awscreen@chromium.org>
-Reviewed-by: Alan Screen <awscreen@chromium.org>
-Auto-Submit: Peter Kasting <pkasting@chromium.org>
-Commit-Queue: Peter Kasting <pkasting@chromium.org>
-Code-Coverage: Findit <findit-for-me@appspot.gserviceaccount.com>
-Cr-Commit-Position: refs/heads/main@{#1143319}
----
- chrome/browser/printing/print_backend_service_manager.cc | 2 +-
- chrome/browser/printing/print_backend_service_manager.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/chrome/browser/printing/print_backend_service_manager.cc b/chrome/browser/printing/print_backend_service_manager.cc
-index b5a4b525a2d..224369cd58c 100644
---- a/chrome/browser/printing/print_backend_service_manager.cc
-+++ b/chrome/browser/printing/print_backend_service_manager.cc
-@@ -1477,7 +1477,7 @@ template <class... T>
- void PrintBackendServiceManager::RunSavedCallbacks(
- RemoteSavedCallbacks<T...>& saved_callbacks,
- const RemoteId& remote_id,
-- std::remove_reference<T>::type... result) {
-+ typename std::remove_reference<T>::type... result) {
- auto found_callbacks_map = saved_callbacks.find(remote_id);
- if (found_callbacks_map == saved_callbacks.end())
- return; // No callbacks to run.
-diff --git a/chrome/browser/printing/print_backend_service_manager.h b/chrome/browser/printing/print_backend_service_manager.h
-index 41788f42a95..6aa7479c1fd 100644
---- a/chrome/browser/printing/print_backend_service_manager.h
-+++ b/chrome/browser/printing/print_backend_service_manager.h
-@@ -588,7 +588,7 @@ class PrintBackendServiceManager {
- template <class... T>
- void RunSavedCallbacks(RemoteSavedCallbacks<T...>& saved_callbacks,
- const RemoteId& remote_id,
-- std::remove_reference<T>::type... result);
-+ typename std::remove_reference<T>::type... result);
-
- // Test support for client ID management.
- static void SetClientsForTesting(
diff --git a/srcpkgs/chromium/patches/chromium-114-maldoca-include.patch b/srcpkgs/chromium/patches/chromium-114-maldoca-include.patch
new file mode 100644
index 000000000000..0259cb9b0d01
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-114-maldoca-include.patch
@@ -0,0 +1,25 @@
+From 345c58f1d85286b394c05bb8d871ac8173be90a3 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 31 Mar 2023 16:26:06 +0000
+Subject: [PATCH] IWYU: add stdint.h for int types in maldoca
+
+---
+ third_party/maldoca/src/maldoca/ole/header.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/third_party/maldoca/src/maldoca/ole/header.h b/third_party/maldoca/src/maldoca/ole/header.h
+index 174f704..41c41d5 100644
+--- a/third_party/maldoca/src/maldoca/ole/header.h
++++ b/third_party/maldoca/src/maldoca/ole/header.h
+@@ -43,6 +43,8 @@
+ #ifndef MALDOCA_OLE_HEADER_H_
+ #define MALDOCA_OLE_HEADER_H_
+
++#include <stdint.h>
++
+ #include "absl/strings/string_view.h"
+
+ namespace maldoca {
+--
+2.39.2
+
diff --git a/srcpkgs/chromium/patches/chromium-115-compiler-SkColor4f.patch b/srcpkgs/chromium/patches/chromium-115-compiler-SkColor4f.patch
new file mode 100644
index 000000000000..ffa0e7ed108c
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-compiler-SkColor4f.patch
@@ -0,0 +1,27 @@
+Patch-Source: https://src.fedoraproject.org/rpms/chromium/blob/1f8fd846d2cc72c90c73c9867619f0da43b9c816/f/chromium-115-compiler-SkColor4f.patch
+diff -up chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc.me chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc
+--- chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc.me 2023-06-24 10:38:11.011511463 +0200
++++ chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc 2023-06-24 13:07:35.865375884 +0200
+@@ -84,6 +84,7 @@ CanvasStyle::CanvasStyle(const CanvasSty
+
+ void CanvasStyle::ApplyToFlags(cc::PaintFlags& flags,
+ float global_alpha) const {
++ SkColor4f custom_color = SkColor4f{0.0f, 0.0f, 0.0f, global_alpha};
+ switch (type_) {
+ case kColor:
+ ApplyColorToFlags(flags, global_alpha);
+@@ -91,12 +92,12 @@ void CanvasStyle::ApplyToFlags(cc::Paint
+ case kGradient:
+ GetCanvasGradient()->GetGradient()->ApplyToFlags(flags, SkMatrix::I(),
+ ImageDrawOptions());
+- flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha));
++ flags.setColor(custom_color);
+ break;
+ case kImagePattern:
+ GetCanvasPattern()->GetPattern()->ApplyToFlags(
+ flags, AffineTransformToSkMatrix(GetCanvasPattern()->GetTransform()));
+- flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha));
++ flags.setColor(custom_color);
+ break;
+ default:
+ NOTREACHED();
diff --git a/srcpkgs/chromium/patches/chromium-115-emplace_back_on_vector-c++20.patch b/srcpkgs/chromium/patches/chromium-115-emplace_back_on_vector-c++20.patch
new file mode 100644
index 000000000000..92dbbf984676
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-emplace_back_on_vector-c++20.patch
@@ -0,0 +1,22 @@
+Patch-Source: https://src.fedoraproject.org/rpms/chromium/blob/1f8fd846d2cc72c90c73c9867619f0da43b9c816/f/chromium-115-emplace_back_on_vector-c++20.patch
+diff -up chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc.me chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc
+--- chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc.me 2023-06-25 10:06:58.445990069 +0200
++++ chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc 2023-06-25 10:51:17.640818231 +0200
+@@ -355,7 +355,7 @@ Status ParseMobileEmulation(const base::
+ "'version' field of type string");
+ }
+
+- brands.emplace_back(*brand, *version);
++ brands.emplace_back() = {*brand, *version};
+ }
+
+ client_hints.brands = std::move(brands);
+@@ -392,7 +392,7 @@ Status ParseMobileEmulation(const base::
+ "a 'version' field of type string");
+ }
+
+- full_version_list.emplace_back(*brand, *version);
++ full_version_list.emplace_back() = {*brand, *version};
+ }
+
+ client_hints.full_version_list = std::move(full_version_list);
diff --git a/srcpkgs/chromium/patches/chromium-115-skia-include.patch b/srcpkgs/chromium/patches/chromium-115-skia-include.patch
new file mode 100644
index 000000000000..b32481bf6465
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-skia-include.patch
@@ -0,0 +1,26 @@
+From 76f7e61f1a7b3e3d445b4f6c32e29c5f05fa2c71 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Tue, 30 May 2023 20:27:03 +0000
+Subject: [PATCH] IWYU: add cmath for various math functions in //skia
+
+Bug: 957519
+Change-Id: I4616f7f161330feb3fb2299da094874663655189
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4545069
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1150817}
+---
+
+diff --git a/skia/ext/skcolorspace_trfn.cc b/skia/ext/skcolorspace_trfn.cc
+index c0d6bd2..97c4dfa 100644
+--- a/skia/ext/skcolorspace_trfn.cc
++++ b/skia/ext/skcolorspace_trfn.cc
+@@ -4,6 +4,8 @@
+
+ #include "skia/ext/skcolorspace_trfn.h"
+
++#include <cmath>
++
+ namespace skia {
+
+ namespace {
diff --git a/srcpkgs/chromium/patches/chromium-115-typename.patch b/srcpkgs/chromium/patches/chromium-115-typename.patch
new file mode 100644
index 000000000000..f0e59d5e48c9
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-typename.patch
@@ -0,0 +1,49 @@
+Patch-Source: https://src.fedoraproject.org/rpms/chromium/blob/1f8fd846d2cc72c90c73c9867619f0da43b9c816/f/chromium-115-typename.patch
+diff -up chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc.typename chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc
+--- chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc.typename 2023-06-17 14:50:56.342591702 +0200
++++ chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc 2023-06-17 14:57:48.024377375 +0200
+@@ -91,7 +91,7 @@ ItemSortKey GetSortKey(const Item& item)
+ // Helper to get an iterator to the last element in the cache. The cache
+ // must not be empty.
+ template <typename Item>
+-SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
++typename SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
+ CHECK(!cache.empty());
+ auto it = cache.end();
+ return std::prev(it);
+@@ -967,9 +967,9 @@ bool DownloadBubbleUpdateService::CacheM
+ }
+
+ template <typename Id, typename Item>
+-SortedItems<Item>::iterator
++typename SortedItems<Item>::iterator
+ DownloadBubbleUpdateService::CacheManager::RemoveItemFromCacheByIter(
+- SortedItems<Item>::iterator iter,
++ typename SortedItems<Item>::iterator iter,
+ SortedItems<Item>& cache,
+ IterMap<Id, Item>& iter_map) {
+ CHECK(iter != cache.end());
+diff -up chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h.me chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h
+--- chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h.me 2023-06-18 21:52:53.515625237 +0200
++++ chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h 2023-06-18 21:53:06.881881293 +0200
+@@ -189,7 +189,7 @@ class TFLiteModelExecutor : public Model
+ void SendForBatchExecution(
+ BatchExecutionCallback callback_on_complete,
+ base::TimeTicks start_time,
+- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
++ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
+ override {
+ DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+diff -up chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.me1 chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
+--- chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.me1 2023-06-19 10:03:32.319218678 +0200
++++ chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc 2023-06-19 10:04:12.023942232 +0200
+@@ -169,7 +169,7 @@ class HTMLFastPathParser {
+ using Span = base::span<const Char>;
+ using USpan = base::span<const UChar>;
+ // 32 matches that used by HTMLToken::Attribute.
+- typedef std::conditional<std::is_same_v<Char, UChar>,
++ typedef typename std::conditional<std::is_same_v<Char, UChar>,
+ UCharLiteralBuffer<32>,
+ LCharLiteralBuffer<32>>::type LiteralBufferType;
+ typedef UCharLiteralBuffer<32> UCharLiteralBufferType;
diff --git a/srcpkgs/chromium/patches/chromium-115-verify_name_match-include.patch b/srcpkgs/chromium/patches/chromium-115-verify_name_match-include.patch
new file mode 100644
index 000000000000..264531087712
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-verify_name_match-include.patch
@@ -0,0 +1,25 @@
+From 74c464ae56275f4de46b7d1f7e103fa758a637d2 Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Wed, 31 May 2023 17:03:02 +0000
+Subject: [PATCH] IWYU: std::vector used in verify_name_match.h without include
+
+Bug: 957519
+Change-Id: Ie753fadae35adb293f854a0f8d4f675e67a2fc31
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4533815
+Reviewed-by: David Benjamin <davidben@chromium.org>
+Commit-Queue: José Dapena Paz <jdapena@igalia.com>
+Cr-Commit-Position: refs/heads/main@{#1151307}
+---
+
+diff --git a/net/cert/pki/verify_name_match.h b/net/cert/pki/verify_name_match.h
+index d22cf7f..e30b221 100644
+--- a/net/cert/pki/verify_name_match.h
++++ b/net/cert/pki/verify_name_match.h
+@@ -6,6 +6,7 @@
+ #define NET_CERT_PKI_VERIFY_NAME_MATCH_H_
+
+ #include <string>
++#include <vector>
+
+ #include "net/base/net_export.h"
+
diff --git a/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch b/srcpkgs/chromium/patches/chromium-115-workaround_clang_bug-structured_binding.patch
similarity index 51%
rename from srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
rename to srcpkgs/chromium/patches/chromium-115-workaround_clang_bug-structured_binding.patch
index af8e737059c7..6492e2eba2b1 100644
--- a/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
+++ b/srcpkgs/chromium/patches/chromium-115-workaround_clang_bug-structured_binding.patch
@@ -1,6 +1,21 @@
-diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
---- chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding 2023-05-11 03:36:27.000000000 +0200
-+++ chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-05-14 11:49:42.558129164 +0200
+Patch-Source: https://src.fedoraproject.org/rpms/chromium/blob/rawhide/f/chromium-115-workaround_clang_bug-structured_binding.patch
+diff -up chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc.workaround_clang_bug-structured_binding chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc
+--- chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc.workaround_clang_bug-structured_binding 2023-06-07 21:48:37.000000000 +0200
++++ chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc 2023-06-17 16:53:20.216628557 +0200
+@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui
+ void CdmPromiseAdapter::Clear(ClearReason reason) {
+ // Reject all outstanding promises.
+ DCHECK(thread_checker_.CalledOnValidThread());
+- for (auto& [promise_id, promise] : promises_) {
++ for (auto& [p_i, p_e] : promises_) {
++ auto& promise_id = p_i;
++ auto& promise = p_e;
+ TRACE_EVENT_NESTABLE_ASYNC_END1(
+ "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
+ "status", "cleared");
+diff -up chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
+--- chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding 2023-06-07 21:48:41.000000000 +0200
++++ chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-06-17 18:47:06.001403966 +0200
@@ -238,7 +238,10 @@ const NGLayoutResult* NGGridLayoutAlgori
: BuildGridSizingTree(&oof_children);
@@ -13,20 +28,7 @@ diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/n
if (IsBreakInside(BreakToken())) {
// TODO(layout-dev): When we support variable inline-size fragments we'll
-@@ -520,8 +523,10 @@ wtf_size_t NGGridLayoutAlgorithm::BuildG
- row_auto_repetitions);
-
- bool has_nested_subgrid = false;
-- auto& [grid_items, layout_data, subtree_size] =
-- sizing_tree->CreateSizingData(opt_subgrid_data);
-+ auto& [g_i, l_d, s_s] = sizing_tree->CreateSizingData(opt_subgrid_data);
-+ auto& grid_items = g_i;
-+ auto& layout_data = l_d;
-+ auto& subtree_size = s_s;
-
- if (!must_ignore_children) {
- // Construct grid items that are not subgridded.
-@@ -650,8 +655,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
+@@ -655,8 +658,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
NGGridSizingTree sizing_tree;
if (const auto* layout_subtree = ConstraintSpace().GridLayoutSubtree()) {
@@ -39,8 +41,8 @@ diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/n
const auto& node = Node();
grid_items =
-@@ -1640,8 +1647,10 @@ void NGGridLayoutAlgorithm::InitializeTr
- const absl::optional<GridTrackSizingDirection>& opt_track_direction) const {
+@@ -1798,8 +1803,10 @@ void NGGridLayoutAlgorithm::CompleteTrac
+ bool* opt_needs_additional_pass) const {
DCHECK(sizing_subtree);
- auto& [grid_items, layout_data, subtree_size] =
@@ -50,12 +52,12 @@ diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/n
+ auto& layout_data = l_d;
+ auto& subtree_size = s_s;
- auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) {
- InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data);
-@@ -1825,8 +1834,10 @@ void NGGridLayoutAlgorithm::CompleteTrac
- bool* opt_needs_additional_pass) const {
- DCHECK(sizing_subtree);
-
+ const bool is_for_columns = track_direction == kForColumns;
+ const bool has_non_definite_track =
+@@ -1924,8 +1931,10 @@ template <typename CallbackFunc>
+ void NGGridLayoutAlgorithm::ForEachSubgrid(
+ const NGGridSizingSubtree& sizing_subtree,
+ const CallbackFunc& callback_func) const {
- auto& [grid_items, layout_data, subtree_size] =
- sizing_subtree.SubtreeRootData();
+ auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
@@ -63,19 +65,18 @@ diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/n
+ auto& layout_data = l_d;
+ auto& subtree_size = s_s;
- const bool is_for_columns = track_direction == kForColumns;
- const bool has_non_definite_track =
-diff -up chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc
---- chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me 2023-05-14 17:35:00.446844465 +0200
-+++ chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc 2023-05-14 17:39:22.991733926 +0200
-@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui
- void CdmPromiseAdapter::Clear(ClearReason reason) {
- // Reject all outstanding promises.
- DCHECK(thread_checker_.CalledOnValidThread());
-- for (auto& [promise_id, promise] : promises_) {
-+ for (auto& [p_i, p_e] : promises_) {
-+ auto& promise_id = p_i;
-+ auto& promise = p_e;
- TRACE_EVENT_NESTABLE_ASYNC_END1(
- "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
- "status", "cleared");
+ // If we know this subtree doesn't have nested subgrids we can exit early
+ // instead of iterating over every grid item looking for them.
+diff -up chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc.me chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc
+--- chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc.me 2023-06-19 08:04:02.287072722 +0200
++++ chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc 2023-06-19 08:18:24.576814950 +0200
+@@ -1393,7 +1393,8 @@ void ServiceWorkerContextWrapper::MaybeP
+ return;
+ }
+
+- auto [document_url, key, callback] = std::move(*request);
++ auto [d_u, key, callback] = std::move(*request);
++ auto document_url = d_u;
+
+ DCHECK(document_url.is_valid());
+ TRACE_EVENT1("ServiceWorker",
diff --git a/srcpkgs/chromium/patches/download-bubble-typename.patch b/srcpkgs/chromium/patches/download-bubble-typename.patch
deleted file mode 100644
index 8edb46974a5b..000000000000
--- a/srcpkgs/chromium/patches/download-bubble-typename.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Patch-Source: https://github.com/archlinux/svntogit-packages/blob/79b774aedeaecd4d31b2adb84e3e4b901dc980aa/trunk/download-bubble-typename.patch
---
-diff --git a/chrome/browser/download/bubble/download_bubble_update_service.cc b/chrome/browser/download/bubble/download_bubble_update_service.cc
-index 13460309d0e..a18d2f8a272 100644
---- a/chrome/browser/download/bubble/download_bubble_update_service.cc
-+++ b/chrome/browser/download/bubble/download_bubble_update_service.cc
-@@ -87,7 +87,7 @@ ItemSortKey GetSortKey(const Item& item) {
- // Helper to get an iterator to the last element in the cache. The cache
- // must not be empty.
- template <typename Item>
--SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) {
-+typename SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) {
- CHECK(!cache.empty());
- auto it = cache.end();
- return std::prev(it);
-@@ -656,9 +656,9 @@ bool DownloadBubbleUpdateService::RemoveItemFromCacheImpl(
- }
-
- template <typename Id, typename Item>
--SortedItems<Item>::iterator
-+typename SortedItems<Item>::iterator
- DownloadBubbleUpdateService::RemoveItemFromCacheByIter(
-- SortedItems<Item>::iterator iter,
-+ typename SortedItems<Item>::iterator iter,
- SortedItems<Item>& cache,
- IterMap<Id, Item>& iter_map) {
- CHECK(iter != cache.end());
-diff --git a/chrome/browser/download/bubble/download_bubble_update_service.h b/chrome/browser/download/bubble/download_bubble_update_service.h
-index 4c3c0bc1193..38048873aa9 100644
---- a/chrome/browser/download/bubble/download_bubble_update_service.h
-+++ b/chrome/browser/download/bubble/download_bubble_update_service.h
-@@ -179,8 +179,8 @@ class DownloadBubbleUpdateService
-
- // Removes item if we already have the iterator to it. Returns next iterator.
- template <typename Id, typename Item>
-- SortedItems<Item>::iterator RemoveItemFromCacheByIter(
-- SortedItems<Item>::iterator iter,
-+ typename SortedItems<Item>::iterator RemoveItemFromCacheByIter(
-+ typename SortedItems<Item>::iterator iter,
- SortedItems<Item>& cache,
- IterMap<Id, Item>& iter_map);
-
diff --git a/srcpkgs/chromium/patches/no-mte.patch b/srcpkgs/chromium/patches/no-mte.patch
new file mode 100644
index 000000000000..973f4ac5d7eb
--- /dev/null
+++ b/srcpkgs/chromium/patches/no-mte.patch
@@ -0,0 +1,14 @@
+Patch-Source: https://git.alpinelinux.org/aports/commit/community/chromium/no-mte.patch?id=ed25dc0164fd410ab1866b69c949cb4747e69434
+M115 needs ifuncs for this
+--
+--- a/base/allocator/partition_allocator/partition_alloc_config.h
++++ b/base/allocator/partition_allocator/partition_alloc_config.h
+@@ -151,7 +151,7 @@
+ defined(ARCH_CPU_LITTLE_ENDIAN))
+
+ #define PA_CONFIG_HAS_MEMORY_TAGGING() \
+- (defined(ARCH_CPU_ARM64) && defined(__clang__) && \
++ (0 && defined(ARCH_CPU_ARM64) && defined(__clang__) && \
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)))
+
+ #if PA_CONFIG(HAS_MEMORY_TAGGING)
diff --git a/srcpkgs/chromium/patches/random-fixes.patch b/srcpkgs/chromium/patches/random-fixes.patch
new file mode 100644
index 000000000000..8513634b69ec
--- /dev/null
+++ b/srcpkgs/chromium/patches/random-fixes.patch
@@ -0,0 +1,15 @@
+Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/chromium/-/blob/c073b0c20935d7eb452732e0f3b2860a96c3db21/random-build-fixes.patch
+--
+diff --git a/chrome/browser/download/bubble/download_bubble_update_service.cc b/chrome/browser/download/bubble/download_bubble_update_service.cc
+index 41b647f7b44..8940c6bb7fc 100644
+--- a/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.cc
++++ b/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.cc
+@@ -103,6 +103,6 @@ void BoundSessionRefreshCookieFetcherImpl::OnURLLoaderComplete(
+ net::Error net_error = static_cast<net::Error>(url_loader_->NetError());
+
+ std::move(callback_).Run(
+- Result(net_error, headers ? absl::optional<int>(headers->response_code())
+- : absl::nullopt));
++ Result({net_error, headers ? absl::optional<int>(headers->response_code())
++ : absl::nullopt}));
+ }
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index b4a39dfd3815..3eb657ab23d2 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,13 +1,14 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=114.0.5735.106
+version=115.0.5790.98
revision=1
archs="i686* x86_64* aarch64* armv7l*"
hostmakedepends="
$(vopt_if clang "clang lld llvm15")
bison git gperf hwids ninja nodejs perl pkg-config python3
- libatomic-devel libepoxy-devel libevent-devel libglib-devel"
+ libatomic-devel libepoxy-devel libevent-devel libglib-devel
+ rust"
makedepends="
alsa-lib-devel libdav1d-devel brotli-devel cups-devel elfutils-devel ffmpeg-devel
fontconfig-devel freetype-devel gtk+3-devel jsoncpp-devel libXScrnSaver-devel
@@ -27,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=df18b0b28bf52b1c099acde54e568fbfa2c9225150108bce9d53d8b31f71304a
+checksum=ffbe630ecf8fc8a250be05fdbec6c94d5881b5fcbbc5fb2b93e54ddc78d56af1
lib32disabled=yes
@@ -193,6 +194,9 @@ do_configure() {
'use_custom_libcxx=false'
'use_gold=false'
+ 'rust=true'
+ 'rust_sysroot_absolute="/usr"'
+
# is_debug makes the build a debug build, changes some things.
# might be useful for real debugging vs just debug symbols.
"is_debug=false"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] chromium: update to 115.0.5790.98.
2023-07-19 12:44 [PR PATCH] chromium: update to 115.0.5790.98 Duncaen
` (2 preceding siblings ...)
2023-07-20 0:16 ` Duncaen
@ 2023-07-20 0:20 ` Duncaen
2023-07-20 0:20 ` [PR PATCH] [Merged]: " Duncaen
4 siblings, 0 replies; 6+ messages in thread
From: Duncaen @ 2023-07-20 0:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 411 bytes --]
There is an updated pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages chromium-115
https://github.com/void-linux/void-packages/pull/45130
chromium: update to 115.0.5790.98.
[ci skip]
* [x] x86_64-glibc
* [x] x86_64-musl
* [ ] aarch64-musl
* [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/45130.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-115-45130.patch --]
[-- Type: text/x-diff, Size: 28467 bytes --]
From ee4ac58e350adf64c39f4ba3caf9d0a5fc1aa4d9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 19 Jul 2023 14:35:14 +0200
Subject: [PATCH] chromium: update to 115.0.5790.98.
---
...typename-s-that-are-required-in-C-17.patch | 45 ----------
.../chromium-114-maldoca-include.patch | 25 ++++++
.../chromium-115-compiler-SkColor4f.patch | 27 ++++++
...ium-115-emplace_back_on_vector-c++20.patch | 22 +++++
.../patches/chromium-115-skia-include.patch | 26 ++++++
.../patches/chromium-115-typename.patch | 49 +++++++++++
...romium-115-verify_name_match-include.patch | 25 ++++++
...around_clang_bug-structured_binding.patch} | 83 ++++++++++---------
.../patches/download-bubble-typename.patch | 42 ----------
srcpkgs/chromium/patches/no-mte.patch | 14 ++++
srcpkgs/chromium/patches/random-fixes.patch | 15 ++++
srcpkgs/chromium/template | 10 ++-
12 files changed, 252 insertions(+), 131 deletions(-)
delete mode 100644 srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
create mode 100644 srcpkgs/chromium/patches/chromium-114-maldoca-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-compiler-SkColor4f.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-emplace_back_on_vector-c++20.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-skia-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-typename.patch
create mode 100644 srcpkgs/chromium/patches/chromium-115-verify_name_match-include.patch
rename srcpkgs/chromium/patches/{chromium-114-workaround_clang_bug-structured_binding.patch => chromium-115-workaround_clang_bug-structured_binding.patch} (51%)
delete mode 100644 srcpkgs/chromium/patches/download-bubble-typename.patch
create mode 100644 srcpkgs/chromium/patches/no-mte.patch
create mode 100644 srcpkgs/chromium/patches/random-fixes.patch
diff --git a/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch b/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
deleted file mode 100644
index 35b7152cbbdb..000000000000
--- a/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2914039316d4ed3f53c3393dc2ba48f637807689 Mon Sep 17 00:00:00 2001
-From: Peter Kasting <pkasting@chromium.org>
-Date: Fri, 12 May 2023 16:40:53 +0000
-Subject: [PATCH] Add some "typename"s that are required in C++17.
-
-Bug: 1444563
-Change-Id: I7801f5e82a40305c357eeda219678dda558f5752
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4526465
-Commit-Queue: Alan Screen <awscreen@chromium.org>
-Reviewed-by: Alan Screen <awscreen@chromium.org>
-Auto-Submit: Peter Kasting <pkasting@chromium.org>
-Commit-Queue: Peter Kasting <pkasting@chromium.org>
-Code-Coverage: Findit <findit-for-me@appspot.gserviceaccount.com>
-Cr-Commit-Position: refs/heads/main@{#1143319}
----
- chrome/browser/printing/print_backend_service_manager.cc | 2 +-
- chrome/browser/printing/print_backend_service_manager.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/chrome/browser/printing/print_backend_service_manager.cc b/chrome/browser/printing/print_backend_service_manager.cc
-index b5a4b525a2d..224369cd58c 100644
---- a/chrome/browser/printing/print_backend_service_manager.cc
-+++ b/chrome/browser/printing/print_backend_service_manager.cc
-@@ -1477,7 +1477,7 @@ template <class... T>
- void PrintBackendServiceManager::RunSavedCallbacks(
- RemoteSavedCallbacks<T...>& saved_callbacks,
- const RemoteId& remote_id,
-- std::remove_reference<T>::type... result) {
-+ typename std::remove_reference<T>::type... result) {
- auto found_callbacks_map = saved_callbacks.find(remote_id);
- if (found_callbacks_map == saved_callbacks.end())
- return; // No callbacks to run.
-diff --git a/chrome/browser/printing/print_backend_service_manager.h b/chrome/browser/printing/print_backend_service_manager.h
-index 41788f42a95..6aa7479c1fd 100644
---- a/chrome/browser/printing/print_backend_service_manager.h
-+++ b/chrome/browser/printing/print_backend_service_manager.h
-@@ -588,7 +588,7 @@ class PrintBackendServiceManager {
- template <class... T>
- void RunSavedCallbacks(RemoteSavedCallbacks<T...>& saved_callbacks,
- const RemoteId& remote_id,
-- std::remove_reference<T>::type... result);
-+ typename std::remove_reference<T>::type... result);
-
- // Test support for client ID management.
- static void SetClientsForTesting(
diff --git a/srcpkgs/chromium/patches/chromium-114-maldoca-include.patch b/srcpkgs/chromium/patches/chromium-114-maldoca-include.patch
new file mode 100644
index 000000000000..0259cb9b0d01
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-114-maldoca-include.patch
@@ -0,0 +1,25 @@
+From 345c58f1d85286b394c05bb8d871ac8173be90a3 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 31 Mar 2023 16:26:06 +0000
+Subject: [PATCH] IWYU: add stdint.h for int types in maldoca
+
+---
+ third_party/maldoca/src/maldoca/ole/header.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/third_party/maldoca/src/maldoca/ole/header.h b/third_party/maldoca/src/maldoca/ole/header.h
+index 174f704..41c41d5 100644
+--- a/third_party/maldoca/src/maldoca/ole/header.h
++++ b/third_party/maldoca/src/maldoca/ole/header.h
+@@ -43,6 +43,8 @@
+ #ifndef MALDOCA_OLE_HEADER_H_
+ #define MALDOCA_OLE_HEADER_H_
+
++#include <stdint.h>
++
+ #include "absl/strings/string_view.h"
+
+ namespace maldoca {
+--
+2.39.2
+
diff --git a/srcpkgs/chromium/patches/chromium-115-compiler-SkColor4f.patch b/srcpkgs/chromium/patches/chromium-115-compiler-SkColor4f.patch
new file mode 100644
index 000000000000..ffa0e7ed108c
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-compiler-SkColor4f.patch
@@ -0,0 +1,27 @@
+Patch-Source: https://src.fedoraproject.org/rpms/chromium/blob/1f8fd846d2cc72c90c73c9867619f0da43b9c816/f/chromium-115-compiler-SkColor4f.patch
+diff -up chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc.me chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc
+--- chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc.me 2023-06-24 10:38:11.011511463 +0200
++++ chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc 2023-06-24 13:07:35.865375884 +0200
+@@ -84,6 +84,7 @@ CanvasStyle::CanvasStyle(const CanvasSty
+
+ void CanvasStyle::ApplyToFlags(cc::PaintFlags& flags,
+ float global_alpha) const {
++ SkColor4f custom_color = SkColor4f{0.0f, 0.0f, 0.0f, global_alpha};
+ switch (type_) {
+ case kColor:
+ ApplyColorToFlags(flags, global_alpha);
+@@ -91,12 +92,12 @@ void CanvasStyle::ApplyToFlags(cc::Paint
+ case kGradient:
+ GetCanvasGradient()->GetGradient()->ApplyToFlags(flags, SkMatrix::I(),
+ ImageDrawOptions());
+- flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha));
++ flags.setColor(custom_color);
+ break;
+ case kImagePattern:
+ GetCanvasPattern()->GetPattern()->ApplyToFlags(
+ flags, AffineTransformToSkMatrix(GetCanvasPattern()->GetTransform()));
+- flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha));
++ flags.setColor(custom_color);
+ break;
+ default:
+ NOTREACHED();
diff --git a/srcpkgs/chromium/patches/chromium-115-emplace_back_on_vector-c++20.patch b/srcpkgs/chromium/patches/chromium-115-emplace_back_on_vector-c++20.patch
new file mode 100644
index 000000000000..92dbbf984676
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-emplace_back_on_vector-c++20.patch
@@ -0,0 +1,22 @@
+Patch-Source: https://src.fedoraproject.org/rpms/chromium/blob/1f8fd846d2cc72c90c73c9867619f0da43b9c816/f/chromium-115-emplace_back_on_vector-c++20.patch
+diff -up chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc.me chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc
+--- chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc.me 2023-06-25 10:06:58.445990069 +0200
++++ chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc 2023-06-25 10:51:17.640818231 +0200
+@@ -355,7 +355,7 @@ Status ParseMobileEmulation(const base::
+ "'version' field of type string");
+ }
+
+- brands.emplace_back(*brand, *version);
++ brands.emplace_back() = {*brand, *version};
+ }
+
+ client_hints.brands = std::move(brands);
+@@ -392,7 +392,7 @@ Status ParseMobileEmulation(const base::
+ "a 'version' field of type string");
+ }
+
+- full_version_list.emplace_back(*brand, *version);
++ full_version_list.emplace_back() = {*brand, *version};
+ }
+
+ client_hints.full_version_list = std::move(full_version_list);
diff --git a/srcpkgs/chromium/patches/chromium-115-skia-include.patch b/srcpkgs/chromium/patches/chromium-115-skia-include.patch
new file mode 100644
index 000000000000..b32481bf6465
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-skia-include.patch
@@ -0,0 +1,26 @@
+From 76f7e61f1a7b3e3d445b4f6c32e29c5f05fa2c71 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Tue, 30 May 2023 20:27:03 +0000
+Subject: [PATCH] IWYU: add cmath for various math functions in //skia
+
+Bug: 957519
+Change-Id: I4616f7f161330feb3fb2299da094874663655189
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4545069
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1150817}
+---
+
+diff --git a/skia/ext/skcolorspace_trfn.cc b/skia/ext/skcolorspace_trfn.cc
+index c0d6bd2..97c4dfa 100644
+--- a/skia/ext/skcolorspace_trfn.cc
++++ b/skia/ext/skcolorspace_trfn.cc
+@@ -4,6 +4,8 @@
+
+ #include "skia/ext/skcolorspace_trfn.h"
+
++#include <cmath>
++
+ namespace skia {
+
+ namespace {
diff --git a/srcpkgs/chromium/patches/chromium-115-typename.patch b/srcpkgs/chromium/patches/chromium-115-typename.patch
new file mode 100644
index 000000000000..f0e59d5e48c9
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-typename.patch
@@ -0,0 +1,49 @@
+Patch-Source: https://src.fedoraproject.org/rpms/chromium/blob/1f8fd846d2cc72c90c73c9867619f0da43b9c816/f/chromium-115-typename.patch
+diff -up chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc.typename chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc
+--- chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc.typename 2023-06-17 14:50:56.342591702 +0200
++++ chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc 2023-06-17 14:57:48.024377375 +0200
+@@ -91,7 +91,7 @@ ItemSortKey GetSortKey(const Item& item)
+ // Helper to get an iterator to the last element in the cache. The cache
+ // must not be empty.
+ template <typename Item>
+-SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
++typename SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
+ CHECK(!cache.empty());
+ auto it = cache.end();
+ return std::prev(it);
+@@ -967,9 +967,9 @@ bool DownloadBubbleUpdateService::CacheM
+ }
+
+ template <typename Id, typename Item>
+-SortedItems<Item>::iterator
++typename SortedItems<Item>::iterator
+ DownloadBubbleUpdateService::CacheManager::RemoveItemFromCacheByIter(
+- SortedItems<Item>::iterator iter,
++ typename SortedItems<Item>::iterator iter,
+ SortedItems<Item>& cache,
+ IterMap<Id, Item>& iter_map) {
+ CHECK(iter != cache.end());
+diff -up chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h.me chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h
+--- chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h.me 2023-06-18 21:52:53.515625237 +0200
++++ chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h 2023-06-18 21:53:06.881881293 +0200
+@@ -189,7 +189,7 @@ class TFLiteModelExecutor : public Model
+ void SendForBatchExecution(
+ BatchExecutionCallback callback_on_complete,
+ base::TimeTicks start_time,
+- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
++ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
+ override {
+ DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+diff -up chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.me1 chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
+--- chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.me1 2023-06-19 10:03:32.319218678 +0200
++++ chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc 2023-06-19 10:04:12.023942232 +0200
+@@ -169,7 +169,7 @@ class HTMLFastPathParser {
+ using Span = base::span<const Char>;
+ using USpan = base::span<const UChar>;
+ // 32 matches that used by HTMLToken::Attribute.
+- typedef std::conditional<std::is_same_v<Char, UChar>,
++ typedef typename std::conditional<std::is_same_v<Char, UChar>,
+ UCharLiteralBuffer<32>,
+ LCharLiteralBuffer<32>>::type LiteralBufferType;
+ typedef UCharLiteralBuffer<32> UCharLiteralBufferType;
diff --git a/srcpkgs/chromium/patches/chromium-115-verify_name_match-include.patch b/srcpkgs/chromium/patches/chromium-115-verify_name_match-include.patch
new file mode 100644
index 000000000000..264531087712
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-115-verify_name_match-include.patch
@@ -0,0 +1,25 @@
+From 74c464ae56275f4de46b7d1f7e103fa758a637d2 Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Wed, 31 May 2023 17:03:02 +0000
+Subject: [PATCH] IWYU: std::vector used in verify_name_match.h without include
+
+Bug: 957519
+Change-Id: Ie753fadae35adb293f854a0f8d4f675e67a2fc31
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4533815
+Reviewed-by: David Benjamin <davidben@chromium.org>
+Commit-Queue: José Dapena Paz <jdapena@igalia.com>
+Cr-Commit-Position: refs/heads/main@{#1151307}
+---
+
+diff --git a/net/cert/pki/verify_name_match.h b/net/cert/pki/verify_name_match.h
+index d22cf7f..e30b221 100644
+--- a/net/cert/pki/verify_name_match.h
++++ b/net/cert/pki/verify_name_match.h
+@@ -6,6 +6,7 @@
+ #define NET_CERT_PKI_VERIFY_NAME_MATCH_H_
+
+ #include <string>
++#include <vector>
+
+ #include "net/base/net_export.h"
+
diff --git a/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch b/srcpkgs/chromium/patches/chromium-115-workaround_clang_bug-structured_binding.patch
similarity index 51%
rename from srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
rename to srcpkgs/chromium/patches/chromium-115-workaround_clang_bug-structured_binding.patch
index af8e737059c7..6492e2eba2b1 100644
--- a/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
+++ b/srcpkgs/chromium/patches/chromium-115-workaround_clang_bug-structured_binding.patch
@@ -1,6 +1,21 @@
-diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
---- chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding 2023-05-11 03:36:27.000000000 +0200
-+++ chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-05-14 11:49:42.558129164 +0200
+Patch-Source: https://src.fedoraproject.org/rpms/chromium/blob/rawhide/f/chromium-115-workaround_clang_bug-structured_binding.patch
+diff -up chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc.workaround_clang_bug-structured_binding chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc
+--- chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc.workaround_clang_bug-structured_binding 2023-06-07 21:48:37.000000000 +0200
++++ chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc 2023-06-17 16:53:20.216628557 +0200
+@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui
+ void CdmPromiseAdapter::Clear(ClearReason reason) {
+ // Reject all outstanding promises.
+ DCHECK(thread_checker_.CalledOnValidThread());
+- for (auto& [promise_id, promise] : promises_) {
++ for (auto& [p_i, p_e] : promises_) {
++ auto& promise_id = p_i;
++ auto& promise = p_e;
+ TRACE_EVENT_NESTABLE_ASYNC_END1(
+ "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
+ "status", "cleared");
+diff -up chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
+--- chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding 2023-06-07 21:48:41.000000000 +0200
++++ chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-06-17 18:47:06.001403966 +0200
@@ -238,7 +238,10 @@ const NGLayoutResult* NGGridLayoutAlgori
: BuildGridSizingTree(&oof_children);
@@ -13,20 +28,7 @@ diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/n
if (IsBreakInside(BreakToken())) {
// TODO(layout-dev): When we support variable inline-size fragments we'll
-@@ -520,8 +523,10 @@ wtf_size_t NGGridLayoutAlgorithm::BuildG
- row_auto_repetitions);
-
- bool has_nested_subgrid = false;
-- auto& [grid_items, layout_data, subtree_size] =
-- sizing_tree->CreateSizingData(opt_subgrid_data);
-+ auto& [g_i, l_d, s_s] = sizing_tree->CreateSizingData(opt_subgrid_data);
-+ auto& grid_items = g_i;
-+ auto& layout_data = l_d;
-+ auto& subtree_size = s_s;
-
- if (!must_ignore_children) {
- // Construct grid items that are not subgridded.
-@@ -650,8 +655,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
+@@ -655,8 +658,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
NGGridSizingTree sizing_tree;
if (const auto* layout_subtree = ConstraintSpace().GridLayoutSubtree()) {
@@ -39,8 +41,8 @@ diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/n
const auto& node = Node();
grid_items =
-@@ -1640,8 +1647,10 @@ void NGGridLayoutAlgorithm::InitializeTr
- const absl::optional<GridTrackSizingDirection>& opt_track_direction) const {
+@@ -1798,8 +1803,10 @@ void NGGridLayoutAlgorithm::CompleteTrac
+ bool* opt_needs_additional_pass) const {
DCHECK(sizing_subtree);
- auto& [grid_items, layout_data, subtree_size] =
@@ -50,12 +52,12 @@ diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/n
+ auto& layout_data = l_d;
+ auto& subtree_size = s_s;
- auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) {
- InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data);
-@@ -1825,8 +1834,10 @@ void NGGridLayoutAlgorithm::CompleteTrac
- bool* opt_needs_additional_pass) const {
- DCHECK(sizing_subtree);
-
+ const bool is_for_columns = track_direction == kForColumns;
+ const bool has_non_definite_track =
+@@ -1924,8 +1931,10 @@ template <typename CallbackFunc>
+ void NGGridLayoutAlgorithm::ForEachSubgrid(
+ const NGGridSizingSubtree& sizing_subtree,
+ const CallbackFunc& callback_func) const {
- auto& [grid_items, layout_data, subtree_size] =
- sizing_subtree.SubtreeRootData();
+ auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
@@ -63,19 +65,18 @@ diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/n
+ auto& layout_data = l_d;
+ auto& subtree_size = s_s;
- const bool is_for_columns = track_direction == kForColumns;
- const bool has_non_definite_track =
-diff -up chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc
---- chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me 2023-05-14 17:35:00.446844465 +0200
-+++ chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc 2023-05-14 17:39:22.991733926 +0200
-@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui
- void CdmPromiseAdapter::Clear(ClearReason reason) {
- // Reject all outstanding promises.
- DCHECK(thread_checker_.CalledOnValidThread());
-- for (auto& [promise_id, promise] : promises_) {
-+ for (auto& [p_i, p_e] : promises_) {
-+ auto& promise_id = p_i;
-+ auto& promise = p_e;
- TRACE_EVENT_NESTABLE_ASYNC_END1(
- "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
- "status", "cleared");
+ // If we know this subtree doesn't have nested subgrids we can exit early
+ // instead of iterating over every grid item looking for them.
+diff -up chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc.me chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc
+--- chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc.me 2023-06-19 08:04:02.287072722 +0200
++++ chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc 2023-06-19 08:18:24.576814950 +0200
+@@ -1393,7 +1393,8 @@ void ServiceWorkerContextWrapper::MaybeP
+ return;
+ }
+
+- auto [document_url, key, callback] = std::move(*request);
++ auto [d_u, key, callback] = std::move(*request);
++ auto document_url = d_u;
+
+ DCHECK(document_url.is_valid());
+ TRACE_EVENT1("ServiceWorker",
diff --git a/srcpkgs/chromium/patches/download-bubble-typename.patch b/srcpkgs/chromium/patches/download-bubble-typename.patch
deleted file mode 100644
index 8edb46974a5b..000000000000
--- a/srcpkgs/chromium/patches/download-bubble-typename.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Patch-Source: https://github.com/archlinux/svntogit-packages/blob/79b774aedeaecd4d31b2adb84e3e4b901dc980aa/trunk/download-bubble-typename.patch
---
-diff --git a/chrome/browser/download/bubble/download_bubble_update_service.cc b/chrome/browser/download/bubble/download_bubble_update_service.cc
-index 13460309d0e..a18d2f8a272 100644
---- a/chrome/browser/download/bubble/download_bubble_update_service.cc
-+++ b/chrome/browser/download/bubble/download_bubble_update_service.cc
-@@ -87,7 +87,7 @@ ItemSortKey GetSortKey(const Item& item) {
- // Helper to get an iterator to the last element in the cache. The cache
- // must not be empty.
- template <typename Item>
--SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) {
-+typename SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) {
- CHECK(!cache.empty());
- auto it = cache.end();
- return std::prev(it);
-@@ -656,9 +656,9 @@ bool DownloadBubbleUpdateService::RemoveItemFromCacheImpl(
- }
-
- template <typename Id, typename Item>
--SortedItems<Item>::iterator
-+typename SortedItems<Item>::iterator
- DownloadBubbleUpdateService::RemoveItemFromCacheByIter(
-- SortedItems<Item>::iterator iter,
-+ typename SortedItems<Item>::iterator iter,
- SortedItems<Item>& cache,
- IterMap<Id, Item>& iter_map) {
- CHECK(iter != cache.end());
-diff --git a/chrome/browser/download/bubble/download_bubble_update_service.h b/chrome/browser/download/bubble/download_bubble_update_service.h
-index 4c3c0bc1193..38048873aa9 100644
---- a/chrome/browser/download/bubble/download_bubble_update_service.h
-+++ b/chrome/browser/download/bubble/download_bubble_update_service.h
-@@ -179,8 +179,8 @@ class DownloadBubbleUpdateService
-
- // Removes item if we already have the iterator to it. Returns next iterator.
- template <typename Id, typename Item>
-- SortedItems<Item>::iterator RemoveItemFromCacheByIter(
-- SortedItems<Item>::iterator iter,
-+ typename SortedItems<Item>::iterator RemoveItemFromCacheByIter(
-+ typename SortedItems<Item>::iterator iter,
- SortedItems<Item>& cache,
- IterMap<Id, Item>& iter_map);
-
diff --git a/srcpkgs/chromium/patches/no-mte.patch b/srcpkgs/chromium/patches/no-mte.patch
new file mode 100644
index 000000000000..973f4ac5d7eb
--- /dev/null
+++ b/srcpkgs/chromium/patches/no-mte.patch
@@ -0,0 +1,14 @@
+Patch-Source: https://git.alpinelinux.org/aports/commit/community/chromium/no-mte.patch?id=ed25dc0164fd410ab1866b69c949cb4747e69434
+M115 needs ifuncs for this
+--
+--- a/base/allocator/partition_allocator/partition_alloc_config.h
++++ b/base/allocator/partition_allocator/partition_alloc_config.h
+@@ -151,7 +151,7 @@
+ defined(ARCH_CPU_LITTLE_ENDIAN))
+
+ #define PA_CONFIG_HAS_MEMORY_TAGGING() \
+- (defined(ARCH_CPU_ARM64) && defined(__clang__) && \
++ (0 && defined(ARCH_CPU_ARM64) && defined(__clang__) && \
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)))
+
+ #if PA_CONFIG(HAS_MEMORY_TAGGING)
diff --git a/srcpkgs/chromium/patches/random-fixes.patch b/srcpkgs/chromium/patches/random-fixes.patch
new file mode 100644
index 000000000000..8513634b69ec
--- /dev/null
+++ b/srcpkgs/chromium/patches/random-fixes.patch
@@ -0,0 +1,15 @@
+Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/chromium/-/blob/c073b0c20935d7eb452732e0f3b2860a96c3db21/random-build-fixes.patch
+--
+diff --git a/chrome/browser/download/bubble/download_bubble_update_service.cc b/chrome/browser/download/bubble/download_bubble_update_service.cc
+index 41b647f7b44..8940c6bb7fc 100644
+--- a/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.cc
++++ b/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.cc
+@@ -103,6 +103,6 @@ void BoundSessionRefreshCookieFetcherImpl::OnURLLoaderComplete(
+ net::Error net_error = static_cast<net::Error>(url_loader_->NetError());
+
+ std::move(callback_).Run(
+- Result(net_error, headers ? absl::optional<int>(headers->response_code())
+- : absl::nullopt));
++ Result({net_error, headers ? absl::optional<int>(headers->response_code())
++ : absl::nullopt}));
+ }
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index b4a39dfd3815..3eb657ab23d2 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,13 +1,14 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=114.0.5735.106
+version=115.0.5790.98
revision=1
archs="i686* x86_64* aarch64* armv7l*"
hostmakedepends="
$(vopt_if clang "clang lld llvm15")
bison git gperf hwids ninja nodejs perl pkg-config python3
- libatomic-devel libepoxy-devel libevent-devel libglib-devel"
+ libatomic-devel libepoxy-devel libevent-devel libglib-devel
+ rust"
makedepends="
alsa-lib-devel libdav1d-devel brotli-devel cups-devel elfutils-devel ffmpeg-devel
fontconfig-devel freetype-devel gtk+3-devel jsoncpp-devel libXScrnSaver-devel
@@ -27,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=df18b0b28bf52b1c099acde54e568fbfa2c9225150108bce9d53d8b31f71304a
+checksum=ffbe630ecf8fc8a250be05fdbec6c94d5881b5fcbbc5fb2b93e54ddc78d56af1
lib32disabled=yes
@@ -193,6 +194,9 @@ do_configure() {
'use_custom_libcxx=false'
'use_gold=false'
+ 'rust=true'
+ 'rust_sysroot_absolute="/usr"'
+
# is_debug makes the build a debug build, changes some things.
# might be useful for real debugging vs just debug symbols.
"is_debug=false"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: chromium: update to 115.0.5790.98.
2023-07-19 12:44 [PR PATCH] chromium: update to 115.0.5790.98 Duncaen
` (3 preceding siblings ...)
2023-07-20 0:20 ` Duncaen
@ 2023-07-20 0:20 ` Duncaen
4 siblings, 0 replies; 6+ messages in thread
From: Duncaen @ 2023-07-20 0:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
There's a merged pull request on the void-packages repository
chromium: update to 115.0.5790.98.
https://github.com/void-linux/void-packages/pull/45130
Description:
[ci skip]
* [x] x86_64-glibc
* [x] x86_64-musl
* [ ] aarch64-musl
* [ ] i686
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-07-20 0:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-19 12:44 [PR PATCH] chromium: update to 115.0.5790.98 Duncaen
2023-07-19 19:00 ` [PR PATCH] [Updated] " Duncaen
2023-07-19 19:12 ` Duncaen
2023-07-20 0:16 ` Duncaen
2023-07-20 0:20 ` Duncaen
2023-07-20 0:20 ` [PR PATCH] [Merged]: " Duncaen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).