* [PR PATCH] chromium: update to 117.0.5938.132.
@ 2023-10-02 22:54 Duncaen
2023-10-02 22:58 ` [PR PATCH] [Updated] " Duncaen
2023-10-03 0:15 ` [PR PATCH] [Merged]: " Duncaen
0 siblings, 2 replies; 3+ messages in thread
From: Duncaen @ 2023-10-02 22:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 407 bytes --]
There is a new pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages chromium-117
https://github.com/void-linux/void-packages/pull/46393
chromium: update to 117.0.5938.132.
[ci skip]
* [x] x86_64-glibc
* [x] x86_64-musl
* [x] aarch64-musl
* [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/46393.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-117-46393.patch --]
[-- Type: text/x-diff, Size: 31531 bytes --]
From 720e734cb8b4d9ccedd83d779b7ebd52e39dd456 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 2 Oct 2023 15:38:57 +0200
Subject: [PATCH] chromium: update to 117.0.5938.132.
---
...for-std-unique_ptr-in-third_party-ip.patch | 27 ++++++
.../chromium-116-url_load_stats-include.patch | 33 -------
...um-117-emplace_back_on_vector-c++20.patch} | 45 ++++++++++
| 59 ++++++-------
...hromium-117-no_matching_constructor.patch} | 68 +++++++++++++++
.../patches/chromium-117-string-convert.patch | 21 +++++
...name.patch => chromium-117-typename.patch} | 85 +++++++++++++++++++
...around_clang_bug-structured_binding.patch} | 53 +++++++++---
srcpkgs/chromium/template | 4 +-
9 files changed, 312 insertions(+), 83 deletions(-)
create mode 100644 srcpkgs/chromium/patches/add-memory-for-std-unique_ptr-in-third_party-ip.patch
delete mode 100644 srcpkgs/chromium/patches/chromium-116-url_load_stats-include.patch
rename srcpkgs/chromium/patches/{chromium-116-emplace_back_on_vector-c++20.patch => chromium-117-emplace_back_on_vector-c++20.patch} (50%)
rename srcpkgs/chromium/patches/{chromium-116-missing-header-files.patch => chromium-117-missing-header-files.patch} (91%)
rename srcpkgs/chromium/patches/{chromium-116-no_matching_constructor.patch => chromium-117-no_matching_constructor.patch} (83%)
create mode 100644 srcpkgs/chromium/patches/chromium-117-string-convert.patch
rename srcpkgs/chromium/patches/{chromium-116-typename.patch => chromium-117-typename.patch} (51%)
rename srcpkgs/chromium/patches/{chromium-115-workaround_clang_bug-structured_binding.patch => chromium-117-workaround_clang_bug-structured_binding.patch} (60%)
diff --git a/srcpkgs/chromium/patches/add-memory-for-std-unique_ptr-in-third_party-ip.patch b/srcpkgs/chromium/patches/add-memory-for-std-unique_ptr-in-third_party-ip.patch
new file mode 100644
index 0000000000000..2d6005f19d7cb
--- /dev/null
+++ b/srcpkgs/chromium/patches/add-memory-for-std-unique_ptr-in-third_party-ip.patch
@@ -0,0 +1,27 @@
+From 5a8dfcaf84b5af5aeb738702651e98bfc43d6d45 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Wed, 9 Aug 2023 15:36:26 +0000
+Subject: [PATCH] IWYU: add memory for std::unique_ptr in //third_party/ipcz
+
+Bug: 957519
+Change-Id: I600f415a59206da283046b638a4f68eda0892ac7
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4754274
+Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
+Reviewed-by: Robert Sesek <rsesek@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1181503}
+---
+ third_party/ipcz/src/ipcz/router_link.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/third_party/ipcz/src/ipcz/router_link.h b/third_party/ipcz/src/ipcz/router_link.h
+index 09bc5626d99..619638cc7f1 100644
+--- a/third_party/ipcz/src/ipcz/router_link.h
++++ b/third_party/ipcz/src/ipcz/router_link.h
+@@ -7,6 +7,7 @@
+
+ #include <cstddef>
+ #include <functional>
++#include <memory>
+ #include <string>
+ #include <utility>
+
diff --git a/srcpkgs/chromium/patches/chromium-116-url_load_stats-include.patch b/srcpkgs/chromium/patches/chromium-116-url_load_stats-include.patch
deleted file mode 100644
index 38015db53318c..0000000000000
--- a/srcpkgs/chromium/patches/chromium-116-url_load_stats-include.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ddfcc907907a20d9f8fbc1416492e2093b339b22 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Mon, 26 Jun 2023 08:46:26 +0000
-Subject: [PATCH] IWYU: add cstddef for size_t in bookmarks::UrlLoadStats
-
-Bug: 957519
-Change-Id: Ic58b8b6adc001f0931c2d1d74b7ac1ac3014fbc1
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4644168
-Auto-Submit: Stephan Hartmann <stha09@googlemail.com>
-Reviewed-by: Mikel Astiz <mastiz@chromium.org>
-Commit-Queue: Mikel Astiz <mastiz@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1162286}
----
-
-diff --git a/components/bookmarks/common/url_load_stats.h b/components/bookmarks/common/url_load_stats.h
-index b4d975b..b5ddece 100644
---- a/components/bookmarks/common/url_load_stats.h
-+++ b/components/bookmarks/common/url_load_stats.h
-@@ -5,6 +5,7 @@
- #ifndef COMPONENTS_BOOKMARKS_COMMON_URL_LOAD_STATS_H_
- #define COMPONENTS_BOOKMARKS_COMMON_URL_LOAD_STATS_H_
-
-+#include <cstddef>
- #include <cstdint>
- #include <vector>
-
-@@ -51,4 +52,4 @@
-
- } // namespace bookmarks
-
--#endif // COMPONENTS_BOOKMARKS_COMMON_URL_LOAD_STATS_H_
-\ No newline at end of file
-+#endif // COMPONENTS_BOOKMARKS_COMMON_URL_LOAD_STATS_H_
diff --git a/srcpkgs/chromium/patches/chromium-116-emplace_back_on_vector-c++20.patch b/srcpkgs/chromium/patches/chromium-117-emplace_back_on_vector-c++20.patch
similarity index 50%
rename from srcpkgs/chromium/patches/chromium-116-emplace_back_on_vector-c++20.patch
rename to srcpkgs/chromium/patches/chromium-117-emplace_back_on_vector-c++20.patch
index 363dc877359fb..3f1b800238ebf 100644
--- a/srcpkgs/chromium/patches/chromium-116-emplace_back_on_vector-c++20.patch
+++ b/srcpkgs/chromium/patches/chromium-117-emplace_back_on_vector-c++20.patch
@@ -44,3 +44,48 @@ diff -up chromium-116.0.5845.96/chrome/browser/content_settings/one_time_permiss
permissions::PermissionUmaUtil::RecordOneTimePermissionEvent(
content_setting_type, trigger_event);
}
+diff -up chromium-117.0.5938.62/base/trace_event/trace_log.cc.me chromium-117.0.5938.62/base/trace_event/trace_log.cc
+--- chromium-117.0.5938.62/base/trace_event/trace_log.cc.me 2023-09-13 20:14:42.441248781 +0200
++++ chromium-117.0.5938.62/base/trace_event/trace_log.cc 2023-09-13 20:16:12.186638601 +0200
+@@ -2187,8 +2187,8 @@ void TraceLog::SetTraceBufferForTesting(
+ #if BUILDFLAG(USE_PERFETTO_CLIENT_LIBRARY)
+ void TraceLog::OnSetup(const perfetto::DataSourceBase::SetupArgs& args) {
+ AutoLock lock(track_event_lock_);
+- track_event_sessions_.emplace_back(args.internal_instance_index, *args.config,
+- args.backend_type);
++ track_event_sessions_.emplace_back() = {args.internal_instance_index, *args.config,
++ args.backend_type};
+ }
+
+ void TraceLog::OnStart(const perfetto::DataSourceBase::StartArgs&) {
+diff -up chromium-117.0.5938.62/content/browser/download/save_package.cc.me chromium-117.0.5938.62/content/browser/download/save_package.cc
+--- chromium-117.0.5938.62/content/browser/download/save_package.cc.me 2023-09-15 12:02:43.866622591 +0200
++++ chromium-117.0.5938.62/content/browser/download/save_package.cc 2023-09-15 12:03:58.715984511 +0200
+@@ -764,8 +764,8 @@ void SavePackage::Finish() {
+ if (download_) {
+ std::vector<download::DownloadSaveItemData::ItemInfo> files;
+ for (auto& item : saved_success_items_) {
+- files.emplace_back(item.second->full_path(), item.second->url(),
+- item.second->referrer().url);
++ files.emplace_back() = {item.second->full_path(), item.second->url(),
++ item.second->referrer().url};
+ }
+ download::DownloadSaveItemData::AttachItemData(download_, std::move(files));
+ }
+diff -up chromium-117.0.5938.62/ui/gtk/gtk_ui.cc.me chromium-117.0.5938.62/ui/gtk/gtk_ui.cc
+--- chromium-117.0.5938.62/ui/gtk/gtk_ui.cc.me 2023-09-15 20:29:42.626502343 +0200
++++ chromium-117.0.5938.62/ui/gtk/gtk_ui.cc 2023-09-15 20:36:18.763091179 +0200
+@@ -955,11 +955,11 @@ ui::DisplayConfig GtkUi::GetDisplayConfi
+ GdkRectangle geometry;
+ gdk_monitor_get_geometry(monitor, &geometry);
+ int monitor_scale = std::max(1, gdk_monitor_get_scale_factor(monitor));
+- config.display_geometries.emplace_back(
++ config.display_geometries.emplace_back() = {
+ gfx::Rect(monitor_scale * geometry.x, monitor_scale * geometry.y,
+ monitor_scale * geometry.width,
+ monitor_scale * geometry.height),
+- monitor_scale * font_scale);
++ static_cast<float>(monitor_scale * font_scale)};
+ }
+ return config;
+ }
diff --git a/srcpkgs/chromium/patches/chromium-116-missing-header-files.patch b/srcpkgs/chromium/patches/chromium-117-missing-header-files.patch
similarity index 91%
rename from srcpkgs/chromium/patches/chromium-116-missing-header-files.patch
rename to srcpkgs/chromium/patches/chromium-117-missing-header-files.patch
index f49d75e1b8fda..ad8e1e654d342 100644
--- a/srcpkgs/chromium/patches/chromium-116-missing-header-files.patch
+++ b/srcpkgs/chromium/patches/chromium-117-missing-header-files.patch
@@ -98,9 +98,9 @@ diff -up chromium-109.0.5414.74/third_party/blink/public/common/bluetooth/web_bl
#include <array>
#include <string>
-diff -up chromium-109.0.5414.74/third_party/dawn/src/tint/reader/spirv/namer.h.me chromium-109.0.5414.74/third_party/dawn/src/tint/reader/spirv/namer.h
---- chromium-109.0.5414.74/third_party/dawn/src/tint/reader/spirv/namer.h.me 2023-01-17 18:02:44.681538107 +0100
-+++ chromium-109.0.5414.74/third_party/dawn/src/tint/reader/spirv/namer.h 2023-01-17 18:02:57.208679140 +0100
+diff -up chromium-117.0.5938.48/third_party/dawn/src/tint/lang/spirv/reader/ast_parser/namer.h.me chromium-117.0.5938.48/third_party/dawn/src/tint/lang/spirv/reader/ast_parser/namer.h
+--- chromium-117.0.5938.48/third_party/dawn/src/tint/lang/spirv/reader/ast_parser/namer.h.me 2023-01-17 18:02:44.681538107 +0100
++++ chromium-117.0.5938.48/third_party/dawn/src/tint/lang/spirv/reader/ast_parser/namer.h 2023-01-17 18:02:57.208679140 +0100
@@ -15,6 +15,7 @@
#ifndef SRC_TINT_READER_SPIRV_NAMER_H_
#define SRC_TINT_READER_SPIRV_NAMER_H_
@@ -365,28 +365,6 @@ diff -up chromium-113.0.5672.53/chrome/test/chromedriver/chrome/web_view_impl.cc
#include "base/check.h"
#include "base/files/file_path.h"
-diff -up chromium-116.0.5845.50/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h.me chromium-116.0.5845.50/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h
---- chromium-116.0.5845.50/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h.me 2023-07-30 19:44:54.718846606 +0200
-+++ chromium-116.0.5845.50/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h 2023-07-30 19:45:14.829249467 +0200
-@@ -8,6 +8,7 @@
- #include <array>
- #include <memory>
- #include <utility>
-+#include <variant>
-
- #include "base/dcheck_is_on.h"
- #include "base/memory/ptr_util.h"
-diff -up chromium-116.0.5845.50/chrome/browser/ui/profile_view_utils.h.me chromium-116.0.5845.50/chrome/browser/ui/profile_view_utils.h
---- chromium-116.0.5845.50/chrome/browser/ui/profile_view_utils.h.me 2023-07-31 13:40:18.171175385 +0200
-+++ chromium-116.0.5845.50/chrome/browser/ui/profile_view_utils.h 2023-07-31 13:43:38.185244234 +0200
-@@ -7,6 +7,7 @@
-
- #include <string>
- #include <utility>
-+#include <vector>
-
- class Profile;
- class ProfileAttributesEntry;
diff -up chromium-115.0.5790.32/skia/ext/skcolorspace_trfn.cc.me chromium-115.0.5790.32/skia/ext/skcolorspace_trfn.cc
--- chromium-115.0.5790.32/skia/ext/skcolorspace_trfn.cc.me 2023-06-18 12:33:52.387412788 +0200
+++ chromium-115.0.5790.32/skia/ext/skcolorspace_trfn.cc 2023-06-18 12:35:28.229148935 +0200
@@ -455,14 +433,25 @@ diff -up chromium-96.0.4664.45/third_party/webrtc/modules/video_coding/utility/i
#include <string>
#include <vector>
-diff -up chromium-116.0.5845.96/third_party/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc.me chromium-116.0.5845.96/third_party/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc
---- chromium-116.0.5845.96/third_party/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc.me 2023-08-15 10:42:54.732984421 +0200
-+++ chromium-116.0.5845.96/third_party/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc 2023-08-15 10:43:31.125950897 +0200
-@@ -13,6 +13,7 @@
- #include <cassert>
- #include <cstdint>
- #include <iostream>
-+#include <limits>
+diff -up chromium-117.0.5938.48/third_party/ipcz/src/ipcz/router_link.h.me chromium-117.0.5938.48/third_party/ipcz/src/ipcz/router_link.h
+--- chromium-117.0.5938.48/third_party/ipcz/src/ipcz/router_link.h.me 2023-09-10 17:53:04.826298351 +0200
++++ chromium-117.0.5938.48/third_party/ipcz/src/ipcz/router_link.h 2023-09-10 17:53:22.201756894 +0200
+@@ -5,6 +5,7 @@
+ #ifndef IPCZ_SRC_IPCZ_ROUTER_LINK_H_
+ #define IPCZ_SRC_IPCZ_ROUTER_LINK_H_
+
++#include <memory>
+ #include <cstddef>
+ #include <functional>
+ #include <string>
+diff -up chromium-117.0.5938.48/third_party/material_color_utilities/src/cpp/palettes/tones.cc.me chromium-117.0.5938.48/third_party/material_color_utilities/src/cpp/palettes/tones.cc
+--- chromium-117.0.5938.48/third_party/material_color_utilities/src/cpp/palettes/tones.cc.me 2023-09-10 17:36:27.199841051 +0200
++++ chromium-117.0.5938.48/third_party/material_color_utilities/src/cpp/palettes/tones.cc 2023-09-10 17:44:51.870554233 +0200
+@@ -14,6 +14,7 @@
+ * limitations under the License.
+ */
+
++#include <math.h>
+ #include "cpp/palettes/tones.h"
- #include "absl/base/attributes.h"
- #include "absl/debugging/internal/address_is_readable.h"
+ #include "cpp/cam/cam.h"
diff --git a/srcpkgs/chromium/patches/chromium-116-no_matching_constructor.patch b/srcpkgs/chromium/patches/chromium-117-no_matching_constructor.patch
similarity index 83%
rename from srcpkgs/chromium/patches/chromium-116-no_matching_constructor.patch
rename to srcpkgs/chromium/patches/chromium-117-no_matching_constructor.patch
index 4c238fb2e7b80..e5ab60ac2d7dc 100644
--- a/srcpkgs/chromium/patches/chromium-116-no_matching_constructor.patch
+++ b/srcpkgs/chromium/patches/chromium-117-no_matching_constructor.patch
@@ -362,3 +362,71 @@ diff -up chromium-116.0.5845.50/chrome/browser/ui/omnibox/chrome_omnibox_client.
if (browser_) {
auto navigation = chrome::OpenCurrentURL(browser_);
+diff -up chromium-117.0.5938.62/net/dns/host_resolver_cache.cc.me chromium-117.0.5938.62/net/dns/host_resolver_cache.cc
+diff -up chromium-117.0.5938.62/third_party/blink/renderer/platform/fonts/font_palette.h.me chromium-117.0.5938.62/third_party/blink/renderer/platform/fonts/font_palette.h
+--- chromium-117.0.5938.62/third_party/blink/renderer/platform/fonts/font_palette.h.me 2023-09-15 10:48:41.330294241 +0200
++++ chromium-117.0.5938.62/third_party/blink/renderer/platform/fonts/font_palette.h 2023-09-15 10:51:24.501324416 +0200
+@@ -96,7 +96,7 @@ class PLATFORM_EXPORT FontPalette : publ
+ Color::ColorSpace color_interpolation_space,
+ absl::optional<Color::HueInterpolationMethod> hue_interpolation_method) {
+ return base::AdoptRef(new FontPalette(
+- start, end, NonNormalizedPercentages(start_percentage, end_percentage),
++ start, end, NonNormalizedPercentages{start_percentage, end_percentage},
+ normalized_percentage, alpha_multiplier, color_interpolation_space,
+ hue_interpolation_method));
+ }
+@@ -170,7 +170,7 @@ class PLATFORM_EXPORT FontPalette : publ
+ double normalized_percentage) {
+ double end_percentage = normalized_percentage * 100.0;
+ double start_percentage = 100.0 - end_percentage;
+- return NonNormalizedPercentages(start_percentage, end_percentage);
++ return NonNormalizedPercentages{start_percentage, end_percentage};
+ }
+
+ double GetAlphaMultiplier() const {
+diff -up chromium-117.0.5938.62/content/browser/renderer_host/render_frame_host_impl.cc.me chromium-117.0.5938.62/content/browser/renderer_host/render_frame_host_impl.cc
+--- chromium-117.0.5938.62/content/browser/renderer_host/render_frame_host_impl.cc.me 2023-09-15 12:17:35.664861257 +0200
++++ chromium-117.0.5938.62/content/browser/renderer_host/render_frame_host_impl.cc 2023-09-15 12:21:06.112694256 +0200
+@@ -8509,7 +8509,7 @@ void RenderFrameHostImpl::SendFencedFram
+ for (const blink::FencedFrame::ReportingDestination& destination :
+ destinations) {
+ SendFencedFrameReportingBeaconInternal(
+- DestinationEnumEvent(event_type, event_data), destination,
++ DestinationEnumEvent{event_type, event_data}, destination,
+ /*from_renderer=*/true, attribution_reporting_runtime_features,
+ GetFrameTreeNodeId());
+ }
+@@ -8545,7 +8545,7 @@ void RenderFrameHostImpl::SendFencedFram
+ }
+
+ SendFencedFrameReportingBeaconInternal(
+- DestinationURLEvent(destination_url),
++ DestinationURLEvent{destination_url},
+ blink::FencedFrame::ReportingDestination::kBuyer,
+ /*from_renderer=*/true, attribution_reporting_runtime_features,
+ GetFrameTreeNodeId());
+@@ -8617,8 +8617,8 @@ void RenderFrameHostImpl::MaybeSendFence
+ for (blink::FencedFrame::ReportingDestination destination :
+ info->destinations) {
+ initiator_rfh->SendFencedFrameReportingBeaconInternal(
+- DestinationEnumEvent(blink::kFencedFrameTopNavigationBeaconType,
+- info->data),
++ DestinationEnumEvent{blink::kFencedFrameTopNavigationBeaconType,
++ info->data},
+ destination,
+ /*from_renderer=*/false, info->attribution_reporting_runtime_features,
+ GetFrameTreeNodeId(), navigation_request.GetNavigationId());
+diff -up chromium-117.0.5938.62/chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc.me chromium-117.0.5938.62/chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc
+--- chromium-117.0.5938.62/chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc.me 2023-09-15 22:04:09.233356627 +0200
++++ chromium-117.0.5938.62/chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc 2023-09-15 22:05:44.126063992 +0200
+@@ -67,8 +67,8 @@ base::flat_map<std::string, SAMLProfileA
+ // TODO(crbug.com/1445072): Add actual domains with attribute names.
+ profile_attributes->insert(std::make_pair(
+ "supported.test",
+- SAMLProfileAttributes("placeholderName", "placeholderDomain",
+- "placeholderToken")));
++ SAMLProfileAttributes{"placeholderName", "placeholderDomain",
++ "placeholderToken"}));
+
+ // Extract domains and attributes from the command line switch.
+ const base::CommandLine& command_line =
diff --git a/srcpkgs/chromium/patches/chromium-117-string-convert.patch b/srcpkgs/chromium/patches/chromium-117-string-convert.patch
new file mode 100644
index 0000000000000..cb48e4b21a617
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-117-string-convert.patch
@@ -0,0 +1,21 @@
+diff -up chromium-117.0.5938.62/net/dns/host_resolver_cache.cc.me chromium-117.0.5938.62/net/dns/host_resolver_cache.cc
+diff -up chromium-117.0.5938.62/net/dns/host_resolver_cache.h.me chromium-117.0.5938.62/net/dns/host_resolver_cache.h
+--- chromium-117.0.5938.62/net/dns/host_resolver_cache.h.me 2023-09-14 15:21:24.632965004 +0200
++++ chromium-117.0.5938.62/net/dns/host_resolver_cache.h 2023-09-15 09:15:48.511300845 +0200
+@@ -143,12 +143,14 @@ class NET_EXPORT HostResolverCache final
+ }
+
+ bool operator()(const Key& lhs, const KeyRef& rhs) const {
++ const std::string rhs_domain_name{rhs.domain_name};
+ return std::tie(lhs.domain_name, lhs.network_anonymization_key) <
+- std::tie(rhs.domain_name, *rhs.network_anonymization_key);
++ std::tie(rhs_domain_name, *rhs.network_anonymization_key);
+ }
+
+ bool operator()(const KeyRef& lhs, const Key& rhs) const {
+- return std::tie(lhs.domain_name, *lhs.network_anonymization_key) <
++ const std::string lhs_domain_name{lhs.domain_name};
++ return std::tie(lhs_domain_name, *lhs.network_anonymization_key) <
+ std::tie(rhs.domain_name, rhs.network_anonymization_key);
+ }
+ };
diff --git a/srcpkgs/chromium/patches/chromium-116-typename.patch b/srcpkgs/chromium/patches/chromium-117-typename.patch
similarity index 51%
rename from srcpkgs/chromium/patches/chromium-116-typename.patch
rename to srcpkgs/chromium/patches/chromium-117-typename.patch
index c58126c68abb2..d3b00e7323603 100644
--- a/srcpkgs/chromium/patches/chromium-116-typename.patch
+++ b/srcpkgs/chromium/patches/chromium-117-typename.patch
@@ -77,3 +77,88 @@ diff -up chromium-116.0.5845.50/third_party/blink/renderer/core/paint/object_pai
NodeType::AnimationState()) {
// First, check if we need to add a new node.
if (!nodes.HasField(node_id)) {
+diff -up chromium-117.0.5938.62/components/optimization_guide/core/tflite_model_executor.h.me chromium-117.0.5938.62/components/optimization_guide/core/tflite_model_executor.h
+--- chromium-117.0.5938.62/components/optimization_guide/core/tflite_model_executor.h.me 2023-09-15 10:22:51.889698402 +0200
++++ chromium-117.0.5938.62/components/optimization_guide/core/tflite_model_executor.h 2023-09-15 10:28:26.702716224 +0200
+@@ -234,7 +234,7 @@ class TFLiteModelExecutor : public Model
+ // Starts the synchronous execution of the model. Returns model outputs.
+ // Model needs to be loaded. Synchronous calls do not load or unload model.
+ std::vector<absl::optional<OutputType>> SendForBatchExecutionSync(
+- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
++ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
+ override {
+ DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+@@ -389,7 +389,7 @@ class TFLiteModelExecutor : public Model
+ // executes it on the model execution thread.
+ void LoadModelFileAndBatchExecute(
+ BatchExecutionCallback callback_on_complete,
+- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) {
++ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) {
+ DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+
+@@ -406,7 +406,7 @@ class TFLiteModelExecutor : public Model
+
+ // Batch executes the loaded model for inputs.
+ void BatchExecuteLoadedModel(
+- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
++ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
+ std::vector<absl::optional<OutputType>>* outputs) {
+ DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+@@ -466,7 +466,7 @@ class TFLiteModelExecutor : public Model
+ // Unloads the model if needed.
+ void BatchExecuteLoadedModelAndRunCallback(
+ BatchExecutionCallback callback_on_complete,
+- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
++ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
+ ExecutionStatus execution_status) {
+ DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+diff -up chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.cc.me chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.cc
+--- chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.cc.me 2023-09-15 17:20:22.550657586 +0200
++++ chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.cc 2023-09-15 17:24:11.396716734 +0200
+@@ -399,7 +399,7 @@ class RetryingFetcherImpl final : public
+ RetryingFetcherImpl(const RetryingFetcherImpl&) = delete;
+ RetryingFetcherImpl& operator=(const RetryingFetcherImpl&) = delete;
+
+- void Start(ProtoFetcher<Response>::Callback callback) override {
++ void Start(typename ProtoFetcher<Response>::Callback callback) override {
+ callback_ = std::move(callback);
+ Retry();
+ }
+@@ -435,7 +435,7 @@ class RetryingFetcherImpl final : public
+ }
+
+ // Client callback.
+- ProtoFetcher<Response>::Callback callback_;
++ typename ProtoFetcher<Response>::Callback callback_;
+
+ // Retry controls.
+ base::OneShotTimer timer_;
+@@ -578,7 +578,7 @@ ParallelFetchManager<Request, Response>:
+ template <typename Request, typename Response>
+ void ParallelFetchManager<Request, Response>::Fetch(
+ const Request& request,
+- Fetcher::Callback callback) {
++ typename Fetcher::Callback callback) {
+ CHECK(callback) << "Use base::DoNothing() instead of empty callback.";
+ KeyType key = requests_in_flight_.Add(MakeFetcher(request));
+ requests_in_flight_.Lookup(key)->Start(
+diff -up chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.h.me chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.h
+--- chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.h.me 2023-09-15 17:20:56.540460391 +0200
++++ chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.h 2023-09-15 17:22:18.246237817 +0200
+@@ -165,10 +165,10 @@ class ParallelFetchManager {
+
+ // Starts the fetch. Underlying fetcher is stored internally, and will be
+ // cleaned up after finish or when this manager is destroyed.
+- void Fetch(const Request& request, Fetcher::Callback callback);
++ void Fetch(const Request& request, typename Fetcher::Callback callback);
+
+ private:
+- using KeyType = base::IDMap<std::unique_ptr<Fetcher>>::KeyType;
++ using KeyType = typename base::IDMap<std::unique_ptr<Fetcher>>::KeyType;
+
+ // Remove fetcher under key from requests_in_flight_.
+ void Remove(KeyType key);
diff --git a/srcpkgs/chromium/patches/chromium-115-workaround_clang_bug-structured_binding.patch b/srcpkgs/chromium/patches/chromium-117-workaround_clang_bug-structured_binding.patch
similarity index 60%
rename from srcpkgs/chromium/patches/chromium-115-workaround_clang_bug-structured_binding.patch
rename to srcpkgs/chromium/patches/chromium-117-workaround_clang_bug-structured_binding.patch
index 6492e2eba2b17..c66cb91539ac4 100644
--- a/srcpkgs/chromium/patches/chromium-115-workaround_clang_bug-structured_binding.patch
+++ b/srcpkgs/chromium/patches/chromium-117-workaround_clang_bug-structured_binding.patch
@@ -1,4 +1,3 @@
-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
@@ -16,18 +15,6 @@ diff -up chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc.workaround_cla
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);
-
- LayoutUnit intrinsic_block_size;
-- auto& [grid_items, layout_data, tree_size] = grid_sizing_tree.TreeRootData();
-+ auto& [g_i, l_d, t_s] = grid_sizing_tree.TreeRootData();
-+ auto& grid_items = g_i;
-+ auto& layout_data = l_d;
-+ auto& tree_size = t_s;
-
- if (IsBreakInside(BreakToken())) {
- // TODO(layout-dev): When we support variable inline-size fragments we'll
@@ -655,8 +658,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
NGGridSizingTree sizing_tree;
@@ -80,3 +67,43 @@ diff -up chromium-115.0.5790.32/content/browser/service_worker/service_worker_co
DCHECK(document_url.is_valid());
TRACE_EVENT1("ServiceWorker",
+diff -up chromium-117.0.5938.62/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me chromium-117.0.5938.62/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
+--- chromium-117.0.5938.62/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me 2023-09-15 13:03:00.787257048 +0200
++++ chromium-117.0.5938.62/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-09-15 13:15:05.502706522 +0200
+@@ -3437,7 +3437,10 @@ void NGGridLayoutAlgorithm::PlaceGridIte
+ DCHECK(out_row_break_between);
+
+ const auto& container_space = ConstraintSpace();
+- const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData();
++ const auto& [g_i, l_d, t_s] = sizing_tree.TreeRootData();
++ const auto& grid_items = g_i;
++ const auto& layout_data = l_d;
++ const auto& tree_size = t_s;
+
+ const auto* cached_layout_subtree = container_space.GridLayoutSubtree();
+ const auto container_writing_direction =
+@@ -3601,7 +3604,10 @@ void NGGridLayoutAlgorithm::PlaceGridIte
+
+ // TODO(ikilpatrick): Update |SetHasSeenAllChildren| and early exit if true.
+ const auto& constraint_space = ConstraintSpace();
+- const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData();
++ const auto& [g_i, l_d, t_s] = sizing_tree.TreeRootData();
++ const auto& grid_items = g_i;
++ const auto& layout_data = l_d;
++ const auto& tree_size =t_s;
+
+ const auto* cached_layout_subtree = constraint_space.GridLayoutSubtree();
+ const auto container_writing_direction =
+diff -up chromium-117.0.5938.62/chrome/browser/ui/autofill/chrome_autofill_client.cc.me chromium-117.0.5938.62/chrome/browser/ui/autofill/chrome_autofill_client.cc
+--- chromium-117.0.5938.62/chrome/browser/ui/autofill/chrome_autofill_client.cc.me 2023-09-15 18:24:18.984133783 +0200
++++ chromium-117.0.5938.62/chrome/browser/ui/autofill/chrome_autofill_client.cc 2023-09-15 18:28:50.420833595 +0200
+@@ -1100,7 +1100,8 @@ void ChromeAutofillClient::PropagateAuto
+ &renderer_form);
+ }
+
+- for (const auto& [frame_token, frame_forms] : renderer_forms_by_frame) {
++ for (const auto& [f_t, frame_forms] : renderer_forms_by_frame) {
++ auto& frame_token = f_t;
+ // Attempt to find the RFH with this `frame_token`.
+ content::RenderFrameHost* rfh = nullptr;
+ GetWebContents().ForEachRenderFrameHost(
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 7fd0f94fa7b5e..4d3bbe21e86f0 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=116.0.5845.96
+version=117.0.5938.132
revision=1
archs="i686* x86_64* aarch64* armv7l*"
hostmakedepends="
@@ -27,7 +27,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=1ec1052a959abced9642b36482549bc2ebefa428ed136289d8e0c54b4ccd1c81
+checksum=28f077123a51942839a9ec518a64930cbc192186e799ef8ccdef19c93ddbaead
lib32disabled=yes
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] chromium: update to 117.0.5938.132.
2023-10-02 22:54 [PR PATCH] chromium: update to 117.0.5938.132 Duncaen
@ 2023-10-02 22:58 ` Duncaen
2023-10-03 0:15 ` [PR PATCH] [Merged]: " Duncaen
1 sibling, 0 replies; 3+ messages in thread
From: Duncaen @ 2023-10-02 22:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 412 bytes --]
There is an updated pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages chromium-117
https://github.com/void-linux/void-packages/pull/46393
chromium: update to 117.0.5938.132.
[ci skip]
* [x] x86_64-glibc
* [x] x86_64-musl
* [x] aarch64-musl
* [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/46393.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-117-46393.patch --]
[-- Type: text/x-diff, Size: 31531 bytes --]
From 3ecbc237fdf751ae742ba893d07226b4effc2c41 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 2 Oct 2023 15:38:57 +0200
Subject: [PATCH] chromium: update to 117.0.5938.132.
---
...for-std-unique_ptr-in-third_party-ip.patch | 27 ++++++
.../chromium-116-url_load_stats-include.patch | 33 -------
...um-117-emplace_back_on_vector-c++20.patch} | 45 ++++++++++
| 59 ++++++-------
...hromium-117-no_matching_constructor.patch} | 68 +++++++++++++++
.../patches/chromium-117-string-convert.patch | 21 +++++
...name.patch => chromium-117-typename.patch} | 85 +++++++++++++++++++
...around_clang_bug-structured_binding.patch} | 53 +++++++++---
srcpkgs/chromium/template | 4 +-
9 files changed, 312 insertions(+), 83 deletions(-)
create mode 100644 srcpkgs/chromium/patches/add-memory-for-std-unique_ptr-in-third_party-ip.patch
delete mode 100644 srcpkgs/chromium/patches/chromium-116-url_load_stats-include.patch
rename srcpkgs/chromium/patches/{chromium-116-emplace_back_on_vector-c++20.patch => chromium-117-emplace_back_on_vector-c++20.patch} (50%)
rename srcpkgs/chromium/patches/{chromium-116-missing-header-files.patch => chromium-117-missing-header-files.patch} (91%)
rename srcpkgs/chromium/patches/{chromium-116-no_matching_constructor.patch => chromium-117-no_matching_constructor.patch} (83%)
create mode 100644 srcpkgs/chromium/patches/chromium-117-string-convert.patch
rename srcpkgs/chromium/patches/{chromium-116-typename.patch => chromium-117-typename.patch} (51%)
rename srcpkgs/chromium/patches/{chromium-115-workaround_clang_bug-structured_binding.patch => chromium-117-workaround_clang_bug-structured_binding.patch} (60%)
diff --git a/srcpkgs/chromium/patches/add-memory-for-std-unique_ptr-in-third_party-ip.patch b/srcpkgs/chromium/patches/add-memory-for-std-unique_ptr-in-third_party-ip.patch
new file mode 100644
index 0000000000000..2d6005f19d7cb
--- /dev/null
+++ b/srcpkgs/chromium/patches/add-memory-for-std-unique_ptr-in-third_party-ip.patch
@@ -0,0 +1,27 @@
+From 5a8dfcaf84b5af5aeb738702651e98bfc43d6d45 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Wed, 9 Aug 2023 15:36:26 +0000
+Subject: [PATCH] IWYU: add memory for std::unique_ptr in //third_party/ipcz
+
+Bug: 957519
+Change-Id: I600f415a59206da283046b638a4f68eda0892ac7
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4754274
+Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
+Reviewed-by: Robert Sesek <rsesek@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1181503}
+---
+ third_party/ipcz/src/ipcz/router_link.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/third_party/ipcz/src/ipcz/router_link.h b/third_party/ipcz/src/ipcz/router_link.h
+index 09bc5626d99..619638cc7f1 100644
+--- a/third_party/ipcz/src/ipcz/router_link.h
++++ b/third_party/ipcz/src/ipcz/router_link.h
+@@ -7,6 +7,7 @@
+
+ #include <cstddef>
+ #include <functional>
++#include <memory>
+ #include <string>
+ #include <utility>
+
diff --git a/srcpkgs/chromium/patches/chromium-116-url_load_stats-include.patch b/srcpkgs/chromium/patches/chromium-116-url_load_stats-include.patch
deleted file mode 100644
index 38015db53318c..0000000000000
--- a/srcpkgs/chromium/patches/chromium-116-url_load_stats-include.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ddfcc907907a20d9f8fbc1416492e2093b339b22 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Mon, 26 Jun 2023 08:46:26 +0000
-Subject: [PATCH] IWYU: add cstddef for size_t in bookmarks::UrlLoadStats
-
-Bug: 957519
-Change-Id: Ic58b8b6adc001f0931c2d1d74b7ac1ac3014fbc1
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4644168
-Auto-Submit: Stephan Hartmann <stha09@googlemail.com>
-Reviewed-by: Mikel Astiz <mastiz@chromium.org>
-Commit-Queue: Mikel Astiz <mastiz@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1162286}
----
-
-diff --git a/components/bookmarks/common/url_load_stats.h b/components/bookmarks/common/url_load_stats.h
-index b4d975b..b5ddece 100644
---- a/components/bookmarks/common/url_load_stats.h
-+++ b/components/bookmarks/common/url_load_stats.h
-@@ -5,6 +5,7 @@
- #ifndef COMPONENTS_BOOKMARKS_COMMON_URL_LOAD_STATS_H_
- #define COMPONENTS_BOOKMARKS_COMMON_URL_LOAD_STATS_H_
-
-+#include <cstddef>
- #include <cstdint>
- #include <vector>
-
-@@ -51,4 +52,4 @@
-
- } // namespace bookmarks
-
--#endif // COMPONENTS_BOOKMARKS_COMMON_URL_LOAD_STATS_H_
-\ No newline at end of file
-+#endif // COMPONENTS_BOOKMARKS_COMMON_URL_LOAD_STATS_H_
diff --git a/srcpkgs/chromium/patches/chromium-116-emplace_back_on_vector-c++20.patch b/srcpkgs/chromium/patches/chromium-117-emplace_back_on_vector-c++20.patch
similarity index 50%
rename from srcpkgs/chromium/patches/chromium-116-emplace_back_on_vector-c++20.patch
rename to srcpkgs/chromium/patches/chromium-117-emplace_back_on_vector-c++20.patch
index 363dc877359fb..3f1b800238ebf 100644
--- a/srcpkgs/chromium/patches/chromium-116-emplace_back_on_vector-c++20.patch
+++ b/srcpkgs/chromium/patches/chromium-117-emplace_back_on_vector-c++20.patch
@@ -44,3 +44,48 @@ diff -up chromium-116.0.5845.96/chrome/browser/content_settings/one_time_permiss
permissions::PermissionUmaUtil::RecordOneTimePermissionEvent(
content_setting_type, trigger_event);
}
+diff -up chromium-117.0.5938.62/base/trace_event/trace_log.cc.me chromium-117.0.5938.62/base/trace_event/trace_log.cc
+--- chromium-117.0.5938.62/base/trace_event/trace_log.cc.me 2023-09-13 20:14:42.441248781 +0200
++++ chromium-117.0.5938.62/base/trace_event/trace_log.cc 2023-09-13 20:16:12.186638601 +0200
+@@ -2187,8 +2187,8 @@ void TraceLog::SetTraceBufferForTesting(
+ #if BUILDFLAG(USE_PERFETTO_CLIENT_LIBRARY)
+ void TraceLog::OnSetup(const perfetto::DataSourceBase::SetupArgs& args) {
+ AutoLock lock(track_event_lock_);
+- track_event_sessions_.emplace_back(args.internal_instance_index, *args.config,
+- args.backend_type);
++ track_event_sessions_.emplace_back() = {args.internal_instance_index, *args.config,
++ args.backend_type};
+ }
+
+ void TraceLog::OnStart(const perfetto::DataSourceBase::StartArgs&) {
+diff -up chromium-117.0.5938.62/content/browser/download/save_package.cc.me chromium-117.0.5938.62/content/browser/download/save_package.cc
+--- chromium-117.0.5938.62/content/browser/download/save_package.cc.me 2023-09-15 12:02:43.866622591 +0200
++++ chromium-117.0.5938.62/content/browser/download/save_package.cc 2023-09-15 12:03:58.715984511 +0200
+@@ -764,8 +764,8 @@ void SavePackage::Finish() {
+ if (download_) {
+ std::vector<download::DownloadSaveItemData::ItemInfo> files;
+ for (auto& item : saved_success_items_) {
+- files.emplace_back(item.second->full_path(), item.second->url(),
+- item.second->referrer().url);
++ files.emplace_back() = {item.second->full_path(), item.second->url(),
++ item.second->referrer().url};
+ }
+ download::DownloadSaveItemData::AttachItemData(download_, std::move(files));
+ }
+diff -up chromium-117.0.5938.62/ui/gtk/gtk_ui.cc.me chromium-117.0.5938.62/ui/gtk/gtk_ui.cc
+--- chromium-117.0.5938.62/ui/gtk/gtk_ui.cc.me 2023-09-15 20:29:42.626502343 +0200
++++ chromium-117.0.5938.62/ui/gtk/gtk_ui.cc 2023-09-15 20:36:18.763091179 +0200
+@@ -955,11 +955,11 @@ ui::DisplayConfig GtkUi::GetDisplayConfi
+ GdkRectangle geometry;
+ gdk_monitor_get_geometry(monitor, &geometry);
+ int monitor_scale = std::max(1, gdk_monitor_get_scale_factor(monitor));
+- config.display_geometries.emplace_back(
++ config.display_geometries.emplace_back() = {
+ gfx::Rect(monitor_scale * geometry.x, monitor_scale * geometry.y,
+ monitor_scale * geometry.width,
+ monitor_scale * geometry.height),
+- monitor_scale * font_scale);
++ static_cast<float>(monitor_scale * font_scale)};
+ }
+ return config;
+ }
diff --git a/srcpkgs/chromium/patches/chromium-116-missing-header-files.patch b/srcpkgs/chromium/patches/chromium-117-missing-header-files.patch
similarity index 91%
rename from srcpkgs/chromium/patches/chromium-116-missing-header-files.patch
rename to srcpkgs/chromium/patches/chromium-117-missing-header-files.patch
index f49d75e1b8fda..ad8e1e654d342 100644
--- a/srcpkgs/chromium/patches/chromium-116-missing-header-files.patch
+++ b/srcpkgs/chromium/patches/chromium-117-missing-header-files.patch
@@ -98,9 +98,9 @@ diff -up chromium-109.0.5414.74/third_party/blink/public/common/bluetooth/web_bl
#include <array>
#include <string>
-diff -up chromium-109.0.5414.74/third_party/dawn/src/tint/reader/spirv/namer.h.me chromium-109.0.5414.74/third_party/dawn/src/tint/reader/spirv/namer.h
---- chromium-109.0.5414.74/third_party/dawn/src/tint/reader/spirv/namer.h.me 2023-01-17 18:02:44.681538107 +0100
-+++ chromium-109.0.5414.74/third_party/dawn/src/tint/reader/spirv/namer.h 2023-01-17 18:02:57.208679140 +0100
+diff -up chromium-117.0.5938.48/third_party/dawn/src/tint/lang/spirv/reader/ast_parser/namer.h.me chromium-117.0.5938.48/third_party/dawn/src/tint/lang/spirv/reader/ast_parser/namer.h
+--- chromium-117.0.5938.48/third_party/dawn/src/tint/lang/spirv/reader/ast_parser/namer.h.me 2023-01-17 18:02:44.681538107 +0100
++++ chromium-117.0.5938.48/third_party/dawn/src/tint/lang/spirv/reader/ast_parser/namer.h 2023-01-17 18:02:57.208679140 +0100
@@ -15,6 +15,7 @@
#ifndef SRC_TINT_READER_SPIRV_NAMER_H_
#define SRC_TINT_READER_SPIRV_NAMER_H_
@@ -365,28 +365,6 @@ diff -up chromium-113.0.5672.53/chrome/test/chromedriver/chrome/web_view_impl.cc
#include "base/check.h"
#include "base/files/file_path.h"
-diff -up chromium-116.0.5845.50/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h.me chromium-116.0.5845.50/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h
---- chromium-116.0.5845.50/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h.me 2023-07-30 19:44:54.718846606 +0200
-+++ chromium-116.0.5845.50/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h 2023-07-30 19:45:14.829249467 +0200
-@@ -8,6 +8,7 @@
- #include <array>
- #include <memory>
- #include <utility>
-+#include <variant>
-
- #include "base/dcheck_is_on.h"
- #include "base/memory/ptr_util.h"
-diff -up chromium-116.0.5845.50/chrome/browser/ui/profile_view_utils.h.me chromium-116.0.5845.50/chrome/browser/ui/profile_view_utils.h
---- chromium-116.0.5845.50/chrome/browser/ui/profile_view_utils.h.me 2023-07-31 13:40:18.171175385 +0200
-+++ chromium-116.0.5845.50/chrome/browser/ui/profile_view_utils.h 2023-07-31 13:43:38.185244234 +0200
-@@ -7,6 +7,7 @@
-
- #include <string>
- #include <utility>
-+#include <vector>
-
- class Profile;
- class ProfileAttributesEntry;
diff -up chromium-115.0.5790.32/skia/ext/skcolorspace_trfn.cc.me chromium-115.0.5790.32/skia/ext/skcolorspace_trfn.cc
--- chromium-115.0.5790.32/skia/ext/skcolorspace_trfn.cc.me 2023-06-18 12:33:52.387412788 +0200
+++ chromium-115.0.5790.32/skia/ext/skcolorspace_trfn.cc 2023-06-18 12:35:28.229148935 +0200
@@ -455,14 +433,25 @@ diff -up chromium-96.0.4664.45/third_party/webrtc/modules/video_coding/utility/i
#include <string>
#include <vector>
-diff -up chromium-116.0.5845.96/third_party/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc.me chromium-116.0.5845.96/third_party/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc
---- chromium-116.0.5845.96/third_party/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc.me 2023-08-15 10:42:54.732984421 +0200
-+++ chromium-116.0.5845.96/third_party/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc 2023-08-15 10:43:31.125950897 +0200
-@@ -13,6 +13,7 @@
- #include <cassert>
- #include <cstdint>
- #include <iostream>
-+#include <limits>
+diff -up chromium-117.0.5938.48/third_party/ipcz/src/ipcz/router_link.h.me chromium-117.0.5938.48/third_party/ipcz/src/ipcz/router_link.h
+--- chromium-117.0.5938.48/third_party/ipcz/src/ipcz/router_link.h.me 2023-09-10 17:53:04.826298351 +0200
++++ chromium-117.0.5938.48/third_party/ipcz/src/ipcz/router_link.h 2023-09-10 17:53:22.201756894 +0200
+@@ -5,6 +5,7 @@
+ #ifndef IPCZ_SRC_IPCZ_ROUTER_LINK_H_
+ #define IPCZ_SRC_IPCZ_ROUTER_LINK_H_
+
++#include <memory>
+ #include <cstddef>
+ #include <functional>
+ #include <string>
+diff -up chromium-117.0.5938.48/third_party/material_color_utilities/src/cpp/palettes/tones.cc.me chromium-117.0.5938.48/third_party/material_color_utilities/src/cpp/palettes/tones.cc
+--- chromium-117.0.5938.48/third_party/material_color_utilities/src/cpp/palettes/tones.cc.me 2023-09-10 17:36:27.199841051 +0200
++++ chromium-117.0.5938.48/third_party/material_color_utilities/src/cpp/palettes/tones.cc 2023-09-10 17:44:51.870554233 +0200
+@@ -14,6 +14,7 @@
+ * limitations under the License.
+ */
+
++#include <math.h>
+ #include "cpp/palettes/tones.h"
- #include "absl/base/attributes.h"
- #include "absl/debugging/internal/address_is_readable.h"
+ #include "cpp/cam/cam.h"
diff --git a/srcpkgs/chromium/patches/chromium-116-no_matching_constructor.patch b/srcpkgs/chromium/patches/chromium-117-no_matching_constructor.patch
similarity index 83%
rename from srcpkgs/chromium/patches/chromium-116-no_matching_constructor.patch
rename to srcpkgs/chromium/patches/chromium-117-no_matching_constructor.patch
index 4c238fb2e7b80..e5ab60ac2d7dc 100644
--- a/srcpkgs/chromium/patches/chromium-116-no_matching_constructor.patch
+++ b/srcpkgs/chromium/patches/chromium-117-no_matching_constructor.patch
@@ -362,3 +362,71 @@ diff -up chromium-116.0.5845.50/chrome/browser/ui/omnibox/chrome_omnibox_client.
if (browser_) {
auto navigation = chrome::OpenCurrentURL(browser_);
+diff -up chromium-117.0.5938.62/net/dns/host_resolver_cache.cc.me chromium-117.0.5938.62/net/dns/host_resolver_cache.cc
+diff -up chromium-117.0.5938.62/third_party/blink/renderer/platform/fonts/font_palette.h.me chromium-117.0.5938.62/third_party/blink/renderer/platform/fonts/font_palette.h
+--- chromium-117.0.5938.62/third_party/blink/renderer/platform/fonts/font_palette.h.me 2023-09-15 10:48:41.330294241 +0200
++++ chromium-117.0.5938.62/third_party/blink/renderer/platform/fonts/font_palette.h 2023-09-15 10:51:24.501324416 +0200
+@@ -96,7 +96,7 @@ class PLATFORM_EXPORT FontPalette : publ
+ Color::ColorSpace color_interpolation_space,
+ absl::optional<Color::HueInterpolationMethod> hue_interpolation_method) {
+ return base::AdoptRef(new FontPalette(
+- start, end, NonNormalizedPercentages(start_percentage, end_percentage),
++ start, end, NonNormalizedPercentages{start_percentage, end_percentage},
+ normalized_percentage, alpha_multiplier, color_interpolation_space,
+ hue_interpolation_method));
+ }
+@@ -170,7 +170,7 @@ class PLATFORM_EXPORT FontPalette : publ
+ double normalized_percentage) {
+ double end_percentage = normalized_percentage * 100.0;
+ double start_percentage = 100.0 - end_percentage;
+- return NonNormalizedPercentages(start_percentage, end_percentage);
++ return NonNormalizedPercentages{start_percentage, end_percentage};
+ }
+
+ double GetAlphaMultiplier() const {
+diff -up chromium-117.0.5938.62/content/browser/renderer_host/render_frame_host_impl.cc.me chromium-117.0.5938.62/content/browser/renderer_host/render_frame_host_impl.cc
+--- chromium-117.0.5938.62/content/browser/renderer_host/render_frame_host_impl.cc.me 2023-09-15 12:17:35.664861257 +0200
++++ chromium-117.0.5938.62/content/browser/renderer_host/render_frame_host_impl.cc 2023-09-15 12:21:06.112694256 +0200
+@@ -8509,7 +8509,7 @@ void RenderFrameHostImpl::SendFencedFram
+ for (const blink::FencedFrame::ReportingDestination& destination :
+ destinations) {
+ SendFencedFrameReportingBeaconInternal(
+- DestinationEnumEvent(event_type, event_data), destination,
++ DestinationEnumEvent{event_type, event_data}, destination,
+ /*from_renderer=*/true, attribution_reporting_runtime_features,
+ GetFrameTreeNodeId());
+ }
+@@ -8545,7 +8545,7 @@ void RenderFrameHostImpl::SendFencedFram
+ }
+
+ SendFencedFrameReportingBeaconInternal(
+- DestinationURLEvent(destination_url),
++ DestinationURLEvent{destination_url},
+ blink::FencedFrame::ReportingDestination::kBuyer,
+ /*from_renderer=*/true, attribution_reporting_runtime_features,
+ GetFrameTreeNodeId());
+@@ -8617,8 +8617,8 @@ void RenderFrameHostImpl::MaybeSendFence
+ for (blink::FencedFrame::ReportingDestination destination :
+ info->destinations) {
+ initiator_rfh->SendFencedFrameReportingBeaconInternal(
+- DestinationEnumEvent(blink::kFencedFrameTopNavigationBeaconType,
+- info->data),
++ DestinationEnumEvent{blink::kFencedFrameTopNavigationBeaconType,
++ info->data},
+ destination,
+ /*from_renderer=*/false, info->attribution_reporting_runtime_features,
+ GetFrameTreeNodeId(), navigation_request.GetNavigationId());
+diff -up chromium-117.0.5938.62/chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc.me chromium-117.0.5938.62/chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc
+--- chromium-117.0.5938.62/chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc.me 2023-09-15 22:04:09.233356627 +0200
++++ chromium-117.0.5938.62/chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc 2023-09-15 22:05:44.126063992 +0200
+@@ -67,8 +67,8 @@ base::flat_map<std::string, SAMLProfileA
+ // TODO(crbug.com/1445072): Add actual domains with attribute names.
+ profile_attributes->insert(std::make_pair(
+ "supported.test",
+- SAMLProfileAttributes("placeholderName", "placeholderDomain",
+- "placeholderToken")));
++ SAMLProfileAttributes{"placeholderName", "placeholderDomain",
++ "placeholderToken"}));
+
+ // Extract domains and attributes from the command line switch.
+ const base::CommandLine& command_line =
diff --git a/srcpkgs/chromium/patches/chromium-117-string-convert.patch b/srcpkgs/chromium/patches/chromium-117-string-convert.patch
new file mode 100644
index 0000000000000..cb48e4b21a617
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-117-string-convert.patch
@@ -0,0 +1,21 @@
+diff -up chromium-117.0.5938.62/net/dns/host_resolver_cache.cc.me chromium-117.0.5938.62/net/dns/host_resolver_cache.cc
+diff -up chromium-117.0.5938.62/net/dns/host_resolver_cache.h.me chromium-117.0.5938.62/net/dns/host_resolver_cache.h
+--- chromium-117.0.5938.62/net/dns/host_resolver_cache.h.me 2023-09-14 15:21:24.632965004 +0200
++++ chromium-117.0.5938.62/net/dns/host_resolver_cache.h 2023-09-15 09:15:48.511300845 +0200
+@@ -143,12 +143,14 @@ class NET_EXPORT HostResolverCache final
+ }
+
+ bool operator()(const Key& lhs, const KeyRef& rhs) const {
++ const std::string rhs_domain_name{rhs.domain_name};
+ return std::tie(lhs.domain_name, lhs.network_anonymization_key) <
+- std::tie(rhs.domain_name, *rhs.network_anonymization_key);
++ std::tie(rhs_domain_name, *rhs.network_anonymization_key);
+ }
+
+ bool operator()(const KeyRef& lhs, const Key& rhs) const {
+- return std::tie(lhs.domain_name, *lhs.network_anonymization_key) <
++ const std::string lhs_domain_name{lhs.domain_name};
++ return std::tie(lhs_domain_name, *lhs.network_anonymization_key) <
+ std::tie(rhs.domain_name, rhs.network_anonymization_key);
+ }
+ };
diff --git a/srcpkgs/chromium/patches/chromium-116-typename.patch b/srcpkgs/chromium/patches/chromium-117-typename.patch
similarity index 51%
rename from srcpkgs/chromium/patches/chromium-116-typename.patch
rename to srcpkgs/chromium/patches/chromium-117-typename.patch
index c58126c68abb2..d3b00e7323603 100644
--- a/srcpkgs/chromium/patches/chromium-116-typename.patch
+++ b/srcpkgs/chromium/patches/chromium-117-typename.patch
@@ -77,3 +77,88 @@ diff -up chromium-116.0.5845.50/third_party/blink/renderer/core/paint/object_pai
NodeType::AnimationState()) {
// First, check if we need to add a new node.
if (!nodes.HasField(node_id)) {
+diff -up chromium-117.0.5938.62/components/optimization_guide/core/tflite_model_executor.h.me chromium-117.0.5938.62/components/optimization_guide/core/tflite_model_executor.h
+--- chromium-117.0.5938.62/components/optimization_guide/core/tflite_model_executor.h.me 2023-09-15 10:22:51.889698402 +0200
++++ chromium-117.0.5938.62/components/optimization_guide/core/tflite_model_executor.h 2023-09-15 10:28:26.702716224 +0200
+@@ -234,7 +234,7 @@ class TFLiteModelExecutor : public Model
+ // Starts the synchronous execution of the model. Returns model outputs.
+ // Model needs to be loaded. Synchronous calls do not load or unload model.
+ std::vector<absl::optional<OutputType>> SendForBatchExecutionSync(
+- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
++ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
+ override {
+ DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+@@ -389,7 +389,7 @@ class TFLiteModelExecutor : public Model
+ // executes it on the model execution thread.
+ void LoadModelFileAndBatchExecute(
+ BatchExecutionCallback callback_on_complete,
+- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) {
++ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) {
+ DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+
+@@ -406,7 +406,7 @@ class TFLiteModelExecutor : public Model
+
+ // Batch executes the loaded model for inputs.
+ void BatchExecuteLoadedModel(
+- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
++ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
+ std::vector<absl::optional<OutputType>>* outputs) {
+ DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+@@ -466,7 +466,7 @@ class TFLiteModelExecutor : public Model
+ // Unloads the model if needed.
+ void BatchExecuteLoadedModelAndRunCallback(
+ BatchExecutionCallback callback_on_complete,
+- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
++ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
+ ExecutionStatus execution_status) {
+ DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+diff -up chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.cc.me chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.cc
+--- chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.cc.me 2023-09-15 17:20:22.550657586 +0200
++++ chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.cc 2023-09-15 17:24:11.396716734 +0200
+@@ -399,7 +399,7 @@ class RetryingFetcherImpl final : public
+ RetryingFetcherImpl(const RetryingFetcherImpl&) = delete;
+ RetryingFetcherImpl& operator=(const RetryingFetcherImpl&) = delete;
+
+- void Start(ProtoFetcher<Response>::Callback callback) override {
++ void Start(typename ProtoFetcher<Response>::Callback callback) override {
+ callback_ = std::move(callback);
+ Retry();
+ }
+@@ -435,7 +435,7 @@ class RetryingFetcherImpl final : public
+ }
+
+ // Client callback.
+- ProtoFetcher<Response>::Callback callback_;
++ typename ProtoFetcher<Response>::Callback callback_;
+
+ // Retry controls.
+ base::OneShotTimer timer_;
+@@ -578,7 +578,7 @@ ParallelFetchManager<Request, Response>:
+ template <typename Request, typename Response>
+ void ParallelFetchManager<Request, Response>::Fetch(
+ const Request& request,
+- Fetcher::Callback callback) {
++ typename Fetcher::Callback callback) {
+ CHECK(callback) << "Use base::DoNothing() instead of empty callback.";
+ KeyType key = requests_in_flight_.Add(MakeFetcher(request));
+ requests_in_flight_.Lookup(key)->Start(
+diff -up chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.h.me chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.h
+--- chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.h.me 2023-09-15 17:20:56.540460391 +0200
++++ chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.h 2023-09-15 17:22:18.246237817 +0200
+@@ -165,10 +165,10 @@ class ParallelFetchManager {
+
+ // Starts the fetch. Underlying fetcher is stored internally, and will be
+ // cleaned up after finish or when this manager is destroyed.
+- void Fetch(const Request& request, Fetcher::Callback callback);
++ void Fetch(const Request& request, typename Fetcher::Callback callback);
+
+ private:
+- using KeyType = base::IDMap<std::unique_ptr<Fetcher>>::KeyType;
++ using KeyType = typename base::IDMap<std::unique_ptr<Fetcher>>::KeyType;
+
+ // Remove fetcher under key from requests_in_flight_.
+ void Remove(KeyType key);
diff --git a/srcpkgs/chromium/patches/chromium-115-workaround_clang_bug-structured_binding.patch b/srcpkgs/chromium/patches/chromium-117-workaround_clang_bug-structured_binding.patch
similarity index 60%
rename from srcpkgs/chromium/patches/chromium-115-workaround_clang_bug-structured_binding.patch
rename to srcpkgs/chromium/patches/chromium-117-workaround_clang_bug-structured_binding.patch
index 6492e2eba2b17..c66cb91539ac4 100644
--- a/srcpkgs/chromium/patches/chromium-115-workaround_clang_bug-structured_binding.patch
+++ b/srcpkgs/chromium/patches/chromium-117-workaround_clang_bug-structured_binding.patch
@@ -1,4 +1,3 @@
-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
@@ -16,18 +15,6 @@ diff -up chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc.workaround_cla
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);
-
- LayoutUnit intrinsic_block_size;
-- auto& [grid_items, layout_data, tree_size] = grid_sizing_tree.TreeRootData();
-+ auto& [g_i, l_d, t_s] = grid_sizing_tree.TreeRootData();
-+ auto& grid_items = g_i;
-+ auto& layout_data = l_d;
-+ auto& tree_size = t_s;
-
- if (IsBreakInside(BreakToken())) {
- // TODO(layout-dev): When we support variable inline-size fragments we'll
@@ -655,8 +658,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
NGGridSizingTree sizing_tree;
@@ -80,3 +67,43 @@ diff -up chromium-115.0.5790.32/content/browser/service_worker/service_worker_co
DCHECK(document_url.is_valid());
TRACE_EVENT1("ServiceWorker",
+diff -up chromium-117.0.5938.62/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me chromium-117.0.5938.62/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
+--- chromium-117.0.5938.62/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me 2023-09-15 13:03:00.787257048 +0200
++++ chromium-117.0.5938.62/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-09-15 13:15:05.502706522 +0200
+@@ -3437,7 +3437,10 @@ void NGGridLayoutAlgorithm::PlaceGridIte
+ DCHECK(out_row_break_between);
+
+ const auto& container_space = ConstraintSpace();
+- const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData();
++ const auto& [g_i, l_d, t_s] = sizing_tree.TreeRootData();
++ const auto& grid_items = g_i;
++ const auto& layout_data = l_d;
++ const auto& tree_size = t_s;
+
+ const auto* cached_layout_subtree = container_space.GridLayoutSubtree();
+ const auto container_writing_direction =
+@@ -3601,7 +3604,10 @@ void NGGridLayoutAlgorithm::PlaceGridIte
+
+ // TODO(ikilpatrick): Update |SetHasSeenAllChildren| and early exit if true.
+ const auto& constraint_space = ConstraintSpace();
+- const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData();
++ const auto& [g_i, l_d, t_s] = sizing_tree.TreeRootData();
++ const auto& grid_items = g_i;
++ const auto& layout_data = l_d;
++ const auto& tree_size =t_s;
+
+ const auto* cached_layout_subtree = constraint_space.GridLayoutSubtree();
+ const auto container_writing_direction =
+diff -up chromium-117.0.5938.62/chrome/browser/ui/autofill/chrome_autofill_client.cc.me chromium-117.0.5938.62/chrome/browser/ui/autofill/chrome_autofill_client.cc
+--- chromium-117.0.5938.62/chrome/browser/ui/autofill/chrome_autofill_client.cc.me 2023-09-15 18:24:18.984133783 +0200
++++ chromium-117.0.5938.62/chrome/browser/ui/autofill/chrome_autofill_client.cc 2023-09-15 18:28:50.420833595 +0200
+@@ -1100,7 +1100,8 @@ void ChromeAutofillClient::PropagateAuto
+ &renderer_form);
+ }
+
+- for (const auto& [frame_token, frame_forms] : renderer_forms_by_frame) {
++ for (const auto& [f_t, frame_forms] : renderer_forms_by_frame) {
++ auto& frame_token = f_t;
+ // Attempt to find the RFH with this `frame_token`.
+ content::RenderFrameHost* rfh = nullptr;
+ GetWebContents().ForEachRenderFrameHost(
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 7fd0f94fa7b5e..4d3bbe21e86f0 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=116.0.5845.96
+version=117.0.5938.132
revision=1
archs="i686* x86_64* aarch64* armv7l*"
hostmakedepends="
@@ -27,7 +27,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=1ec1052a959abced9642b36482549bc2ebefa428ed136289d8e0c54b4ccd1c81
+checksum=28f077123a51942839a9ec518a64930cbc192186e799ef8ccdef19c93ddbaead
lib32disabled=yes
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: chromium: update to 117.0.5938.132.
2023-10-02 22:54 [PR PATCH] chromium: update to 117.0.5938.132 Duncaen
2023-10-02 22:58 ` [PR PATCH] [Updated] " Duncaen
@ 2023-10-03 0:15 ` Duncaen
1 sibling, 0 replies; 3+ messages in thread
From: Duncaen @ 2023-10-03 0:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 251 bytes --]
There's a merged pull request on the void-packages repository
chromium: update to 117.0.5938.132.
https://github.com/void-linux/void-packages/pull/46393
Description:
[ci skip]
* [x] x86_64-glibc
* [x] x86_64-musl
* [x] aarch64-musl
* [ ] i686
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-03 0:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-02 22:54 [PR PATCH] chromium: update to 117.0.5938.132 Duncaen
2023-10-02 22:58 ` [PR PATCH] [Updated] " Duncaen
2023-10-03 0:15 ` [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).