From 614947b238319a8479607b274e1e9fee4a13a55e Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Thu, 16 Jan 2025 01:11:12 +0300 Subject: [PATCH] import chromium-132.0.6834.83-1.el9 --- .chromium.metadata | 2 +- .gitignore | 2 +- SOURCES/chromium-127-rust-clanglib.patch | 12 ++ ...m-128.0.6613.137-python-3.13-warning.patch | 13 -- SOURCES/chromium-130-size-assertions.patch | 90 ----------- SOURCES/chromium-131-system-freetype.patch | 13 -- ...chromium-132-el8-clang18-build-error.patch | 12 ++ ...romium-132-el8-unsupport-clang-flags.patch | 17 ++ ...romium-132-el8-unsupport-rustc-flags.patch | 11 ++ SOURCES/chromium-latest.py | 13 +- SOURCES/clean_ffmpeg.sh | 5 +- SOURCES/skia-vsx-instructions.patch | 147 ++++++++---------- SPECS/chromium.spec | 66 ++++---- 13 files changed, 167 insertions(+), 236 deletions(-) delete mode 100644 SOURCES/chromium-128.0.6613.137-python-3.13-warning.patch delete mode 100644 SOURCES/chromium-130-size-assertions.patch delete mode 100644 SOURCES/chromium-131-system-freetype.patch create mode 100644 SOURCES/chromium-132-el8-clang18-build-error.patch create mode 100644 SOURCES/chromium-132-el8-unsupport-clang-flags.patch create mode 100644 SOURCES/chromium-132-el8-unsupport-rustc-flags.patch diff --git a/.chromium.metadata b/.chromium.metadata index 5b84f2cd..8d42d19e 100644 --- a/.chromium.metadata +++ b/.chromium.metadata @@ -1,3 +1,3 @@ -cd5059a368dcceabd55626814a565a74cec1d1f5 SOURCES/chromium-131.0.6778.264-clean.tar.xz +70242bc02c1ad7f7ee0320becdc6620c9d76792c SOURCES/chromium-132.0.6834.83-clean.tar.xz 7e5d2c7864c5c83ec789b59c77cd9c20d2594916 SOURCES/linux-arm64-0.19.2.tgz dea187019741602d57aaf189a80abba261fbd2aa SOURCES/linux-x64-0.19.2.tgz diff --git a/.gitignore b/.gitignore index 893abac1..3af12022 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -SOURCES/chromium-131.0.6778.264-clean.tar.xz +SOURCES/chromium-132.0.6834.83-clean.tar.xz SOURCES/linux-arm64-0.19.2.tgz SOURCES/linux-x64-0.19.2.tgz diff --git a/SOURCES/chromium-127-rust-clanglib.patch b/SOURCES/chromium-127-rust-clanglib.patch index ed4d6c02..feb41304 100644 --- a/SOURCES/chromium-127-rust-clanglib.patch +++ b/SOURCES/chromium-127-rust-clanglib.patch @@ -65,3 +65,15 @@ diff -up chromium-121.0.6167.57/build/config/clang/BUILD.gn.rust-clang_lib chrom _lib_file = "${_prefix}clang_rt.${_libname}${_suffix}.${_ext}" libs = [ "$_clang_lib_dir/$_dir/$_lib_file" ] } +diff -up chromium-132.0.6834.57/build/rust/rust_bindgen_generator.gni.me chromium-132.0.6834.57/build/rust/rust_bindgen_generator.gni +--- chromium-132.0.6834.57/build/rust/rust_bindgen_generator.gni.me 2024-12-31 15:08:27.013151672 +0100 ++++ chromium-132.0.6834.57/build/rust/rust_bindgen_generator.gni 2024-12-31 15:08:49.538663024 +0100 +@@ -22,7 +22,7 @@ _libclang_path = rust_bindgen_root + if (host_os == "win") { + _libclang_path += "/bin" + } else { +- _libclang_path += "/lib" ++ _libclang_path += "/lib64" + } + + # Template to build Rust/C bindings with bindgen. diff --git a/SOURCES/chromium-128.0.6613.137-python-3.13-warning.patch b/SOURCES/chromium-128.0.6613.137-python-3.13-warning.patch deleted file mode 100644 index 3923e298..00000000 --- a/SOURCES/chromium-128.0.6613.137-python-3.13-warning.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up chromium-128.0.6613.137/third_party/inspector_protocol/code_generator.py.me chromium-128.0.6613.137/third_party/inspector_protocol/code_generator.py ---- chromium-128.0.6613.137/third_party/inspector_protocol/code_generator.py.me 2024-09-16 12:47:47.541825252 +0200 -+++ chromium-128.0.6613.137/third_party/inspector_protocol/code_generator.py 2024-09-16 12:48:39.210990291 +0200 -@@ -147,8 +147,7 @@ def dash_to_camelcase(word): - - def to_snake_case(name): - name = re.sub(r"([A-Z]{2,})([A-Z][a-z])", r"\1_\2", name) -- return re.sub(r"([a-z0-9])([A-Z])", r"\1_\2", name, sys.maxsize).lower() -- -+ return re.sub(r"([a-z0-9])([A-Z])", r"\1_\2", name, count=sys.maxsize).lower() - - def to_method_case(config, name): - if config.use_title_case_methods: diff --git a/SOURCES/chromium-130-size-assertions.patch b/SOURCES/chromium-130-size-assertions.patch deleted file mode 100644 index cc75fb36..00000000 --- a/SOURCES/chromium-130-size-assertions.patch +++ /dev/null @@ -1,90 +0,0 @@ -commit f457e3c32b8170a39ead84ceaf9f0fdbe0696649 -Author: Michael Lippautz -Date: Tue Oct 15 19:27:32 2024 +0000 - - Fix size assertions across Blink - - The ASSERT_SIZE() macro is used to check that certain object sizes do - not grow unexpectedly. Fix a few occurrences that assumed that Member - is always the same size as debug builds may blow up the pointer size - to allow verifying some conditions. - - Bug: 373485798 - Change-Id: I243dd7d75810e2cfda0141817986a6c4a03c6392 - Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5934877 - Commit-Queue: Michael Lippautz - Reviewed-by: Steinar H Gunderson - Cr-Commit-Position: refs/heads/main@{#1368939} - -diff --git a/third_party/blink/renderer/core/css/css_selector.cc b/third_party/blink/renderer/core/css/css_selector.cc -index e9cd483e0ce13..3d99eab57489e 100644 ---- a/third_party/blink/renderer/core/css/css_selector.cc -+++ b/third_party/blink/renderer/core/css/css_selector.cc -@@ -88,7 +88,11 @@ unsigned MaximumSpecificity( - - struct SameSizeAsCSSSelector { - unsigned bitfields; -- void* pointers[1]; -+ union { -+ AtomicString value_; -+ QualifiedName tag_q_name_or_attribute_; -+ Member rare_data_; -+ } pointers; - }; - - ASSERT_SIZE(CSSSelector, SameSizeAsCSSSelector); -diff --git a/third_party/blink/renderer/core/css/resolver/match_result.h b/third_party/blink/renderer/core/css/resolver/match_result.h -index c99bae9777094..210ef8610b808 100644 ---- a/third_party/blink/renderer/core/css/resolver/match_result.h -+++ b/third_party/blink/renderer/core/css/resolver/match_result.h -@@ -34,6 +34,7 @@ - #include "third_party/blink/renderer/core/dom/tree_scope.h" - #include "third_party/blink/renderer/platform/heap/collection_support/heap_vector.h" - #include "third_party/blink/renderer/platform/heap/garbage_collected.h" -+#include "third_party/blink/renderer/platform/wtf/size_assertions.h" - #include "third_party/blink/renderer/platform/wtf/vector.h" - - namespace blink { -@@ -88,8 +89,13 @@ struct CORE_EXPORT MatchedProperties { - Member properties; - Data data_; - }; --static_assert(sizeof(MatchedProperties) <= 12, -- "MatchedProperties should not grow without thinking"); -+ -+struct SameSizeAsMatchedProperties { -+ Member properties; -+ uint8_t data_[8]; -+}; -+ -+ASSERT_SIZE(MatchedProperties, SameSizeAsMatchedProperties); - - } // namespace blink - -diff --git a/third_party/blink/renderer/core/dom/element_data.cc b/third_party/blink/renderer/core/dom/element_data.cc -index 0e616444cbf92..6f3592bfa907b 100644 ---- a/third_party/blink/renderer/core/dom/element_data.cc -+++ b/third_party/blink/renderer/core/dom/element_data.cc -@@ -46,7 +46,8 @@ struct SameSizeAsElementData final - : public GarbageCollected { - unsigned bitfield; - Member willbe_member; -- void* pointers[2]; -+ SpaceSplitString class_names_; -+ void* pointers[1]; - }; - - ASSERT_SIZE(ElementData, SameSizeAsElementData); -diff --git a/third_party/blink/renderer/platform/fonts/shaping/shape_result.cc b/third_party/blink/renderer/platform/fonts/shaping/shape_result.cc -index 98a9f6988ae3d..68b3c922cb362 100644 ---- a/third_party/blink/renderer/platform/fonts/shaping/shape_result.cc -+++ b/third_party/blink/renderer/platform/fonts/shaping/shape_result.cc -@@ -75,7 +75,7 @@ struct SameSizeAsRunInfo { - void* pointers[2]; - unsigned integer; - } glyph_data; -- void* pointer; -+ Member pointer; - Vector vector; - int integers[6]; - }; diff --git a/SOURCES/chromium-131-system-freetype.patch b/SOURCES/chromium-131-system-freetype.patch deleted file mode 100644 index 2959690b..00000000 --- a/SOURCES/chromium-131-system-freetype.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up chromium-131.0.6778.69/build/linux/unbundle/freetype.gn.me chromium-131.0.6778.69/build/linux/unbundle/freetype.gn ---- chromium-131.0.6778.69/build/linux/unbundle/freetype.gn.me 2024-11-13 08:48:26.212329841 +0100 -+++ chromium-131.0.6778.69/build/linux/unbundle/freetype.gn 2024-11-13 08:49:03.071985611 +0100 -@@ -11,4 +11,9 @@ declare_args() { - # System FreeType configurations other than as described WILL INTRODUCE TEXT - # RENDERING AND SECURITY REGRESSIONS. - use_system_freetype = true -+ -+ # Use FreeType for font rendering. If this is set to false, FreeType is -+ # replaced with the Rust-based Fontations set of libraries plus Skia -+ # path rendering. -+ enable_freetype = true - } diff --git a/SOURCES/chromium-132-el8-clang18-build-error.patch b/SOURCES/chromium-132-el8-clang18-build-error.patch new file mode 100644 index 00000000..05b26039 --- /dev/null +++ b/SOURCES/chromium-132-el8-clang18-build-error.patch @@ -0,0 +1,12 @@ +diff -up chromium-132.0.6834.57/pdf/pdfium/pdfium_api_wrappers.cc.me chromium-132.0.6834.57/pdf/pdfium/pdfium_api_wrappers.cc +--- chromium-132.0.6834.57/pdf/pdfium/pdfium_api_wrappers.cc.me 2025-01-10 11:17:44.598459092 +0100 ++++ chromium-132.0.6834.57/pdf/pdfium/pdfium_api_wrappers.cc 2025-01-10 11:18:55.910222909 +0100 +@@ -147,7 +147,7 @@ std::u16string GetPageObjectMarkName(FPD + + // Number of characters, including the NUL. + const size_t expected_size = base::checked_cast(buflen_bytes / 2); +- PDFiumAPIStringBufferAdapter adapter(&name, expected_size, ++ PDFiumAPIStringBufferAdapter adapter(&name, expected_size, + /*check_expected_size=*/true); + unsigned long actual_buflen_bytes = 0; // NOLINT(runtime/int) + bool result = diff --git a/SOURCES/chromium-132-el8-unsupport-clang-flags.patch b/SOURCES/chromium-132-el8-unsupport-clang-flags.patch new file mode 100644 index 00000000..97688833 --- /dev/null +++ b/SOURCES/chromium-132-el8-unsupport-clang-flags.patch @@ -0,0 +1,17 @@ +diff -up chromium-132.0.6834.57/build/config/compiler/BUILD.gn.me chromium-132.0.6834.57/build/config/compiler/BUILD.gn +--- chromium-132.0.6834.57/build/config/compiler/BUILD.gn.me 2025-01-01 13:31:40.472819710 +0100 ++++ chromium-132.0.6834.57/build/config/compiler/BUILD.gn 2025-01-01 16:01:28.373834980 +0100 +@@ -623,13 +623,6 @@ config("compiler") { + cflags += [ "-ffp-contract=off" ] + } + +- # Enable ELF CREL (see crbug.com/357878242) for all platforms that use ELF +- # (excluding toolchains that use an older version of LLVM). +- # TODO(crbug.com/376278218): This causes segfault on Linux ARM builds. +- if (is_linux && !llvm_android_mainline && current_cpu != "arm" && +- default_toolchain != "//build/toolchain/cros:target") { +- cflags += [ "-Wa,--crel,--allow-experimental-crel" ] +- } + } + + # C11/C++11 compiler flags setup. diff --git a/SOURCES/chromium-132-el8-unsupport-rustc-flags.patch b/SOURCES/chromium-132-el8-unsupport-rustc-flags.patch new file mode 100644 index 00000000..57d325e7 --- /dev/null +++ b/SOURCES/chromium-132-el8-unsupport-rustc-flags.patch @@ -0,0 +1,11 @@ +diff -up chromium-132.0.6834.57/build/config/gcc/BUILD.gn.me chromium-132.0.6834.57/build/config/gcc/BUILD.gn +--- chromium-132.0.6834.57/build/config/gcc/BUILD.gn.me 2025-01-01 18:59:29.670002052 +0100 ++++ chromium-132.0.6834.57/build/config/gcc/BUILD.gn 2025-01-01 20:51:11.798696436 +0100 +@@ -32,7 +32,6 @@ declare_args() { + # See http://gcc.gnu.org/wiki/Visibility + config("symbol_visibility_hidden") { + cflags = [ "-fvisibility=hidden" ] +- rustflags = [ "-Zdefault-visibility=hidden" ] + + # Visibility attribute is not supported on AIX. + if (current_os != "aix") { diff --git a/SOURCES/chromium-latest.py b/SOURCES/chromium-latest.py index e06be497..e3f5888f 100755 --- a/SOURCES/chromium-latest.py +++ b/SOURCES/chromium-latest.py @@ -73,10 +73,11 @@ def delete_chromium_files(files): full_path = "%s/%s" % (latest_dir, files) print('Deleting ' + full_path + ' ', end=' ') for filename in glob.glob(full_path): - print('Deleting ' + filename + ' ', end=' ') - os.remove(filename) - print('[DONE]') - + if os.path.isfile(filename): + os.remove(filename) + print('[DONE]') + else: + print('[NOT FOUND]') def check_omahaproxy(channel="stable"): @@ -320,10 +321,14 @@ if __name__ == '__main__': 'third_party/node/linux/node-linux-x64', 'third_party/rust-toolchain', 'third_party/rust-src'] + junk_files = ['third_party/node/linux/node-linux-x64.tar.gz'] # First, the dirs: for directory in junk_dirs: delete_chromium_dir(directory) + # Remove junk files + for file in junk_files: + delete_chromium_files(file) # There has got to be a better, more portable way to do this. os.system("find %s -depth -name reference_build -type d -exec rm -rf {} \\;" % latest_dir) diff --git a/SOURCES/clean_ffmpeg.sh b/SOURCES/clean_ffmpeg.sh index 2e21b733..4b3de8a4 100755 --- a/SOURCES/clean_ffmpeg.sh +++ b/SOURCES/clean_ffmpeg.sh @@ -225,11 +225,11 @@ header_files=" libavcodec/x86/inline_asm.h \ libavutil/tx_priv.h \ libavutil/version.h \ libavutil/sfc64.h \ + libavutil/executor.h \ libswresample/swresample.h \ libswresample/version.h \ libswresample/version_major.h \ - compat/va_copy.h \ - compat/atomics/gcc/stdatomic.h " + compat/va_copy.h " manual_files=" libavcodec/aarch64/h264pred_neon.S \ libavcodec/aarch64/hpeldsp_neon.S \ @@ -288,6 +288,7 @@ manual_files=" libavcodec/aarch64/h264pred_neon.S \ libavutil/x86/float_dsp_init.c \ libavutil/x86/tx_float_init.c \ libavutil/aarch64/tx_float_init.c \ + libavutil/executor.c \ libavutil/x86/x86inc.asm \ libavutil/x86/x86util.asm " diff --git a/SOURCES/skia-vsx-instructions.patch b/SOURCES/skia-vsx-instructions.patch index 53835cc6..d78d6cd4 100644 --- a/SOURCES/skia-vsx-instructions.patch +++ b/SOURCES/skia-vsx-instructions.patch @@ -1,8 +1,8 @@ -Index: chromium-130.0.6723.44/third_party/skia/BUILD.gn +Index: chromium-132.0.6834.83/third_party/skia/BUILD.gn =================================================================== ---- chromium-130.0.6723.44.orig/third_party/skia/BUILD.gn -+++ chromium-130.0.6723.44/third_party/skia/BUILD.gn -@@ -192,6 +192,12 @@ opts("lasx") { +--- chromium-132.0.6834.83.orig/third_party/skia/BUILD.gn ++++ chromium-132.0.6834.83/third_party/skia/BUILD.gn +@@ -193,6 +193,12 @@ opts("lasx") { cflags = [ "-mlasx" ] } @@ -15,7 +15,7 @@ Index: chromium-130.0.6723.44/third_party/skia/BUILD.gn # Any feature of Skia that requires third-party code should be optional and use this template. template("optional") { if (invoker.enabled) { -@@ -1466,6 +1472,7 @@ skia_component("skia") { +@@ -1601,6 +1607,7 @@ skia_component("skia") { ":skx", ":typeface_fontations", ":vello", @@ -23,7 +23,7 @@ Index: chromium-130.0.6723.44/third_party/skia/BUILD.gn ":webp_decode", ":wuffs", ":xml", -@@ -1637,7 +1644,10 @@ skia_static_library("pathkit") { +@@ -1772,7 +1779,10 @@ skia_static_library("pathkit") { public_configs = [ ":skia_public" ] configs = skia_library_configs @@ -35,10 +35,10 @@ Index: chromium-130.0.6723.44/third_party/skia/BUILD.gn sources = [] sources += skia_pathops_sources -Index: chromium-130.0.6723.44/third_party/skia/gn/skia/BUILD.gn +Index: chromium-132.0.6834.83/third_party/skia/gn/skia/BUILD.gn =================================================================== ---- chromium-130.0.6723.44.orig/third_party/skia/gn/skia/BUILD.gn -+++ chromium-130.0.6723.44/third_party/skia/gn/skia/BUILD.gn +--- chromium-132.0.6834.83.orig/third_party/skia/gn/skia/BUILD.gn ++++ chromium-132.0.6834.83/third_party/skia/gn/skia/BUILD.gn @@ -167,6 +167,8 @@ config("default") { "-mfpmath=sse", ] @@ -48,11 +48,11 @@ Index: chromium-130.0.6723.44/third_party/skia/gn/skia/BUILD.gn } else if (current_cpu == "loong64") { cflags += [ "-mlsx", -Index: chromium-130.0.6723.44/third_party/skia/include/core/SkTypes.h +Index: chromium-132.0.6834.83/third_party/skia/include/core/SkTypes.h =================================================================== ---- chromium-130.0.6723.44.orig/third_party/skia/include/core/SkTypes.h -+++ chromium-130.0.6723.44/third_party/skia/include/core/SkTypes.h -@@ -178,4 +178,43 @@ static constexpr uint32_t SK_InvalidGenI +--- chromium-132.0.6834.83.orig/third_party/skia/include/core/SkTypes.h ++++ chromium-132.0.6834.83/third_party/skia/include/core/SkTypes.h +@@ -183,4 +183,43 @@ static constexpr uint32_t SK_InvalidGenI */ static constexpr uint32_t SK_InvalidUniqueID = 0; @@ -96,10 +96,10 @@ Index: chromium-130.0.6723.44/third_party/skia/include/core/SkTypes.h +#endif + #endif -Index: chromium-130.0.6723.44/third_party/skia/src/base/SkSpinlock.cpp +Index: chromium-132.0.6834.83/third_party/skia/src/base/SkSpinlock.cpp =================================================================== ---- chromium-130.0.6723.44.orig/third_party/skia/src/base/SkSpinlock.cpp -+++ chromium-130.0.6723.44/third_party/skia/src/base/SkSpinlock.cpp +--- chromium-132.0.6834.83.orig/third_party/skia/src/base/SkSpinlock.cpp ++++ chromium-132.0.6834.83/third_party/skia/src/base/SkSpinlock.cpp @@ -33,7 +33,8 @@ #endif @@ -110,10 +110,10 @@ Index: chromium-130.0.6723.44/third_party/skia/src/base/SkSpinlock.cpp #include static void do_pause() { _mm_pause(); } #else -Index: chromium-130.0.6723.44/third_party/skia/src/opts/SkBitmapProcState_opts.h +Index: chromium-132.0.6834.83/third_party/skia/src/opts/SkBitmapProcState_opts.h =================================================================== ---- chromium-130.0.6723.44.orig/third_party/skia/src/opts/SkBitmapProcState_opts.h -+++ chromium-130.0.6723.44/third_party/skia/src/opts/SkBitmapProcState_opts.h +--- chromium-132.0.6834.83.orig/third_party/skia/src/opts/SkBitmapProcState_opts.h ++++ chromium-132.0.6834.83/third_party/skia/src/opts/SkBitmapProcState_opts.h @@ -21,7 +21,13 @@ // The rest are scattershot at the moment but I want to get them // all migrated to be normal code inside SkBitmapProcState.cpp. @@ -129,10 +129,10 @@ Index: chromium-130.0.6723.44/third_party/skia/src/opts/SkBitmapProcState_opts.h #include #elif defined(SK_ARM_HAS_NEON) #include -Index: chromium-130.0.6723.44/third_party/skia/src/opts/SkBlitRow_opts.h +Index: chromium-132.0.6834.83/third_party/skia/src/opts/SkBlitRow_opts.h =================================================================== ---- chromium-130.0.6723.44.orig/third_party/skia/src/opts/SkBlitRow_opts.h -+++ chromium-130.0.6723.44/third_party/skia/src/opts/SkBlitRow_opts.h +--- chromium-132.0.6834.83.orig/third_party/skia/src/opts/SkBlitRow_opts.h ++++ chromium-132.0.6834.83/third_party/skia/src/opts/SkBlitRow_opts.h @@ -69,7 +69,7 @@ #endif @@ -142,10 +142,10 @@ Index: chromium-130.0.6723.44/third_party/skia/src/opts/SkBlitRow_opts.h static inline __m128i SkPMSrcOver_SSE2(const __m128i& src, const __m128i& dst) { __m128i scale = _mm_sub_epi32(_mm_set1_epi32(256), -Index: chromium-130.0.6723.44/third_party/skia/src/opts/SkRasterPipeline_opts.h +Index: chromium-132.0.6834.83/third_party/skia/src/opts/SkRasterPipeline_opts.h =================================================================== ---- chromium-130.0.6723.44.orig/third_party/skia/src/opts/SkRasterPipeline_opts.h -+++ chromium-130.0.6723.44/third_party/skia/src/opts/SkRasterPipeline_opts.h +--- chromium-132.0.6834.83.orig/third_party/skia/src/opts/SkRasterPipeline_opts.h ++++ chromium-132.0.6834.83/third_party/skia/src/opts/SkRasterPipeline_opts.h @@ -1,5 +1,6 @@ /* * Copyright 2018 Google Inc. @@ -523,29 +523,28 @@ Index: chromium-130.0.6723.44/third_party/skia/src/opts/SkRasterPipeline_opts.h }; r = lerpY(topR, bottomR); -Index: chromium-130.0.6723.44/third_party/skia/src/base/SkVx.h +Index: chromium-132.0.6834.83/third_party/skia/src/base/SkVx.h =================================================================== ---- chromium-130.0.6723.44.orig/third_party/skia/src/base/SkVx.h -+++ chromium-130.0.6723.44/third_party/skia/src/base/SkVx.h -@@ -42,7 +42,13 @@ +--- chromium-132.0.6834.83.orig/third_party/skia/src/base/SkVx.h ++++ chromium-132.0.6834.83/third_party/skia/src/base/SkVx.h +@@ -41,7 +41,12 @@ + #endif #if SKVX_USE_SIMD - #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1 -- #include -+ #if __PPC64__ -+ #include -+ #include -+ #include -+ #else -+ #include -+ #endif - #elif defined(SK_ARM_HAS_NEON) - #include - #elif defined(__wasm_simd128__) -Index: chromium-130.0.6723.44/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp +- #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_AVX ++ #if __PPC64__ ++ #define NO_WARN_X86_INTRINSICS ++ #include ++ #include ++ #include ++ #elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_AVX + #include + #elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE41 + #include +Index: chromium-132.0.6834.83/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp =================================================================== ---- chromium-130.0.6723.44.orig/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp -+++ chromium-130.0.6723.44/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp +--- chromium-132.0.6834.83.orig/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp ++++ chromium-132.0.6834.83/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp @@ -9,7 +9,7 @@ #include "src/core/SkBlitMask.h" #include "src/core/SkOptsTargets.h" @@ -555,10 +554,10 @@ Index: chromium-130.0.6723.44/third_party/skia/src/core/SkBlitMask_opts_ssse3.cp // The order of these includes is important: // 1) Select the target CPU architecture by defining SK_OPTS_TARGET and including SkOpts_SetTarget -Index: chromium-130.0.6723.44/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp +Index: chromium-132.0.6834.83/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp =================================================================== ---- chromium-130.0.6723.44.orig/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp -+++ chromium-130.0.6723.44/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp +--- chromium-132.0.6834.83.orig/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp ++++ chromium-132.0.6834.83/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp @@ -10,7 +10,7 @@ #include "src/core/SkOptsTargets.h" #include "src/core/SkSwizzlePriv.h" @@ -568,10 +567,10 @@ Index: chromium-130.0.6723.44/third_party/skia/src/core/SkSwizzler_opts_ssse3.cp !defined(SK_ENABLE_OPTIMIZE_SIZE) && \ SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3 -Index: chromium-130.0.6723.44/third_party/skia/src/core/SkBlitMask_opts.cpp +Index: chromium-132.0.6834.83/third_party/skia/src/core/SkBlitMask_opts.cpp =================================================================== ---- chromium-130.0.6723.44.orig/third_party/skia/src/core/SkBlitMask_opts.cpp -+++ chromium-130.0.6723.44/third_party/skia/src/core/SkBlitMask_opts.cpp +--- chromium-132.0.6834.83.orig/third_party/skia/src/core/SkBlitMask_opts.cpp ++++ chromium-132.0.6834.83/third_party/skia/src/core/SkBlitMask_opts.cpp @@ -25,7 +25,7 @@ namespace SkOpts { static bool init() { #if defined(SK_ENABLE_OPTIMIZE_SIZE) @@ -581,10 +580,10 @@ Index: chromium-130.0.6723.44/third_party/skia/src/core/SkBlitMask_opts.cpp #if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3 if (SkCpu::Supports(SkCpu::SSSE3)) { Init_BlitMask_ssse3(); } #endif -Index: chromium-130.0.6723.44/third_party/skia/src/core/SkBitmapProcState_opts.cpp +Index: chromium-132.0.6834.83/third_party/skia/src/core/SkBitmapProcState_opts.cpp =================================================================== ---- chromium-130.0.6723.44.orig/third_party/skia/src/core/SkBitmapProcState_opts.cpp -+++ chromium-130.0.6723.44/third_party/skia/src/core/SkBitmapProcState_opts.cpp +--- chromium-132.0.6834.83.orig/third_party/skia/src/core/SkBitmapProcState_opts.cpp ++++ chromium-132.0.6834.83/third_party/skia/src/core/SkBitmapProcState_opts.cpp @@ -27,7 +27,7 @@ namespace SkOpts { static bool init() { #if defined(SK_ENABLE_OPTIMIZE_SIZE) @@ -594,10 +593,10 @@ Index: chromium-130.0.6723.44/third_party/skia/src/core/SkBitmapProcState_opts.c #if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3 if (SkCpu::Supports(SkCpu::SSSE3)) { Init_BitmapProcState_ssse3(); } #endif -Index: chromium-130.0.6723.44/third_party/skia/src/core/SkCpu.h +Index: chromium-132.0.6834.83/third_party/skia/src/core/SkCpu.h =================================================================== ---- chromium-130.0.6723.44.orig/third_party/skia/src/core/SkCpu.h -+++ chromium-130.0.6723.44/third_party/skia/src/core/SkCpu.h +--- chromium-132.0.6834.83.orig/third_party/skia/src/core/SkCpu.h ++++ chromium-132.0.6834.83/third_party/skia/src/core/SkCpu.h @@ -60,7 +60,7 @@ inline bool SkCpu::Supports(uint32_t mas // If we mask in compile-time known lower limits, the compiler can @@ -607,10 +606,10 @@ Index: chromium-130.0.6723.44/third_party/skia/src/core/SkCpu.h #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1 features |= SSE1; #endif -Index: chromium-130.0.6723.44/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp +Index: chromium-132.0.6834.83/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp =================================================================== ---- chromium-130.0.6723.44.orig/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp -+++ chromium-130.0.6723.44/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp +--- chromium-132.0.6834.83.orig/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp ++++ chromium-132.0.6834.83/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp @@ -8,7 +8,7 @@ #include "include/private/base/SkFeatures.h" #include "src/core/SkOptsTargets.h" @@ -620,10 +619,10 @@ Index: chromium-130.0.6723.44/third_party/skia/src/core/SkBitmapProcState_opts_s // The order of these includes is important: // 1) Select the target CPU architecture by defining SK_OPTS_TARGET and including SkOpts_SetTarget -Index: chromium-130.0.6723.44/third_party/skia/include/private/base/SkFeatures.h +Index: chromium-132.0.6834.83/third_party/skia/include/private/base/SkFeatures.h =================================================================== ---- chromium-130.0.6723.44.orig/third_party/skia/include/private/base/SkFeatures.h -+++ chromium-130.0.6723.44/third_party/skia/include/private/base/SkFeatures.h +--- chromium-132.0.6834.83.orig/third_party/skia/include/private/base/SkFeatures.h ++++ chromium-132.0.6834.83/third_party/skia/include/private/base/SkFeatures.h @@ -63,6 +63,8 @@ #if defined(__i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64) @@ -633,22 +632,10 @@ Index: chromium-130.0.6723.44/third_party/skia/include/private/base/SkFeatures.h #endif #if defined(__loongarch__) || defined (__loongarch64) -Index: chromium-130.0.6723.44/third_party/skia/modules/skcms/src/skcms_internals.h -=================================================================== ---- chromium-130.0.6723.44.orig/third_party/skia/modules/skcms/src/skcms_internals.h -+++ chromium-130.0.6723.44/third_party/skia/modules/skcms/src/skcms_internals.h -@@ -47,6 +47,7 @@ extern "C" { - && !defined(__EMSCRIPTEN__) \ - && !defined(__arm__) \ - && !defined(__riscv) \ -+ && !defined(__powerpc64__) \ - && !defined(__loongarch__) \ - && !defined(_WIN32) && !defined(__SYMBIAN32__) - #define SKCMS_HAS_MUSTTAIL 1 -Index: chromium-130.0.6723.44/third_party/skia/src/opts/SkSwizzler_opts.inc +Index: chromium-132.0.6834.83/third_party/skia/src/opts/SkSwizzler_opts.inc =================================================================== ---- chromium-130.0.6723.44.orig/third_party/skia/src/opts/SkSwizzler_opts.inc -+++ chromium-130.0.6723.44/third_party/skia/src/opts/SkSwizzler_opts.inc +--- chromium-132.0.6834.83.orig/third_party/skia/src/opts/SkSwizzler_opts.inc ++++ chromium-132.0.6834.83/third_party/skia/src/opts/SkSwizzler_opts.inc @@ -14,7 +14,10 @@ #include #include @@ -695,10 +682,10 @@ Index: chromium-130.0.6723.44/third_party/skia/src/opts/SkSwizzler_opts.inc #elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1 && (defined(__clang__) || !defined(_MSC_VER)) // -- SSE -- Harden against timing attacks -- MSVC is not supported. using F4 = __m128; -Index: chromium-130.0.6723.44/third_party/skia/src/core/SkBlitter_ARGB32.cpp +Index: chromium-132.0.6834.83/third_party/skia/src/core/SkBlitter_ARGB32.cpp =================================================================== ---- chromium-130.0.6723.44.orig/third_party/skia/src/core/SkBlitter_ARGB32.cpp -+++ chromium-130.0.6723.44/third_party/skia/src/core/SkBlitter_ARGB32.cpp +--- chromium-132.0.6834.83.orig/third_party/skia/src/core/SkBlitter_ARGB32.cpp ++++ chromium-132.0.6834.83/third_party/skia/src/core/SkBlitter_ARGB32.cpp @@ -126,6 +126,16 @@ static inline SkPMColor blend_lcd16_opaq #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2 #include diff --git a/SPECS/chromium.spec b/SPECS/chromium.spec index e30bbfb3..b789630a 100644 --- a/SPECS/chromium.spec +++ b/SPECS/chromium.spec @@ -158,19 +158,17 @@ # enable qt backend %global enable_qt 1 -%global use_qt6 0 -%global use_qt 0 - %if %{enable_qt} %if 0%{?rhel} > 9 || 0%{?fedora} > 39 %global use_qt6 1 %global use_qt 1 %else -%if 0%{?rhel} == 8 || 0%{?rhel} == 9 || 0%{?fedora} %global use_qt6 0 %global use_qt 1 %endif -%endif +%else +%global use_qt6 0 +%global use_qt 0 %endif # bundle re2, jsoncpp, woff2 - build errors with use_custom_libcxx=true @@ -228,17 +226,16 @@ %global bundlelibdrm 0 %global bundleffmpegfree 0 %global bundlefreetype 0 -%global bundlelibtiff 0 %global bundlelibxml 0 -%if 0%{?rhel} > 9 -%global bundlelibopenjpeg2 0 -%global bundleharfbuzz 0 -%global bundlebrotli 0 -%global bundlelibwebp 0 +# need libtiff-4.6.1 or newer, error: use of undeclared identifier 'TIFFOpenOptionsSetMaxCumulatedMemAlloc' +%if 0%{?fedora} > 41 +%global bundlelibtiff 0 %endif %if 0%{?fedora} -%global bundlelibopenjpeg2 0 %global bundlecrc32c 0 +%endif +%if 0%{?rhel} > 9 || 0%{?fedora} +%global bundlelibopenjpeg2 0 %global bundleharfbuzz 0 %global bundlebrotli 0 %global bundlelibwebp 0 @@ -279,7 +276,7 @@ %endif Name: chromium%{chromium_channel} -Version: 131.0.6778.264 +Version: 132.0.6834.83 Release: 1%{?dist} Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Url: http://www.chromium.org/Home @@ -309,12 +306,6 @@ Patch90: chromium-121-system-libxml.patch # patch for using system opus Patch91: chromium-108-system-opus.patch -# python-3,13, Deprecationwarning: 'count' is passed as positionaö argument -Patch100: chromium-128.0.6613.137-python-3.13-warning.patch - -# fix build error with system freetype -Patch101: chromium-131-system-freetype.patch - # system ffmpeg # need for old ffmpeg 5.x on epel9 Patch129: chromium-125-ffmpeg-5.x-reordered_opaque.patch @@ -347,6 +338,9 @@ Patch306: chromium-127-el8-ifunc-header.patch # workaround for build error due to old atk version on el8 Patch307: chromium-129-el8-atk-compiler-error.patch +Patch308: chromium-132-el8-unsupport-clang-flags.patch +Patch309: chromium-132-el8-unsupport-rustc-flags.patch +Patch310: chromium-132-el8-clang18-build-error.patch # enable fstack-protector-strong Patch312: chromium-123-fstack-protector-strong.patch @@ -367,10 +361,6 @@ Patch354: chromium-126-split-threshold-for-reg-with-hint.patch # fix build error: no member named 'hardware_destructive_interference_size' in namespace 'std' Patch355: chromium-130-hardware_destructive_interference_size.patch -# fix build error on ppc64le -# error: static assertion failed due to requirement 'sizeof(blink::MatchedProperties) <= 12': MatchedProperties should not grow without thinking -Patch356: chromium-130-size-assertions.patch - # set clang_lib path Patch358: chromium-127-rust-clanglib.patch @@ -412,7 +402,6 @@ Patch385: 0002-Include-cstddef-to-fix-build.patch Patch386: 0004-third_party-crashpad-port-curl-transport-ppc64.patch Patch387: HACK-third_party-libvpx-use-generic-gnu.patch -Patch388: HACK-debian-clang-disable-skia-musttail.patch Patch389: HACK-debian-clang-disable-base-musttail.patch Patch390: 0001-Add-ppc64-target-to-libaom.patch @@ -1027,12 +1016,6 @@ Qt6 UI for chromium. %patch -P91 -p1 -b .system-opus %endif -%if 0%{?fedora} -%patch -P100 -p1 -b .python-3.13-warning -%endif - -%patch -P101 -p1 -b .chromium-131-system-freetype - %if ! %{bundleffmpegfree} %if 0%{?rhel} == 9 %patch -P129 -p1 -R -b .ffmpeg-5.x-reordered_opaque @@ -1065,6 +1048,11 @@ Qt6 UI for chromium. %endif %patch -P307 -p1 -b .el8-atk-compiler-error %endif +%if 0%{?rhel} == 8 || 0%{?rhel} == 9 +%patch -P308 -p1 -b .el8-unsupport-clang-flags +%patch -P309 -p1 -b .el8-unsupport-rustc-flags +%patch -P310 -p1 -b .el8-clang18-build-error +%endif %patch -P312 -p1 -b .fstack-protector-strong @@ -1083,7 +1071,6 @@ Qt6 UI for chromium. %endif %patch -P355 -p1 -b .hardware_destructive_interference_size -%patch -P356 -p1 -b .size-assertions %patch -P358 -p1 -b .rust-clang_lib %ifarch ppc64le @@ -1116,7 +1103,6 @@ Qt6 UI for chromium. %patch -P385 -p1 -b .0002-Include-cstddef-to-fix-build %patch -P386 -p1 -b .0004-third_party-crashpad-port-curl-transport-ppc64 %patch -P387 -p1 -b .HACK-third_party-libvpx-use-generic-gnu -%patch -P388 -p1 -b .HACK-debian-clang-disable-skia-musttail %patch -P389 -p1 -b .HACK-debian-clang-disable-base-musttail %patch -P390 -p1 -b .0001-Add-ppc64-target-to-libaom %patch -P391 -p1 -b .0001-Add-pregenerated-config-for-libaom-on-ppc64 @@ -1933,6 +1919,22 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %endif %changelog +* Wed Jan 15 2025 Than Ngo - 132.0.6834.83-1 +- Update to 132.0.6834.83 + * High CVE-2025-0434: Out of bounds memory access in V8 + * High CVE-2025-0435: Inappropriate implementation in Navigation + * High CVE-2025-0436: Integer overflow in Skia + * High CVE-2025-0437: Out of bounds read in Metrics + * High CVE-2025-0438: Stack buffer overflow in Tracing + * Medium CVE-2025-0439: Race in Frames + * Medium CVE-2025-0440: Inappropriate implementation in Fullscreen + * Medium CVE-2025-0441: Inappropriate implementation in Fenced + * Medium CVE-2025-0442: Inappropriate implementation in Payments + * Medium CVE-2025-0443: Insufficient data validation in Extensions + * Low CVE-2025-0446: Inappropriate implementation in Extensions + * Low CVE-2025-0447: Inappropriate implementation in Navigation + * Low CVE-2025-0448: Inappropriate implementation in Compositing + * Wed Jan 08 2025 Than Ngo - 131.0.6778.264-1 - Update to 131.0.6778.264 * High CVE-2025-0291: Type Confusion in V8