diff --git a/.chromium.metadata b/.chromium.metadata index fb2b72ce..9eac5b65 100644 --- a/.chromium.metadata +++ b/.chromium.metadata @@ -1 +1,3 @@ -50ba2845ad223e01cd30846132da26fcf14b2cbe SOURCES/chromium-116.0.5845.187.tar.xz +03c6701dcc4f2b8d90c4193716bb3e796c70ba3b SOURCES/chromium-117.0.5938.62.tar.xz +769196d081c6a0ad37f1c63dec56febfff3370de SOURCES/node-v20.6.1-linux-x64.tar.xz +3e94bb4f999c636293bc745b02d98e7925da5616 SOURCES/node-v20.6.1-linux-arm64.tar.xz diff --git a/.gitignore b/.gitignore index 880a2fa1..c2abf377 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -SOURCES/chromium-116.0.5845.187.tar.xz +SOURCES/chromium-117.0.5938.62.tar.xz +SOURCES/node-v20.6.1-linux-x64.tar.xz +SOURCES/node-v20.6.1-linux-arm64.tar.xz diff --git a/SOURCES/chromium-115-do_not_restrict_new_V4L2_decoders.v4l2.pach b/SOURCES/chromium-115-do_not_restrict_new_V4L2_decoders.v4l2.pach deleted file mode 100644 index 416e9731..00000000 --- a/SOURCES/chromium-115-do_not_restrict_new_V4L2_decoders.v4l2.pach +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc -index bb0122ffd72d4..9262cc744582f 100644 ---- a/media/base/media_switches.cc -+++ b/media/base/media_switches.cc -@@ -807,7 +807,7 @@ BASE_FEATURE(kVaapiVp9kSVCHWEncoding, - "VaapiVp9kSVCHWEncoding", - base::FEATURE_ENABLED_BY_DEFAULT); - #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) --#if defined(ARCH_CPU_ARM_FAMILY) && BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) - // Enables the new V4L2StatefulVideoDecoder instead of V4L2VideoDecoder. - BASE_FEATURE(kV4L2FlatStatelessVideoDecoder, - "V4L2FlatStatelessVideoDecoder", -diff --git a/media/base/media_switches.h b/media/base/media_switches.h -index 97d9602eee49e..aacfac69fae20 100644 ---- a/media/base/media_switches.h -+++ b/media/base/media_switches.h -@@ -318,10 +318,10 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLayerHWEncoding); - MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding); - MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9kSVCHWEncoding); - #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) --#if defined(ARCH_CPU_ARM_FAMILY) && BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) - MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatelessVideoDecoder); - MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatefulVideoDecoder); --#endif // defined(ARCH_CPU_ARM_FAMILY) && BUILDFLAG(IS_CHROMEOS) -+#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) - MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy); - #if BUILDFLAG(IS_APPLE) - MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoToolboxVideoDecoder); diff --git a/SOURCES/chromium-115-include_contains_h_header_for_V4L2StatefulVideoDecoder.patch b/SOURCES/chromium-115-include_contains_h_header_for_V4L2StatefulVideoDecoder.patch deleted file mode 100644 index 93fbdb94..00000000 --- a/SOURCES/chromium-115-include_contains_h_header_for_V4L2StatefulVideoDecoder.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/media/gpu/v4l2/v4l2_stateful_video_decoder.cc b/media/gpu/v4l2/v4l2_stateful_video_decoder.cc -index c84dedb7d1c1f..ca8cd566d2018 100644 ---- a/media/gpu/v4l2/v4l2_stateful_video_decoder.cc -+++ b/media/gpu/v4l2/v4l2_stateful_video_decoder.cc -@@ -9,6 +9,7 @@ - #include - #include - -+#include "base/containers/contains.h" - #include "base/files/file_util.h" - #include "base/functional/callback_helpers.h" - #include "base/memory/ptr_util.h" diff --git a/SOURCES/chromium-115-linux_ui_darkmode.patch b/SOURCES/chromium-115-linux_ui_darkmode.patch deleted file mode 100644 index 12af02de..00000000 --- a/SOURCES/chromium-115-linux_ui_darkmode.patch +++ /dev/null @@ -1,297 +0,0 @@ -commit 4943182fdfe7adbcc49b10538d7d52b17dd538ff -Author: Tom Anderson -Date: Fri Jul 21 22:35:40 2023 +0000 - - [Linux Ui] Set toolkit dark preference based on FDO dark preference - - The toolkit color scheme preference is not affected by the - `org.freedesktop.appearance color-scheme` setting. It's up to - apps to manually toggle the toolkit theme based on this setting. - This is done by libadwaita, libhandy, firefox, and libreoffice. - - R=sky - - Change-Id: If05e61e6d0ec98ee1a74d442ce29b2ceb5337e86 - Bug: 998903 - Low-Coverage-Reason: No existing tests for dark_mode_manager_linux - Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4701710 - Reviewed-by: Scott Violet - Commit-Queue: Thomas Anderson - Cr-Commit-Position: refs/heads/main@{#1173744} - -diff --git a/chrome/browser/ui/views/dark_mode_manager_linux.cc b/chrome/browser/ui/views/dark_mode_manager_linux.cc -index 4127327433593..6f054ab76b305 100644 ---- a/chrome/browser/ui/views/dark_mode_manager_linux.cc -+++ b/chrome/browser/ui/views/dark_mode_manager_linux.cc -@@ -67,7 +67,7 @@ DarkModeManagerLinux::DarkModeManagerLinux() - if (auto* linux_ui_theme = ui::GetDefaultLinuxUiTheme()) { - auto* native_theme = linux_ui_theme->GetNativeTheme(); - native_theme_observer_.Observe(native_theme); -- SetColorScheme(native_theme->ShouldUseDarkColors()); -+ SetColorScheme(native_theme->ShouldUseDarkColors(), true); - } - } - -@@ -80,7 +80,7 @@ DarkModeManagerLinux::~DarkModeManagerLinux() { - - void DarkModeManagerLinux::OnNativeThemeUpdated( - ui::NativeTheme* observed_theme) { -- SetColorScheme(observed_theme->ShouldUseDarkColors()); -+ SetColorScheme(observed_theme->ShouldUseDarkColors(), true); - } - - void DarkModeManagerLinux::OnSignalConnected(const std::string& interface_name, -@@ -114,7 +114,7 @@ void DarkModeManagerLinux::OnPortalSettingChanged(dbus::Signal* signal) { - return; - } - -- SetColorScheme(new_color_scheme == kFreedesktopColorSchemeDark); -+ SetColorScheme(new_color_scheme == kFreedesktopColorSchemeDark, false); - } - - void DarkModeManagerLinux::OnReadColorSchemeResponse(dbus::Response* response) { -@@ -137,13 +137,23 @@ void DarkModeManagerLinux::OnReadColorSchemeResponse(dbus::Response* response) { - return; - } - -- // Ignore future updates from the toolkit theme. -- native_theme_observer_.Reset(); -+ // Once we read the org.freedesktop.appearance color-scheme setting successfully, -+ // it should always take precedence over the toolkit color scheme. -+ ignore_toolkit_theme_changes_ = true; - -- SetColorScheme(new_color_scheme == kFreedesktopColorSchemeDark); -+ SetColorScheme(new_color_scheme == kFreedesktopColorSchemeDark, false); - } - --void DarkModeManagerLinux::SetColorScheme(bool prefer_dark_theme) { -+void DarkModeManagerLinux::SetColorScheme(bool prefer_dark_theme, -+ bool from_toolkit_theme) { -+ if (from_toolkit_theme && ignore_toolkit_theme_changes_) { -+ return; -+ } -+ if (!from_toolkit_theme) { -+ for (auto* linux_ui_theme : ui::GetLinuxUiThemes()) { -+ linux_ui_theme->SetDarkTheme(prefer_dark_theme); -+ } -+ } - if (prefer_dark_theme_ == prefer_dark_theme) { - return; - } -diff --git a/chrome/browser/ui/views/dark_mode_manager_linux.h b/chrome/browser/ui/views/dark_mode_manager_linux.h -index 34b07ffadbbef..e00d8617e0e23 100644 ---- a/chrome/browser/ui/views/dark_mode_manager_linux.h -+++ b/chrome/browser/ui/views/dark_mode_manager_linux.h -@@ -44,12 +44,13 @@ class DarkModeManagerLinux : public NativeThemeObserver { - void OnReadColorSchemeResponse(dbus::Response* response); - - // Sets `prefer_dark_theme_` and propagates to the web theme. -- void SetColorScheme(bool prefer_dark_theme); -+ void SetColorScheme(bool prefer_dark_theme, bool from_toolkit_theme); - - scoped_refptr bus_; - raw_ptr settings_proxy_; - - bool prefer_dark_theme_ = false; -+ bool ignore_toolkit_theme_changes_ = false; - - base::ScopedObservation - native_theme_observer_{this}; -diff --git a/ui/gtk/gtk_ui.cc b/ui/gtk/gtk_ui.cc -index 2b6bb89e3071e..a463500570c03 100644 ---- a/ui/gtk/gtk_ui.cc -+++ b/ui/gtk/gtk_ui.cc -@@ -463,6 +463,14 @@ bool GtkUi::PreferDarkTheme() const { - return dark; - } - -+void GtkUi::SetDarkTheme(bool dark) { -+ auto* settings = gtk_settings_get_default(); -+ g_object_set(settings, "gtk-application-prefer-dark-theme", dark, nullptr); -+ // OnThemeChanged() will be called via the -+ // notify::gtk-application-prefer-dark-theme handler to update the native -+ // theme. -+} -+ - bool GtkUi::AnimationsEnabled() const { - gboolean animations_enabled = false; - g_object_get(gtk_settings_get_default(), "gtk-enable-animations", -diff --git a/ui/gtk/gtk_ui.h b/ui/gtk/gtk_ui.h -index 573ea4066881b..53c02c50dac53 100644 ---- a/ui/gtk/gtk_ui.h -+++ b/ui/gtk/gtk_ui.h -@@ -106,6 +106,7 @@ class GtkUi : public ui::LinuxUiAndTheme { - void GetInactiveSelectionBgColor(SkColor* color) const override; - void GetInactiveSelectionFgColor(SkColor* color) const override; - bool PreferDarkTheme() const override; -+ void SetDarkTheme(bool dark) override; - std::unique_ptr CreateNavButtonProvider() override; - ui::WindowFrameProvider* GetWindowFrameProvider(bool solid_frame) override; - -diff --git a/ui/linux/fake_linux_ui.cc b/ui/linux/fake_linux_ui.cc -index d236a0919f66b..8b67f04c25e7d 100644 ---- a/ui/linux/fake_linux_ui.cc -+++ b/ui/linux/fake_linux_ui.cc -@@ -93,6 +93,8 @@ bool FakeLinuxUi::PreferDarkTheme() const { - return false; - } - -+void FakeLinuxUi::SetDarkTheme(bool dark) {} -+ - bool FakeLinuxUi::AnimationsEnabled() const { - return true; - } -diff --git a/ui/linux/fake_linux_ui.h b/ui/linux/fake_linux_ui.h -index 87aa82c930a35..daba20d196a7c 100644 ---- a/ui/linux/fake_linux_ui.h -+++ b/ui/linux/fake_linux_ui.h -@@ -64,6 +64,7 @@ class FakeLinuxUi : public LinuxUiAndTheme { - void GetInactiveSelectionBgColor(SkColor* color) const override; - void GetInactiveSelectionFgColor(SkColor* color) const override; - bool PreferDarkTheme() const override; -+ void SetDarkTheme(bool dark) override; - std::unique_ptr CreateNavButtonProvider() override; - ui::WindowFrameProvider* GetWindowFrameProvider(bool solid_frame) override; - }; -diff --git a/ui/linux/fallback_linux_ui.cc b/ui/linux/fallback_linux_ui.cc -index ab116fda42b22..6d77be047e202 100644 ---- a/ui/linux/fallback_linux_ui.cc -+++ b/ui/linux/fallback_linux_ui.cc -@@ -112,7 +112,11 @@ LinuxUi::WindowFrameAction FallbackLinuxUi::GetWindowFrameAction( - } - - bool FallbackLinuxUi::PreferDarkTheme() const { -- return false; -+ return theme_is_dark_; -+} -+ -+void FallbackLinuxUi::SetDarkTheme(bool dark) { -+ theme_is_dark_ = dark; - } - - bool FallbackLinuxUi::AnimationsEnabled() const { -diff --git a/ui/linux/fallback_linux_ui.h b/ui/linux/fallback_linux_ui.h -index 0d0df25ec2caf..9901d4939400d 100644 ---- a/ui/linux/fallback_linux_ui.h -+++ b/ui/linux/fallback_linux_ui.h -@@ -65,12 +65,14 @@ class FallbackLinuxUi : public LinuxUiAndTheme { - void GetInactiveSelectionBgColor(SkColor* color) const override; - void GetInactiveSelectionFgColor(SkColor* color) const override; - bool PreferDarkTheme() const override; -+ void SetDarkTheme(bool dark) override; - std::unique_ptr CreateNavButtonProvider() override; - ui::WindowFrameProvider* GetWindowFrameProvider(bool solid_frame) override; - - private: - std::string default_font_family_; - gfx::FontRenderParams default_font_render_params_; -+ bool theme_is_dark_ = false; - }; - - } // namespace ui -diff --git a/ui/linux/linux_ui.h b/ui/linux/linux_ui.h -index 45b36fbeeabc4..a47134d7fa672 100644 ---- a/ui/linux/linux_ui.h -+++ b/ui/linux/linux_ui.h -@@ -300,6 +300,10 @@ class COMPONENT_EXPORT(LINUX_UI) LinuxUiTheme { - // preferred. - virtual bool PreferDarkTheme() const = 0; - -+ // Override the toolkit's dark mode preference. Used when the dark mode -+ // setting is provided by org.freedesktop.appearance instead of the toolkit. -+ virtual void SetDarkTheme(bool dark) = 0; -+ - // Returns a new NavButtonProvider, or nullptr if the underlying - // toolkit does not support drawing client-side navigation buttons. - virtual std::unique_ptr CreateNavButtonProvider() = 0; -diff --git a/ui/linux/linux_ui_factory.cc b/ui/linux/linux_ui_factory.cc -index 5555ff3bf21f4..21be358d2af8e 100644 ---- a/ui/linux/linux_ui_factory.cc -+++ b/ui/linux/linux_ui_factory.cc -@@ -10,6 +10,7 @@ - #include "base/command_line.h" - #include "base/environment.h" - #include "base/nix/xdg_util.h" -+#include "base/no_destructor.h" - #include "base/strings/string_util.h" - #include "build/chromecast_buildflags.h" - #include "ui/base/buildflags.h" -@@ -35,10 +36,16 @@ namespace { - - const char kUiToolkitFlag[] = "ui-toolkit"; - -+std::vector& GetLinuxUiThemesImpl() { -+ static base::NoDestructor> themes; -+ return *themes; -+} -+ - std::unique_ptr CreateGtkUi() { - #if BUILDFLAG(USE_GTK) - auto gtk_ui = BuildGtkUi(); - if (gtk_ui->Initialize()) { -+ GetLinuxUiThemesImpl().push_back(gtk_ui.get()); - return gtk_ui; - } - #endif -@@ -61,6 +68,7 @@ std::unique_ptr CreateQtUi() { - #if BUILDFLAG(USE_QT) - auto qt_ui = qt::CreateQtUi(GetGtkUi()); - if (qt_ui->Initialize()) { -+ GetLinuxUiThemesImpl().push_back(qt_ui.get()); - return qt_ui; - } - #endif -@@ -156,6 +164,10 @@ LinuxUiTheme* GetLinuxUiTheme(SystemTheme system_theme) { - } - } - -+const std::vector& GetLinuxUiThemes() { -+ return GetLinuxUiThemesImpl(); -+} -+ - SystemTheme GetDefaultSystemTheme() { - std::unique_ptr env = base::Environment::Create(); - -diff --git a/ui/linux/linux_ui_factory.h b/ui/linux/linux_ui_factory.h -index 5d4f4f4761972..2f4820f2c6240 100644 ---- a/ui/linux/linux_ui_factory.h -+++ b/ui/linux/linux_ui_factory.h -@@ -32,6 +32,10 @@ LinuxUiTheme* GetDefaultLinuxUiTheme(); - COMPONENT_EXPORT(LINUX_UI_FACTORY) - LinuxUiTheme* GetLinuxUiTheme(SystemTheme system_theme); - -+// Returns all `LinuxUiTheme`s that have been created. -+COMPONENT_EXPORT(LINUX_UI_FACTORY) -+const std::vector& GetLinuxUiThemes(); -+ - COMPONENT_EXPORT(LINUX_UI_FACTORY) - SystemTheme GetDefaultSystemTheme(); - -diff --git a/ui/qt/qt_ui.cc b/ui/qt/qt_ui.cc -index cd12c72a3cad4..37e165d76305e 100644 ---- a/ui/qt/qt_ui.cc -+++ b/ui/qt/qt_ui.cc -@@ -355,6 +355,11 @@ bool QtUi::PreferDarkTheme() const { - shim_->GetColor(ColorType::kWindowBg, ColorState::kNormal)); - } - -+DISABLE_CFI_VCALL -+void QtUi::SetDarkTheme(bool dark) { -+ // Qt::ColorScheme is only available in QT 6.5 and later. -+} -+ - DISABLE_CFI_VCALL - bool QtUi::AnimationsEnabled() const { - return shim_->GetAnimationDurationMs() > 0; -diff --git a/ui/qt/qt_ui.h b/ui/qt/qt_ui.h -index 38ce8719ee1d8..787a9556b1264 100644 ---- a/ui/qt/qt_ui.h -+++ b/ui/qt/qt_ui.h -@@ -82,6 +82,7 @@ class QtUi : public ui::LinuxUiAndTheme, QtInterface::Delegate { - void GetInactiveSelectionBgColor(SkColor* color) const override; - void GetInactiveSelectionFgColor(SkColor* color) const override; - bool PreferDarkTheme() const override; -+ void SetDarkTheme(bool dark) override; - std::unique_ptr CreateNavButtonProvider() override; - ui::WindowFrameProvider* GetWindowFrameProvider(bool solid_frame) override; - diff --git a/SOURCES/chromium-116-v4l2-num_delta_pocs_of_ref_rps_idx.patch b/SOURCES/chromium-116-v4l2-num_delta_pocs_of_ref_rps_idx.patch deleted file mode 100644 index ec91c3ca..00000000 --- a/SOURCES/chromium-116-v4l2-num_delta_pocs_of_ref_rps_idx.patch +++ /dev/null @@ -1,50 +0,0 @@ -commit 992f2b837f7c150bebe40a8186420c5c065b71f8 -Author: Chen-Yu Tsai -Date: Mon Jul 31 04:50:11 2023 +0000 - - media/gpu/v4l2: Only set HEVC .num_delta_pocs_of_ref_rps_idx on ChromeOS - - The HEVC decode parameter .num_delta_pocs_of_ref_rps_idx field was - very recently added to support MediaTek's stateless HEVC decoder. It - was accepted upstream, but hasn't been part of a release yet, and so - hasn't trickled down into a distro package that can be included in the - sysroots. - - Guard the field assignment for now so that the Linux builds can proceed. - - Bug: b:258331312, b:291169645 - Cq-Include-Trybots: luci.chromium.try:linux-v4l2-codec-rel - Change-Id: I1629be2373e7d67ea06a206226ad09bce90c3752 - Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4728846 - Reviewed-by: Nathan Hebert - Auto-Submit: Chen-Yu Tsai - Commit-Queue: Chen-Yu Tsai - Cr-Commit-Position: refs/heads/main@{#1177093} - -diff --git a/media/gpu/v4l2/v4l2_video_decoder_delegate_h265.cc b/media/gpu/v4l2/v4l2_video_decoder_delegate_h265.cc -index d683fbb5407a4..0f02f39758fe9 100644 ---- a/media/gpu/v4l2/v4l2_video_decoder_delegate_h265.cc -+++ b/media/gpu/v4l2/v4l2_video_decoder_delegate_h265.cc -@@ -11,6 +11,7 @@ - #include - - #include "base/logging.h" -+#include "build/build_config.h" - #include "media/gpu/macros.h" - #include "media/gpu/v4l2/v4l2_decode_surface.h" - #include "media/gpu/v4l2/v4l2_decode_surface_handler.h" -@@ -410,8 +411,14 @@ V4L2VideoDecoderDelegateH265::SubmitFrameMetadata( - .pic_order_cnt_val = pic->pic_order_cnt_val_, - .short_term_ref_pic_set_size = static_cast<__u16>(slice_hdr->st_rps_bits), - .long_term_ref_pic_set_size = static_cast<__u16>(slice_hdr->lt_rps_bits), -+#if BUILDFLAG(IS_CHROMEOS) -+ // .num_delta_pocs_of_ref_rps_idx is upstream but not yet pulled -+ // into linux build sysroot. -+ // TODO(wenst): Remove once linux-libc-dev package is updated to -+ // at least v6.5 in the sysroots. - .num_delta_pocs_of_ref_rps_idx = - static_cast<__u8>(slice_hdr->st_ref_pic_set.rps_idx_num_delta_pocs), -+#endif - .flags = static_cast<__u64>( - (pic->irap_pic_ ? V4L2_HEVC_DECODE_PARAM_FLAG_IRAP_PIC : 0) | - ((pic->nal_unit_type_ >= H265NALU::IDR_W_RADL && diff --git a/SOURCES/chromium-117-emplace_back_on_vector-c++20.patch b/SOURCES/chromium-117-emplace_back_on_vector-c++20.patch new file mode 100644 index 00000000..acac8781 --- /dev/null +++ b/SOURCES/chromium-117-emplace_back_on_vector-c++20.patch @@ -0,0 +1,74 @@ +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 -up chromium-116.0.5845.96/chrome/browser/content_settings/one_time_permission_provider.cc.me chromium-116.0.5845.96/chrome/browser/content_settings/one_time_permission_provider.cc +--- chromium-116.0.5845.96/chrome/browser/content_settings/one_time_permission_provider.cc.me 2023-08-15 21:34:58.922855428 +0200 ++++ chromium-116.0.5845.96/chrome/browser/content_settings/one_time_permission_provider.cc 2023-08-15 21:39:23.310434237 +0200 +@@ -207,8 +207,8 @@ void OneTimePermissionProvider::OnSuspen + + while (rule_iterator && rule_iterator->HasNext()) { + auto rule = rule_iterator->Next(); +- patterns_to_delete.emplace_back(setting_type, rule->primary_pattern, +- rule->secondary_pattern); ++ patterns_to_delete.emplace_back() = {setting_type, rule->primary_pattern, ++ rule->secondary_pattern}; + permissions::PermissionUmaUtil::RecordOneTimePermissionEvent( + setting_type, + permissions::OneTimePermissionEvent::EXPIRED_ON_SUSPEND); +@@ -302,8 +302,8 @@ void OneTimePermissionProvider::DeleteEn + auto rule = rule_iterator->Next(); + if (rule->primary_pattern.Matches(origin_gurl) && + rule->secondary_pattern.Matches(origin_gurl)) { +- patterns_to_delete.emplace_back( +- content_setting_type, rule->primary_pattern, rule->secondary_pattern); ++ patterns_to_delete.emplace_back() = { ++ content_setting_type, rule->primary_pattern, rule->secondary_pattern}; + 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 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 --git a/SOURCES/chromium-116-missing-header-files.patch b/SOURCES/chromium-117-missing-header-files.patch similarity index 89% rename from SOURCES/chromium-116-missing-header-files.patch rename to SOURCES/chromium-117-missing-header-files.patch index 14983d9f..ad8e1e65 100644 --- a/SOURCES/chromium-116-missing-header-files.patch +++ b/SOURCES/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 #include -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,39 +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/components/bookmarks/common/url_load_stats.h.me chromium-116.0.5845.50/components/bookmarks/common/url_load_stats.h ---- chromium-116.0.5845.50/components/bookmarks/common/url_load_stats.h.me 2023-08-01 15:07:06.940881439 +0200 -+++ chromium-116.0.5845.50/components/bookmarks/common/url_load_stats.h 2023-08-01 15:09:29.301537450 +0200 -@@ -5,6 +5,7 @@ - #ifndef COMPONENTS_BOOKMARKS_COMMON_URL_LOAD_STATS_H_ - #define COMPONENTS_BOOKMARKS_COMMON_URL_LOAD_STATS_H_ - -+#include - #include - #include - -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 - #include - #include -+#include - - #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 - #include -+#include - - 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 @@ -466,14 +433,25 @@ diff -up chromium-96.0.4664.45/third_party/webrtc/modules/video_coding/utility/i #include #include -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 - #include - #include -+#include +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 + #include + #include + #include +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 + #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/SOURCES/chromium-117-mnemonic-error.patch b/SOURCES/chromium-117-mnemonic-error.patch new file mode 100644 index 00000000..455b3e57 --- /dev/null +++ b/SOURCES/chromium-117-mnemonic-error.patch @@ -0,0 +1,12 @@ +diff -up chromium-117.0.5938.48/third_party/blink/renderer/core/BUILD.gn.me chromium-117.0.5938.48/third_party/blink/renderer/core/BUILD.gn +--- chromium-117.0.5938.48/third_party/blink/renderer/core/BUILD.gn.me 2023-09-10 16:54:00.804385139 +0200 ++++ chromium-117.0.5938.48/third_party/blink/renderer/core/BUILD.gn 2023-09-10 16:54:13.540625077 +0200 +@@ -1694,8 +1694,6 @@ action_foreach("element_locator_test_pro + python_path_root = "${root_out_dir}/pyproto" + python_path_proto = "${python_path_root}/third_party/blink/renderer/core/lcp_critical_path_predictor" + +- mnemonic = "ELOC_PROTO" +- + source_dir = "lcp_critical_path_predictor/test_proto" + sources = rebase_path([ "lcp_image_id.asciipb" ], "", source_dir) + diff --git a/SOURCES/chromium-117-no_matching_constructor.patch b/SOURCES/chromium-117-no_matching_constructor.patch new file mode 100644 index 00000000..76e70a3f --- /dev/null +++ b/SOURCES/chromium-117-no_matching_constructor.patch @@ -0,0 +1,418 @@ +diff -up chromium-116.0.5845.50/net/dns/host_resolver_cache.cc.me chromium-116.0.5845.50/net/dns/host_resolver_cache.cc +--- chromium-116.0.5845.50/net/dns/host_resolver_cache.cc.me ++++ chromium-116.0.5845.50/net/dns/host_resolver_cache.cc +@@ -161,7 +161,7 @@ void HostResolverCache::Set( + + std::string domain_name = result->domain_name(); + entries_.emplace( +- Key(std::move(domain_name), network_anonymization_key), ++ Key{std::move(domain_name), network_anonymization_key}, + Entry(std::move(result), source, secure, staleness_generation_)); + + if (entries_.size() > max_entries_) { +diff -up chromium-116.0.5845.50/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc.me chromium-116.0.5845.50/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc +--- chromium-116.0.5845.50/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc.me 2023-08-02 15:17:52.613858423 +0200 ++++ chromium-116.0.5845.50/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc 2023-08-02 15:18:43.269790877 +0200 +@@ -1496,7 +1496,7 @@ void SkiaOutputSurfaceImplOnGpu::CopyOut + + // Issue readbacks from the surfaces: + for (size_t i = 0; i < CopyOutputResult::kNV12MaxPlanes; ++i) { +- SkISize size(plane_surfaces[i]->width(), plane_surfaces[i]->height()); ++ SkISize size{plane_surfaces[i]->width(), plane_surfaces[i]->height()}; + SkImageInfo dst_info = SkImageInfo::Make( + size, (i == 0) ? kAlpha_8_SkColorType : kR8G8_unorm_SkColorType, + kUnpremul_SkAlphaType); +diff -up chromium-116.0.5845.50/third_party/blink/renderer/platform/fonts/palette_interpolation.cc.me chromium-116.0.5845.50/third_party/blink/renderer/platform/fonts/palette_interpolation.cc +--- chromium-116.0.5845.50/third_party/blink/renderer/platform/fonts/palette_interpolation.cc.me 2023-08-02 21:32:14.195705494 +0200 ++++ chromium-116.0.5845.50/third_party/blink/renderer/platform/fonts/palette_interpolation.cc 2023-08-02 21:59:08.156532934 +0200 +@@ -31,7 +31,7 @@ Vector + color_interpolation_space, hue_interpolation_method, start_color, + end_color, percentage, alpha_multiplier); + +- FontPalette::FontPaletteOverride result_color_record(i, result_color); ++ FontPalette::FontPaletteOverride result_color_record{static_cast(i), result_color}; + result_color_records.push_back(result_color_record); + } + return result_color_records; +diff -up chromium-116.0.5845.50/ui/base/wayland/color_manager_util.h.me chromium-116.0.5845.50/ui/base/wayland/color_manager_util.h +--- chromium-116.0.5845.50/ui/base/wayland/color_manager_util.h.me 2023-08-03 08:27:11.371750178 +0200 ++++ chromium-116.0.5845.50/ui/base/wayland/color_manager_util.h 2023-08-03 10:39:07.266989323 +0200 +@@ -52,53 +52,53 @@ constexpr auto kChromaticityMap = base:: + zcr_color_manager_v1_chromaticity_names, + PrimaryVersion>( + {{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT601_525_LINE, +- PrimaryVersion(gfx::ColorSpace::PrimaryID::SMPTE170M, +- kDefaultSinceVersion)}, ++ PrimaryVersion{gfx::ColorSpace::PrimaryID::SMPTE170M, ++ kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT601_625_LINE, +- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT470BG, +- kDefaultSinceVersion)}, ++ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT470BG, ++ kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE170M, +- PrimaryVersion(gfx::ColorSpace::PrimaryID::SMPTE170M, +- kDefaultSinceVersion)}, ++ PrimaryVersion{gfx::ColorSpace::PrimaryID::SMPTE170M, ++ kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT709, +- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion)}, ++ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT2020, +- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT2020, kDefaultSinceVersion)}, ++ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT2020, kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SRGB, +- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion)}, ++ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_DISPLAYP3, +- PrimaryVersion(gfx::ColorSpace::PrimaryID::P3, kDefaultSinceVersion)}, ++ PrimaryVersion{gfx::ColorSpace::PrimaryID::P3, kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_ADOBERGB, +- PrimaryVersion(gfx::ColorSpace::PrimaryID::ADOBE_RGB, +- kDefaultSinceVersion)}, ++ PrimaryVersion{gfx::ColorSpace::PrimaryID::ADOBE_RGB, ++ kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_WIDE_GAMUT_COLOR_SPIN, +- PrimaryVersion( ++ PrimaryVersion{ + gfx::ColorSpace::PrimaryID::WIDE_GAMUT_COLOR_SPIN, +- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_WIDE_GAMUT_COLOR_SPIN_SINCE_VERSION)}, ++ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_WIDE_GAMUT_COLOR_SPIN_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT470M, +- PrimaryVersion( ++ PrimaryVersion{ + gfx::ColorSpace::PrimaryID::BT470M, +- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT470M_SINCE_VERSION)}, ++ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT470M_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE240M, +- PrimaryVersion( ++ PrimaryVersion{ + gfx::ColorSpace::PrimaryID::SMPTE240M, +- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE240M_SINCE_VERSION)}, ++ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE240M_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_XYZ_D50, +- PrimaryVersion( ++ PrimaryVersion{ + gfx::ColorSpace::PrimaryID::XYZ_D50, +- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_XYZ_D50_SINCE_VERSION)}, ++ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_XYZ_D50_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST428_1, +- PrimaryVersion( ++ PrimaryVersion{ + gfx::ColorSpace::PrimaryID::SMPTEST428_1, +- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST428_1_SINCE_VERSION)}, ++ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST428_1_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST431_2, +- PrimaryVersion( ++ PrimaryVersion{ + gfx::ColorSpace::PrimaryID::SMPTEST431_2, +- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST431_2_SINCE_VERSION)}, ++ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST431_2_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_FILM, +- PrimaryVersion( ++ PrimaryVersion{ + gfx::ColorSpace::PrimaryID::FILM, +- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_FILM_SINCE_VERSION)}}); ++ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_FILM_SINCE_VERSION}}}); + + // A map from the zcr_color_manager_v1 eotf_names enum values + // representing well-known EOTFs, to their equivalent TransferIDs. +@@ -107,65 +107,65 @@ constexpr auto kEotfMap = base::MakeFixe + zcr_color_manager_v1_eotf_names, + TransferVersion>({ + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR, +- TransferVersion(gfx::ColorSpace::TransferID::LINEAR, +- kDefaultSinceVersion)}, ++ TransferVersion{gfx::ColorSpace::TransferID::LINEAR, ++ kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB, +- TransferVersion(gfx::ColorSpace::TransferID::SRGB, kDefaultSinceVersion)}, ++ TransferVersion{gfx::ColorSpace::TransferID::SRGB, kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709, +- TransferVersion(gfx::ColorSpace::TransferID::BT709, +- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION)}, ++ TransferVersion{gfx::ColorSpace::TransferID::BT709, ++ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2087, +- TransferVersion(gfx::ColorSpace::TransferID::GAMMA24, +- kDefaultSinceVersion)}, ++ TransferVersion{gfx::ColorSpace::TransferID::GAMMA24, ++ kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_ADOBERGB, + // This is ever so slightly inaccurate. The number ought to be + // 2.19921875f, not 2.2 +- TransferVersion(gfx::ColorSpace::TransferID::GAMMA22, +- kDefaultSinceVersion)}, ++ TransferVersion{gfx::ColorSpace::TransferID::GAMMA22, ++ kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_PQ, +- TransferVersion(gfx::ColorSpace::TransferID::PQ, kDefaultSinceVersion)}, ++ TransferVersion{gfx::ColorSpace::TransferID::PQ, kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG, +- TransferVersion(gfx::ColorSpace::TransferID::HLG, +- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION)}, ++ TransferVersion{gfx::ColorSpace::TransferID::HLG, ++ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE170M, +- TransferVersion(gfx::ColorSpace::TransferID::SMPTE170M, +- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE170M_SINCE_VERSION)}, ++ TransferVersion{gfx::ColorSpace::TransferID::SMPTE170M, ++ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE170M_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE240M, +- TransferVersion(gfx::ColorSpace::TransferID::SMPTE240M, +- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE240M_SINCE_VERSION)}, ++ TransferVersion{gfx::ColorSpace::TransferID::SMPTE240M, ++ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE240M_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTEST428_1, +- TransferVersion( ++ TransferVersion{ + gfx::ColorSpace::TransferID::SMPTEST428_1, +- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTEST428_1_SINCE_VERSION)}, ++ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTEST428_1_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG, +- TransferVersion(gfx::ColorSpace::TransferID::LOG, +- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SINCE_VERSION)}, ++ TransferVersion{gfx::ColorSpace::TransferID::LOG, ++ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SQRT, +- TransferVersion(gfx::ColorSpace::TransferID::LOG_SQRT, +- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SQRT_SINCE_VERSION)}, ++ TransferVersion{gfx::ColorSpace::TransferID::LOG_SQRT, ++ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SQRT_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_IEC61966_2_4, +- TransferVersion( ++ TransferVersion{ + gfx::ColorSpace::TransferID::IEC61966_2_4, +- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_IEC61966_2_4_SINCE_VERSION)}, ++ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_IEC61966_2_4_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT1361_ECG, +- TransferVersion(gfx::ColorSpace::TransferID::BT1361_ECG, +- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT1361_ECG_SINCE_VERSION)}, ++ TransferVersion{gfx::ColorSpace::TransferID::BT1361_ECG, ++ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT1361_ECG_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_10, +- TransferVersion(gfx::ColorSpace::TransferID::BT2020_10, +- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_10_SINCE_VERSION)}, ++ TransferVersion{gfx::ColorSpace::TransferID::BT2020_10, ++ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_10_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_12, +- TransferVersion(gfx::ColorSpace::TransferID::BT2020_12, +- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_12_SINCE_VERSION)}, ++ TransferVersion{gfx::ColorSpace::TransferID::BT2020_12, ++ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_12_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SCRGB_LINEAR_80_NITS, +- TransferVersion( ++ TransferVersion{ + gfx::ColorSpace::TransferID::SCRGB_LINEAR_80_NITS, +- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SCRGB_LINEAR_80_NITS_SINCE_VERSION)}, ++ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SCRGB_LINEAR_80_NITS_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA18, +- TransferVersion(gfx::ColorSpace::TransferID::GAMMA18, +- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA18_SINCE_VERSION)}, ++ TransferVersion{gfx::ColorSpace::TransferID::GAMMA18, ++ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA18_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA28, +- TransferVersion(gfx::ColorSpace::TransferID::GAMMA28, +- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA28_SINCE_VERSION)}, ++ TransferVersion{gfx::ColorSpace::TransferID::GAMMA28, ++ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA28_SINCE_VERSION}}, + }); + + // A map from the SDR zcr_color_manager_v1 eotf_names enum values +@@ -174,18 +174,18 @@ constexpr auto kEotfMap = base::MakeFixe + constexpr auto kTransferMap = + base::MakeFixedFlatMap({ + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR, +- TransferFnVersion(SkNamedTransferFn::kLinear, kDefaultSinceVersion)}, ++ TransferFnVersion{SkNamedTransferFn::kLinear, kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB, +- TransferFnVersion(SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion)}, ++ TransferFnVersion{SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709, +- TransferFnVersion( ++ TransferFnVersion{ + SkNamedTransferFnExt::kRec709, +- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION)}, ++ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2087, +- TransferFnVersion(gamma24, kDefaultSinceVersion)}, ++ TransferFnVersion{gamma24, kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_ADOBERGB, +- TransferFnVersion(SkNamedTransferFnExt::kA98RGB, +- kDefaultSinceVersion)}, ++ TransferFnVersion{SkNamedTransferFnExt::kA98RGB, ++ kDefaultSinceVersion}}, + }); + + // A map from the HDR zcr_color_manager_v1 eotf_names enum values +@@ -194,68 +194,68 @@ constexpr auto kTransferMap = + constexpr auto kHDRTransferMap = + base::MakeFixedFlatMap( + {{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR, +- TransferFnVersion(SkNamedTransferFn::kLinear, kDefaultSinceVersion)}, ++ TransferFnVersion{SkNamedTransferFn::kLinear, kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB, +- TransferFnVersion(SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion)}, ++ TransferFnVersion{SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_PQ, +- TransferFnVersion(SkNamedTransferFn::kPQ, kDefaultSinceVersion)}, ++ TransferFnVersion{SkNamedTransferFn::kPQ, kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG, +- TransferFnVersion(SkNamedTransferFn::kHLG, +- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION)}, ++ TransferFnVersion{SkNamedTransferFn::kHLG, ++ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_EXTENDEDSRGB10, +- TransferFnVersion( ++ TransferFnVersion{ + SkNamedTransferFnExt::kSRGBExtended1023Over510, +- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_EXTENDEDSRGB10_SINCE_VERSION)}}); ++ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_EXTENDEDSRGB10_SINCE_VERSION}}}); + + // A map from zcr_color_manager_v1 matrix_names enum values to + // gfx::ColorSpace::MatrixIDs. + constexpr auto kMatrixMap = + base::MakeFixedFlatMap( + {{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_RGB, +- MatrixVersion(gfx::ColorSpace::MatrixID::RGB, kDefaultSinceVersion)}, ++ MatrixVersion{gfx::ColorSpace::MatrixID::RGB, kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT709, +- MatrixVersion(gfx::ColorSpace::MatrixID::BT709, +- kDefaultSinceVersion)}, ++ MatrixVersion{gfx::ColorSpace::MatrixID::BT709, ++ kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT470BG, +- MatrixVersion( ++ MatrixVersion{ + gfx::ColorSpace::MatrixID::BT470BG, +- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT470BG_SINCE_VERSION)}, ++ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT470BG_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT2020_NCL, +- MatrixVersion(gfx::ColorSpace::MatrixID::BT2020_NCL, +- kDefaultSinceVersion)}, ++ MatrixVersion{gfx::ColorSpace::MatrixID::BT2020_NCL, ++ kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT2020_CL, +- MatrixVersion(gfx::ColorSpace::MatrixID::BT2020_CL, +- kDefaultSinceVersion)}, ++ MatrixVersion{gfx::ColorSpace::MatrixID::BT2020_CL, ++ kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_FCC, +- MatrixVersion(gfx::ColorSpace::MatrixID::FCC, kDefaultSinceVersion)}, ++ MatrixVersion{gfx::ColorSpace::MatrixID::FCC, kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YCOCG, +- MatrixVersion(gfx::ColorSpace::MatrixID::YCOCG, +- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YCOCG_SINCE_VERSION)}, ++ MatrixVersion{gfx::ColorSpace::MatrixID::YCOCG, ++ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YCOCG_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YDZDX, +- MatrixVersion(gfx::ColorSpace::MatrixID::YDZDX, +- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YDZDX_SINCE_VERSION)}, ++ MatrixVersion{gfx::ColorSpace::MatrixID::YDZDX, ++ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YDZDX_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_GBR, +- MatrixVersion(gfx::ColorSpace::MatrixID::GBR, +- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_GBR_SINCE_VERSION)}, ++ MatrixVersion{gfx::ColorSpace::MatrixID::GBR, ++ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_GBR_SINCE_VERSION}}, + {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_SMPTE170M, +- MatrixVersion(gfx::ColorSpace::MatrixID::SMPTE170M, +- kDefaultSinceVersion)}, ++ MatrixVersion{gfx::ColorSpace::MatrixID::SMPTE170M, ++ kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_SMPTE240M, +- MatrixVersion(gfx::ColorSpace::MatrixID::SMPTE240M, +- kDefaultSinceVersion)}}); ++ MatrixVersion{gfx::ColorSpace::MatrixID::SMPTE240M, ++ kDefaultSinceVersion}}}); + + // A map from zcr_color_manager_v1 range_names enum values to + // gfx::ColorSpace::RangeIDs. + constexpr auto kRangeMap = + base::MakeFixedFlatMap( + {{ZCR_COLOR_MANAGER_V1_RANGE_NAMES_LIMITED, +- RangeVersion(gfx::ColorSpace::RangeID::LIMITED, +- kDefaultSinceVersion)}, ++ RangeVersion{gfx::ColorSpace::RangeID::LIMITED, ++ kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_RANGE_NAMES_FULL, +- RangeVersion(gfx::ColorSpace::RangeID::FULL, kDefaultSinceVersion)}, ++ RangeVersion{gfx::ColorSpace::RangeID::FULL, kDefaultSinceVersion}}, + {ZCR_COLOR_MANAGER_V1_RANGE_NAMES_DERIVED, +- RangeVersion(gfx::ColorSpace::RangeID::DERIVED, +- kDefaultSinceVersion)}}); ++ RangeVersion{gfx::ColorSpace::RangeID::DERIVED, ++ kDefaultSinceVersion}}}); + + zcr_color_manager_v1_chromaticity_names ToColorManagerChromaticity( + gfx::ColorSpace::PrimaryID primaryID, +diff -up chromium-116.0.5845.50/chrome/browser/ui/omnibox/chrome_omnibox_client.cc.me chromium-116.0.5845.50/chrome/browser/ui/omnibox/chrome_omnibox_client.cc +--- chromium-116.0.5845.50/chrome/browser/ui/omnibox/chrome_omnibox_client.cc.me 2023-08-03 13:23:33.748394615 +0200 ++++ chromium-116.0.5845.50/chrome/browser/ui/omnibox/chrome_omnibox_client.cc 2023-08-03 13:25:01.140489840 +0200 +@@ -470,10 +470,10 @@ void ChromeOmniboxClient::OnAutocomplete + alternative_nav_match); + + // Store the details necessary to open the omnibox match via browser commands. +- location_bar_->set_navigation_params(LocationBar::NavigationParams( ++ location_bar_->set_navigation_params(LocationBar::NavigationParams{ + destination_url, disposition, transition, match_selection_timestamp, + destination_url_entered_without_scheme, +- destination_url_entered_with_http_scheme)); ++ destination_url_entered_with_http_scheme}); + + 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 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 --git a/SOURCES/chromium-115-python-3.12-deprecated.patch b/SOURCES/chromium-117-python-3.12-deprecated.patch similarity index 89% rename from SOURCES/chromium-115-python-3.12-deprecated.patch rename to SOURCES/chromium-117-python-3.12-deprecated.patch index f6fe3a29..0d02fcbb 100644 --- a/SOURCES/chromium-115-python-3.12-deprecated.patch +++ b/SOURCES/chromium-117-python-3.12-deprecated.patch @@ -69,17 +69,6 @@ diff -up chromium-115.0.5790.102/mojo/public/tools/bindings/concatenate_and_repl if not match: print("Invalid goog.provide line in %s:\n%s" % (filename, line)) sys.exit(1) -diff -up chromium-115.0.5790.102/mojo/public/tools/mojom/mojom/parse/lexer.py.me chromium-115.0.5790.102/mojo/public/tools/mojom/mojom/parse/lexer.py ---- chromium-115.0.5790.102/mojo/public/tools/mojom/mojom/parse/lexer.py.me 2023-07-22 14:10:40.372979365 +0200 -+++ chromium-115.0.5790.102/mojo/public/tools/mojom/mojom/parse/lexer.py 2023-07-22 14:13:31.200453442 +0200 -@@ -2,7 +2,6 @@ - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - --import imp - import os.path - import sys - diff -up chromium-115.0.5790.102/third_party/catapult/common/py_vulcanize/py_vulcanize/html_generation_controller.py.me chromium-115.0.5790.102/third_party/catapult/common/py_vulcanize/py_vulcanize/html_generation_controller.py --- chromium-115.0.5790.102/third_party/catapult/common/py_vulcanize/py_vulcanize/html_generation_controller.py.me 2023-07-22 15:12:41.850895179 +0200 +++ chromium-115.0.5790.102/third_party/catapult/common/py_vulcanize/py_vulcanize/html_generation_controller.py 2023-07-22 15:12:55.844871207 +0200 @@ -159,14 +148,3 @@ diff -up chromium-115.0.5790.102/third_party/vulkan-deps/vulkan-validation-layer return [s.replace('\\', '/') for s in glob.glob(dirname)] def main(): -diff -up chromium-115.0.5790.102/mojo/public/tools/mojom/mojom/fileutil.py.python-imp-deprecated chromium-115.0.5790.102/mojo/public/tools/mojom/mojom/fileutil.py ---- chromium-115.0.5790.102/mojo/public/tools/mojom/mojom/fileutil.py.python-imp-deprecated 2023-07-21 05:41:02.000000000 +0200 -+++ chromium-115.0.5790.102/mojo/public/tools/mojom/mojom/fileutil.py 2023-07-22 14:45:20.440127549 +0200 -@@ -3,7 +3,6 @@ - # found in the LICENSE file. - - import errno --import imp - import os.path - import sys - diff --git a/SOURCES/chromium-117-string-convert.patch b/SOURCES/chromium-117-string-convert.patch new file mode 100644 index 00000000..cb48e4b2 --- /dev/null +++ b/SOURCES/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/SOURCES/chromium-117-typename.patch b/SOURCES/chromium-117-typename.patch new file mode 100644 index 00000000..af7da9f9 --- /dev/null +++ b/SOURCES/chromium-117-typename.patch @@ -0,0 +1,118 @@ +diff -up chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc.me 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.me 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 +-SortedItems::const_iterator GetLastIter(const SortedItems& cache) { ++typename SortedItems::const_iterator GetLastIter(const SortedItems& cache) { + CHECK(!cache.empty()); + auto it = cache.end(); + return std::prev(it); +@@ -967,9 +967,9 @@ bool DownloadBubbleUpdateService::CacheM + } + + template +-SortedItems::iterator ++typename SortedItems::iterator + DownloadBubbleUpdateService::CacheManager::RemoveItemFromCacheByIter( +- SortedItems::iterator iter, ++ typename SortedItems::iterator iter, + SortedItems& cache, + IterMap& 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::ConstRefInputVector inputs) ++ typename ModelExecutor::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.me 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.me 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; + using USpan = base::span; + // 32 matches that used by HTMLToken::Attribute. +- typedef std::conditional, ++ typedef typename std::conditional, + UCharLiteralBuffer<32>, + LCharLiteralBuffer<32>>::type LiteralBufferType; + typedef UCharLiteralBuffer<32> UCharLiteralBufferType; +diff -up chromium-116.0.5845.50/content/public/browser/web_ui_browser_interface_broker_registry.h.me chromium-116.0.5845.50/content/public/browser/web_ui_browser_interface_broker_registry.h +--- chromium-116.0.5845.50/content/public/browser/web_ui_browser_interface_broker_registry.h.me 2023-08-02 16:18:30.380108125 +0200 ++++ chromium-116.0.5845.50/content/public/browser/web_ui_browser_interface_broker_registry.h 2023-08-02 16:20:59.660024578 +0200 +@@ -127,10 +127,10 @@ class CONTENT_EXPORT WebUIBrowserInterfa + // + // TODO(crbug.com/1407936): Point to WebUIJsBridge documentation. + template +- JsBridgeTraits::BinderInitializer& ForWebUIWithJsBridge() { ++ typename JsBridgeTraits::BinderInitializer& ForWebUIWithJsBridge() { + using Traits = JsBridgeTraits; +- using Interface = Traits::Interface; +- using JsBridgeBinderInitializer = Traits::BinderInitializer; ++ using Interface = typename Traits::Interface; ++ using JsBridgeBinderInitializer = typename Traits::BinderInitializer; + + // WebUIController::GetType() requires an instantiated WebUIController + // (because it's a virtual method and can't be static). Here we only have +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-08-02 20:41:23.984729462 +0200 ++++ chromium-116.0.5845.50/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h 2023-08-02 20:41:53.737583093 +0200 +@@ -270,8 +270,8 @@ class CORE_EXPORT ObjectPaintPropertiesS + NodeList& nodes, + NodeId node_id, + const ParentType& parent, +- NodeType::State&& state, +- const NodeType::AnimationState& animation_state = ++ typename NodeType::State&& state, ++ const typename NodeType::AnimationState& animation_state = + 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> SendForBatchExecutionSync( +- ModelExecutor::ConstRefInputVector inputs) ++ typename ModelExecutor::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::ConstRefInputVector inputs) { ++ typename ModelExecutor::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::ConstRefInputVector inputs, ++ typename ModelExecutor::ConstRefInputVector inputs, + std::vector>* 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::ConstRefInputVector inputs, ++ typename ModelExecutor::ConstRefInputVector inputs, + ExecutionStatus execution_status) { + DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); diff --git a/SOURCES/chromium-108-widevine-other-locations.patch b/SOURCES/chromium-117-widevine-other-locations.patch similarity index 97% rename from SOURCES/chromium-108-widevine-other-locations.patch rename to SOURCES/chromium-117-widevine-other-locations.patch index 5a29089f..38f3a278 100644 --- a/SOURCES/chromium-108-widevine-other-locations.patch +++ b/SOURCES/chromium-117-widevine-other-locations.patch @@ -15,8 +15,9 @@ diff -up chromium-108.0.5359.124/chrome/common/chrome_paths.cc.widevine-other-lo + cur = base::FilePath(FILE_PATH_LITERAL("/opt/google/chrome/WidevineCdm")); + break; + } - if (!GetComponentDirectory(&cur)) + if (!GetComponentDirectory(&cur)) { return false; + } cur = cur.AppendASCII(kWidevineCdmBaseDirectory); diff -up chromium-108.0.5359.124/third_party/widevine/cdm/BUILD.gn.widevine-other-locations chromium-108.0.5359.124/third_party/widevine/cdm/BUILD.gn --- chromium-108.0.5359.124/third_party/widevine/cdm/BUILD.gn.widevine-other-locations 2023-01-02 11:10:45.953114153 +0100 diff --git a/SOURCES/chromium-115-workaround_clang_bug-structured_binding.patch b/SOURCES/chromium-117-workaround_clang_bug-structured_binding.patch similarity index 70% rename from SOURCES/chromium-115-workaround_clang_bug-structured_binding.patch rename to SOURCES/chromium-117-workaround_clang_bug-structured_binding.patch index a70cdd9a..3b79f512 100644 --- a/SOURCES/chromium-115-workaround_clang_bug-structured_binding.patch +++ b/SOURCES/chromium-117-workaround_clang_bug-structured_binding.patch @@ -15,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; @@ -79,3 +67,30 @@ 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 --git a/SPECS/chromium.spec b/SPECS/chromium.spec index 69d64379..de62a3c2 100644 --- a/SPECS/chromium.spec +++ b/SPECS/chromium.spec @@ -41,7 +41,7 @@ %global build_remoting 0 # set nodejs_version -%global nodejs_version v19.8.1 +%global nodejs_version v20.6.1 # set version for devtoolset and gcc-toolset %global dts_version 12 @@ -235,7 +235,7 @@ %endif Name: chromium%{chromium_channel} -Version: 116.0.5845.187 +Version: 117.0.5938.62 Release: 1%{?dist}.inferit Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Url: http://www.chromium.org/Home @@ -257,7 +257,7 @@ Patch5: chromium-77.0.3865.75-no-zlib-mangle.patch Patch6: chromium-115-norar.patch # Try to load widevine from other places -Patch8: chromium-108-widevine-other-locations.patch +Patch8: chromium-117-widevine-other-locations.patch # Tell bootstrap.py to always use the version of Python we specify Patch11: chromium-93.0.4577.63-py3-bootstrap.patch @@ -333,53 +333,46 @@ Patch116: chromium-112-ffmpeg-first_dts.patch # revert new-channel-layout-api on f36, old ffmpeg-free Patch117: chromium-108-ffmpeg-revert-new-channel-layout-api.patch -# revert AV1 VA-API video encode due to old libva on el9 +# revert AV1 VAAPI video encode due to old libva on el9 Patch130: chromium-114-revert-av1enc-el9.patch -# compiler build errors -Patch300: chromium-116-no_matching_constructor.patch +# fixes for old clang version in fedora < 38 end epel +# compiler build errors, no matching constructor for initialization +Patch300: chromium-117-no_matching_constructor.patch Patch301: chromium-115-compiler-SkColor4f.patch # workaround for clang bug, https://github.com/llvm/llvm-project/issues/57826 -Patch302: chromium-115-workaround_clang_bug-structured_binding.patch +Patch302: chromium-117-workaround_clang_bug-structured_binding.patch # missing typename -Patch303: chromium-116-typename.patch +Patch303: chromium-117-typename.patch # missing include header files -Patch304: chromium-116-missing-header-files.patch +Patch304: chromium-117-missing-header-files.patch # compiler error with c++20 -Patch306: chromium-116-emplace_back_on_vector-c++20.patch +Patch306: chromium-117-emplace_back_on_vector-c++20.patch # disable memory tagging for epel8 on aarch64 due to new feature IFUNC-Resolver not supported # in old glibc < 2.30 # error: fatal error: 'sys/ifunc.h' file not found Patch307: chromium-116-arm64-memory_tagging.patch -# upstream, do not restrict new V4L2 decoders to ARM or ChromeOS -# error: use of undeclared identifier 'kV4L2FlatStatefulVideoDecoder' # error: use of undeclared identifier 'kV4L2FlatStatelessVideoDecoder' -Patch308: chromium-115-do_not_restrict_new_V4L2_decoders.v4l2.pach - -# upstream, include contains.h header for V4L2StatefulVideoDecoder -# error: no member named 'Contains' in namespace 'base' -Patch309: chromium-115-include_contains_h_header_for_V4L2StatefulVideoDecoder.patch +# error: invalid operands to binary expression +Patch308: chromium-117-string-convert.patch # clang warnings Patch311: chromium-115-clang-warnings.patch # imp module is removed in python-3.12 -Patch312: chromium-115-python-3.12-deprecated.patch +Patch312: chromium-117-python-3.12-deprecated.patch -# upstream patches -# Set toolkit dark preference based on FDO dark preference -Patch350: chromium-115-linux_ui_darkmode.patch # Tweak about:gpu, Add dark mode support Patch351: chromium-116-tweak_about_gpu.patch -# Guard the field assignment num_delta_pocs_of_ref_rps_idx as it is not supported -# in fedora < 39 -Patch352: chromium-116-v4l2-num_delta_pocs_of_ref_rps_idx.patch + +# build error +Patch352: chromium-117-mnemonic-error.patch # Yandex Search by default Patch500: 0001-Yandex-as-default-search-engine.patch @@ -410,8 +403,8 @@ Source13: master_preferences # RHEL 8 needs newer nodejs %if 0%{?rhel} == 8 -Source19: https://nodejs.org/dist/latest-v16.x/node-%{nodejs_version}-linux-x64.tar.xz -Source21: https://nodejs.org/dist/latest-v16.x/node-%{nodejs_version}-linux-arm64.tar.xz +Source19: https://nodejs.org/dist/latest-v20.x/node-%{nodejs_version}-linux-x64.tar.xz +Source21: https://nodejs.org/dist/latest-v20.x/node-%{nodejs_version}-linux-arm64.tar.xz %endif # Yandex logo @@ -987,19 +980,13 @@ udev. %endif %endif -%patch -P308 -p1 -b .do_not_restrict_new_V4L2_decoders.v4l2 -%patch -P309 -p1 -b .include_contains_h_header_for_V4L2StatefulVideoDecoder +%patch -P308 -p1 -b .string-convert %patch -P311 -p1 -b .clang-warnings %patch -P312 -p1 -b .python-3.12-deprecated -%patch -P350 -p1 -b .linux_ui_darkmode %patch -P351 -p1 -b .tweak_about_gpu -%ifarch aarch64 -%if 0%{?fedora} < 39 -%patch -P352 -p1 -b .num_delta_pocs_of_ref_rps_idx -%endif -%endif +%patch -P352 -p1 -b .mnemonic-error %patch -P500 -p1 -b .Yandex-as-default-search-engine %patch -P501 -p1 -b .Added-Russian-description-and-summary-for-gnome-soft @@ -1692,6 +1679,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %{chromium_path}/chromedriver %changelog +* Fri Sep 15 2023 Arkady L. Shane - 117.0.5938.62-1.inferit +- Update to 117.0.5938.62 + * Tue Sep 12 2023 Arkady L. Shane - 116.0.5845.187-1.inferit - Update to 116.0.5845.187 - Change url to https://msvsphere-os.ru