From f32ee45ed4071cc7f341b9c00450705445f1f506 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 13 Sep 2023 12:37:16 +0200 Subject: [PATCH] update to 117.0.5938.62 --- .gitignore | 2 + ...o_not_restrict_new_V4L2_decoders.v4l2.pach | 30 -- ..._header_for_V4L2StatefulVideoDecoder.patch | 12 - chromium-115-linux_ui_darkmode.patch | 297 ------------------ ...6-v4l2-num_delta_pocs_of_ref_rps_idx.patch | 50 --- ...=> chromium-117-missing-header-files.patch | 70 ++--- chromium-117-mnemonic-error.patch | 12 + ... chromium-117-python-3.12-deprecated.patch | 22 -- ...hromium-117-widevine-other-locations.patch | 3 +- ...karound_clang_bug-structured_binding.patch | 12 - chromium.spec | 47 +-- sources | 6 +- 12 files changed, 57 insertions(+), 506 deletions(-) delete mode 100644 chromium-115-do_not_restrict_new_V4L2_decoders.v4l2.pach delete mode 100644 chromium-115-include_contains_h_header_for_V4L2StatefulVideoDecoder.patch delete mode 100644 chromium-115-linux_ui_darkmode.patch delete mode 100644 chromium-116-v4l2-num_delta_pocs_of_ref_rps_idx.patch rename chromium-116-missing-header-files.patch => chromium-117-missing-header-files.patch (89%) create mode 100644 chromium-117-mnemonic-error.patch rename chromium-115-python-3.12-deprecated.patch => chromium-117-python-3.12-deprecated.patch (89%) rename chromium-108-widevine-other-locations.patch => chromium-117-widevine-other-locations.patch (97%) rename chromium-115-workaround_clang_bug-structured_binding.patch => chromium-117-workaround_clang_bug-structured_binding.patch (87%) diff --git a/.gitignore b/.gitignore index c705ef5e..3a3bd016 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,5 @@ /testupload /node-v19.8.1-linux-arm64.tar.xz /node-v19.8.1-linux-x64.tar.xz +/node-v20.6.1-linux-arm64.tar.xz +/node-v20.6.1-linux-x64.tar.xz diff --git a/chromium-115-do_not_restrict_new_V4L2_decoders.v4l2.pach b/chromium-115-do_not_restrict_new_V4L2_decoders.v4l2.pach deleted file mode 100644 index 416e9731..00000000 --- a/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/chromium-115-include_contains_h_header_for_V4L2StatefulVideoDecoder.patch b/chromium-115-include_contains_h_header_for_V4L2StatefulVideoDecoder.patch deleted file mode 100644 index 93fbdb94..00000000 --- a/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/chromium-115-linux_ui_darkmode.patch b/chromium-115-linux_ui_darkmode.patch deleted file mode 100644 index 12af02de..00000000 --- a/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/chromium-116-v4l2-num_delta_pocs_of_ref_rps_idx.patch b/chromium-116-v4l2-num_delta_pocs_of_ref_rps_idx.patch deleted file mode 100644 index ec91c3ca..00000000 --- a/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/chromium-116-missing-header-files.patch b/chromium-117-missing-header-files.patch similarity index 89% rename from chromium-116-missing-header-files.patch rename to chromium-117-missing-header-files.patch index 14983d9f..ad8e1e65 100644 --- a/chromium-116-missing-header-files.patch +++ b/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/chromium-117-mnemonic-error.patch b/chromium-117-mnemonic-error.patch new file mode 100644 index 00000000..455b3e57 --- /dev/null +++ b/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/chromium-115-python-3.12-deprecated.patch b/chromium-117-python-3.12-deprecated.patch similarity index 89% rename from chromium-115-python-3.12-deprecated.patch rename to chromium-117-python-3.12-deprecated.patch index f6fe3a29..0d02fcbb 100644 --- a/chromium-115-python-3.12-deprecated.patch +++ b/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/chromium-108-widevine-other-locations.patch b/chromium-117-widevine-other-locations.patch similarity index 97% rename from chromium-108-widevine-other-locations.patch rename to chromium-117-widevine-other-locations.patch index 5a29089f..38f3a278 100644 --- a/chromium-108-widevine-other-locations.patch +++ b/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/chromium-115-workaround_clang_bug-structured_binding.patch b/chromium-117-workaround_clang_bug-structured_binding.patch similarity index 87% rename from chromium-115-workaround_clang_bug-structured_binding.patch rename to chromium-117-workaround_clang_bug-structured_binding.patch index a70cdd9a..ddde8680 100644 --- a/chromium-115-workaround_clang_bug-structured_binding.patch +++ b/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; diff --git a/chromium.spec b/chromium.spec index 5e9d9d88..5887783a 100644 --- a/chromium.spec +++ b/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} 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 @@ -334,7 +334,7 @@ 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 @@ -342,13 +342,13 @@ Patch300: chromium-116-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 # 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 @@ -358,29 +358,17 @@ Patch306: chromium-116-emplace_back_on_vector-c++20.patch # 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 - # 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 # Use chromium-latest.py to generate clean tarball from released build tarballs, found here: # http://build.chromium.org/buildbot/official/ @@ -973,26 +961,16 @@ 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 -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 # Change shebang in all relevant files in this directory and all subdirectories # See `man find` for how the `-exec command {} +` syntax works find -type f \( -iname "*.py" \) -exec sed -i '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python3}=' {} + - %if 0%{?rhel} == 8 pushd third_party/node/linux %ifarch x86_64 @@ -1668,6 +1646,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %{chromium_path}/chromedriver %changelog +* Wed Sep 13 2023 Than Ngo - 117.0.5938.62-1 +- update to 117.0.5938.62 + * Tue Sep 12 2023 Than Ngo - 116.0.5845.187-1 - update to 116.0.5845.187 diff --git a/sources b/sources index 743e6ef6..5ab915c9 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (node-v19.8.1-linux-arm64.tar.xz) = 86ff19085669e92ce7afe2fd7d4df0c5441df2d88c00f29d5463b805f3cf5625626db8aebf98349c9a495b772da1ce6d68263730018207ea98815058a1c81397 -SHA512 (node-v19.8.1-linux-x64.tar.xz) = 925c0037c6b7074d0b0245bced20d0a0d9b1300f53b808106f16b5018d763f5f5b00bc321b33fa1033d736b1e1076608da9b7fcae66aed53d27b100b1186e2c6 -SHA512 (chromium-116.0.5845.187-clean.tar.xz) = f84ca1ff67eb2a8bc5d7bddcfeac31b9a74a567a370b2d1a57ff62b0d29191f43399e0d62685ed90a8b83011c677c236dad223faed4a7c6e4137ff43f17e422a +SHA512 (chromium-117.0.5938.62-clean.tar.xz) = a71654732449f101518c34e92da1136fd68fa2c428d042cf00168c3aa6096eaf2f21904d398e752a7d482ed9eda5ea1e77eba0f73789373407d2ba3f9e4fbae5 +SHA512 (node-v20.6.1-linux-arm64.tar.xz) = adfcaf2c22614797fd69fb46d94c1cbf64dea0213cc817c45d3904b634dbf1f4e62e4ebd95bfa4ba0a9c559747d42115406edc471af294334160ba6e103e31d0 +SHA512 (node-v20.6.1-linux-x64.tar.xz) = 7e15c05041a9a50f0046266aadb2e092a5aefbec19be1c7c809471add520cb57c7df3c47d88b1888b29bf2979dca3c92adddfd965370fa2a9da4ea02186464fd