From 532b83064406bdbe1b46576ae0c9d695a971ddcc Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Sat, 7 Sep 2024 01:28:09 +0300 Subject: [PATCH] update --- ...romium-119-system-minizip-header-fix.patch | 65 --------- .../chromium-124-el8-support-64kpage.patch | 127 ------------------ ...low-enabling-vulkan-on-ozone-wayland.patch | 11 -- SOURCES/chromium-127-crabbyavif.patch | 38 ------ ...chromium-127-ninja-1.21.1-deps-part0.patch | 44 ------ ...chromium-127-ninja-1.21.1-deps-part1.patch | 62 --------- ...chromium-127-ninja-1.21.1-deps-part2.patch | 37 ----- ...chromium-127-ninja-1.21.1-deps-part3.patch | 49 ------- .../chromium-81.0.4044.92-unbundle-zlib.patch | 12 -- SOURCES/fix-swiftshader-compile.patch | 26 ---- SPECS/chromium.spec | 48 ++----- 11 files changed, 13 insertions(+), 506 deletions(-) delete mode 100644 SOURCES/chromium-119-system-minizip-header-fix.patch delete mode 100644 SOURCES/chromium-124-el8-support-64kpage.patch delete mode 100644 SOURCES/chromium-127-allow-enabling-vulkan-on-ozone-wayland.patch delete mode 100644 SOURCES/chromium-127-crabbyavif.patch delete mode 100644 SOURCES/chromium-127-ninja-1.21.1-deps-part0.patch delete mode 100644 SOURCES/chromium-127-ninja-1.21.1-deps-part1.patch delete mode 100644 SOURCES/chromium-127-ninja-1.21.1-deps-part2.patch delete mode 100644 SOURCES/chromium-127-ninja-1.21.1-deps-part3.patch delete mode 100644 SOURCES/chromium-81.0.4044.92-unbundle-zlib.patch delete mode 100644 SOURCES/fix-swiftshader-compile.patch diff --git a/SOURCES/chromium-119-system-minizip-header-fix.patch b/SOURCES/chromium-119-system-minizip-header-fix.patch deleted file mode 100644 index 14ac00b4..00000000 --- a/SOURCES/chromium-119-system-minizip-header-fix.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -up chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc.system-minizip chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc ---- chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc.system-minizip 2023-11-06 12:42:34.928657960 +0100 -+++ chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc 2023-11-06 12:51:12.547834851 +0100 -@@ -28,9 +28,8 @@ limitations under the License. - #include "tensorflow_lite_support/cc/port/status_macros.h" - #include "tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h" - #include "tensorflow_lite_support/metadata/metadata_schema_generated.h" --#include "third_party/zlib/contrib/minizip/ioapi.h" --#include "third_party/zlib/contrib/minizip/unzip.h" -- -+#include -+#include - - namespace tflite { - namespace metadata { -diff -up chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc.system-minizip chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc ---- chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc.system-minizip 2023-11-01 19:11:24.000000000 +0100 -+++ chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc 2023-11-06 12:42:34.928657960 +0100 -@@ -26,8 +26,8 @@ limitations under the License. - #include "tensorflow_lite_support/cc/port/statusor.h" - #include "tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h" - #include "tensorflow_lite_support/metadata/metadata_schema_generated.h" --#include "third_party/zlib/contrib/minizip/ioapi.h" --#include "third_party/zlib/contrib/minizip/unzip.h" -+#include -+#include - - namespace tflite { - namespace metadata { -diff -up chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc.system-minizip chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc ---- chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc.system-minizip 2023-11-01 19:11:24.000000000 +0100 -+++ chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc 2023-11-06 12:42:34.929657982 +0100 -@@ -19,7 +19,7 @@ limitations under the License. - #include - - #include "absl/strings/string_view.h" // from @com_google_absl --#include "third_party/zlib/contrib/minizip/ioapi.h" -+#include - - namespace tflite { - namespace metadata { -diff -up chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc.system-minizip chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc ---- chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc.system-minizip 2023-11-01 19:11:24.000000000 +0100 -+++ chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc 2023-11-06 12:42:34.929657982 +0100 -@@ -19,7 +19,7 @@ limitations under the License. - #include - - #include "absl/strings/string_view.h" // from @com_google_absl --#include "third_party/zlib/contrib/minizip/ioapi.h" -+#include - - namespace tflite { - namespace metadata { -diff -up chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h.system-minizip chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h ---- chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h.system-minizip 2023-11-01 19:11:24.000000000 +0100 -+++ chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h 2023-11-06 12:42:34.929657982 +0100 -@@ -19,7 +19,7 @@ limitations under the License. - #include - - #include "absl/strings/string_view.h" // from @com_google_absl --#include "third_party/zlib/contrib/minizip/ioapi.h" -+#include - - namespace tflite { - namespace metadata { diff --git a/SOURCES/chromium-124-el8-support-64kpage.patch b/SOURCES/chromium-124-el8-support-64kpage.patch deleted file mode 100644 index ed4a4e69..00000000 --- a/SOURCES/chromium-124-el8-support-64kpage.patch +++ /dev/null @@ -1,127 +0,0 @@ -diff -up chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.h.orig chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.h ---- chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.h.orig 2024-04-12 21:56:54.000000000 +0200 -+++ chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.h 2024-04-14 20:53:16.043867871 +0200 -@@ -147,7 +147,13 @@ struct PartitionBucket { - // Returns a slot number starting from the beginning of the slot span. - PA_ALWAYS_INLINE size_t GetSlotNumber(size_t offset_in_slot_span) const { - // See the static assertion for `kReciprocalShift` above. -- PA_DCHECK(offset_in_slot_span <= kMaxBucketed); -+ // TODO(casey.smalley@arm.com): triggers on Aarch64/Linux -+ // systems with 64k system pages. Constants need to be -+ // adjusted to prevent different parts of the allocator -+ // from overlapping. For now this will allow 64k pages -+ // to function on Aarch64/Linux systems, albeit not -+ // very efficiently. -+ PA_DCHECK(internal::SystemPageSize() == (size_t{1} << 16) || offset_in_slot_span <= kMaxBucketed); - PA_DCHECK(slot_size <= kMaxBucketed); - - const size_t offset_in_slot = -diff -up chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h.orig chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h ---- chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h.orig 2024-04-14 20:53:16.043867871 +0200 -+++ chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h 2024-04-14 21:39:18.147052845 +0200 -@@ -17,10 +17,8 @@ namespace partition_alloc::internal { - // PartitionPageSize() is 4 times the OS page size. - static constexpr size_t kMaxSlotsPerSlotSpan = 4 * (1 << 14) / kSmallestBucket; - #elif defined(PARTITION_ALLOCATOR_CONSTANTS_POSIX_NONCONST_PAGE_SIZE) --// System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is --// currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code, --// so we use the 16 kiB maximum (64 kiB will crash). --static constexpr size_t kMaxSlotsPerSlotSpan = 4 * (1 << 14) / kSmallestBucket; -+// System page size can be 4, 16, or 64 kiB on Linux on AArch64. -+static constexpr size_t kMaxSlotsPerSlotSpan = 4 * (1 << 16) / kSmallestBucket; - #else - // A slot span can "span" multiple PartitionPages, but then its slot size is - // larger, so it doesn't have as many slots. -diff -up chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc ---- chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-04-14 20:53:16.044867889 +0200 -+++ chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc 2024-04-14 21:50:57.926716718 +0200 -@@ -952,12 +952,11 @@ void PartitionRoot::Init(PartitionOption - (internal::SystemPageSize() == (size_t{1} << 14))); - #elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) - // Check runtime pagesize. Though the code is currently the same, it is -- // not merged with the IS_APPLE case above as a 1 << 16 case needs to be -- // added here in the future, to allow 64 kiB pagesize. That is only -- // supported on Linux on arm64, not on IS_APPLE, but not yet present here -- // as the rest of the PartitionAlloc does not currently support it. -+ // not merged with the IS_APPLE case above as a 1 << 16 case is only -+ // supported on Linux on AArch64. - PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || -- (internal::SystemPageSize() == (size_t{1} << 14))); -+ (internal::SystemPageSize() == (size_t{1} << 14)) || -+ (internal::SystemPageSize() == (size_t{1} << 16))); - #endif - - ::partition_alloc::internal::ScopedGuard guard{lock_}; -diff -up chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_page.h.me chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_page.h ---- chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_page.h.me 2024-04-14 22:08:40.655011536 +0200 -+++ chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_page.h 2024-04-14 22:12:46.665731577 +0200 -@@ -86,27 +86,25 @@ struct SlotSpanMetadata { - - // CHECK()ed in AllocNewSlotSpan(). - // The maximum number of bits needed to cover all currently supported OSes. -- static constexpr size_t kMaxSlotsPerSlotSpanBits = 13; -+ static constexpr size_t kMaxSlotsPerSlotSpanBits = 15; - static_assert(kMaxSlotsPerSlotSpan < (1 << kMaxSlotsPerSlotSpanBits), ""); - -- // |marked_full| isn't equivalent to being full. Slot span is marked as full -- // iff it isn't on the active slot span list (or any other list). -- uint32_t marked_full : 1; - // |num_allocated_slots| is 0 for empty or decommitted slot spans, which can - // be further differentiated by checking existence of the freelist. -- uint32_t num_allocated_slots : kMaxSlotsPerSlotSpanBits; -- uint32_t num_unprovisioned_slots : kMaxSlotsPerSlotSpanBits; -+ uint16_t num_allocated_slots : kMaxSlotsPerSlotSpanBits; -+ uint16_t num_unprovisioned_slots : kMaxSlotsPerSlotSpanBits; -+ -+ // |marked_full| isn't equivalent to being full. Slot span is marked as full -+ // iff it isn't on the active slot span list (or any other list). -+ bool marked_full : 1; - - private: -- const uint32_t can_store_raw_size_ : 1; -- uint32_t freelist_is_sorted_ : 1; -- uint32_t unused1_ : (32 - 1 - 2 * kMaxSlotsPerSlotSpanBits - 1 - 1); -+ const uint8_t can_store_raw_size_ : 1; -+ uint8_t freelist_is_sorted_ : 1; - // If |in_empty_cache_|==1, |empty_cache_index| is undefined and mustn't be - // used. -- uint16_t in_empty_cache_ : 1; -- uint16_t empty_cache_index_ -- : kMaxEmptyCacheIndexBits; // < kMaxFreeableSpans. -- uint16_t unused2_ : (16 - 1 - kMaxEmptyCacheIndexBits); -+ bool in_empty_cache_ : 1; -+ uint8_t empty_cache_index_ : kMaxEmptyCacheIndexBits; // < kMaxFreeableSpans. - // Can use only 48 bits (6B) in this bitfield, as this structure is embedded - // in PartitionPage which has 2B worth of fields and must fit in 32B. - -@@ -246,18 +244,13 @@ static_assert(sizeof(SlotSpanMetadata) < - "SlotSpanMetadata must fit into a Page Metadata slot."); - - inline constexpr SlotSpanMetadata::SlotSpanMetadata() noexcept -- : marked_full(0), -- num_allocated_slots(0), -+ : num_allocated_slots(0), - num_unprovisioned_slots(0), -+ marked_full(0), - can_store_raw_size_(false), - freelist_is_sorted_(true), -- unused1_(0), - in_empty_cache_(0), -- empty_cache_index_(0), -- unused2_(0) { -- (void)unused1_; -- (void)unused2_; --} -+ empty_cache_index_(0) {} - - inline SlotSpanMetadata::SlotSpanMetadata(const SlotSpanMetadata&) = default; - -@@ -752,7 +745,7 @@ PA_ALWAYS_INLINE void SlotSpanMetadata:: - - size_t num_slots_per_span = bucket->get_slots_per_span(); - PA_DCHECK(num_slots_per_span <= kMaxSlotsPerSlotSpan); -- num_unprovisioned_slots = static_cast(num_slots_per_span); -+ num_unprovisioned_slots = static_cast(num_slots_per_span); - PA_DCHECK(num_unprovisioned_slots); - - ToSuperPageExtent()->IncrementNumberOfNonemptySlotSpans(); diff --git a/SOURCES/chromium-127-allow-enabling-vulkan-on-ozone-wayland.patch b/SOURCES/chromium-127-allow-enabling-vulkan-on-ozone-wayland.patch deleted file mode 100644 index 9c35a401..00000000 --- a/SOURCES/chromium-127-allow-enabling-vulkan-on-ozone-wayland.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up chromium-127.0.6533.88/ui/ozone/platform/wayland/gpu/wayland_surface_factory.cc.me chromium-127.0.6533.88/ui/ozone/platform/wayland/gpu/wayland_surface_factory.cc ---- chromium-127.0.6533.88/ui/ozone/platform/wayland/gpu/wayland_surface_factory.cc.me 2024-08-06 17:38:26.560468274 +0200 -+++ chromium-127.0.6533.88/ui/ozone/platform/wayland/gpu/wayland_surface_factory.cc 2024-08-06 17:39:00.137139610 +0200 -@@ -214,6 +214,7 @@ WaylandSurfaceFactory::GetAllowedGLImple - impls.emplace_back(gl::ANGLEImplementation::kOpenGL); - impls.emplace_back(gl::ANGLEImplementation::kOpenGLES); - impls.emplace_back(gl::ANGLEImplementation::kSwiftShader); -+ impls.emplace_back(gl::ANGLEImplementation::kVulkan); - impls.emplace_back(gl::kGLImplementationEGLGLES2); - } - return impls; diff --git a/SOURCES/chromium-127-crabbyavif.patch b/SOURCES/chromium-127-crabbyavif.patch deleted file mode 100644 index a72200e6..00000000 --- a/SOURCES/chromium-127-crabbyavif.patch +++ /dev/null @@ -1,38 +0,0 @@ -commit 89dcd2d419755421290f85e32617acabdd81cac1 -Author: lauren n. liberda -Date: Thu Jun 20 18:55:57 2024 +0000 - - unbundle: add missing dav1d targets - - fixes "ERROR Unresolved dependencies. - //third_party/crabbyavif:crabbyavif_dav1d_bindings(//build/toolchain/linux/unbundle:default) - needs //third_party/dav1d:dav1d_config(//build/toolchain/linux/unbundle:default) - //third_party/crabbyavif:crabbyavif_dav1d_bindings(//build/toolchain/linux/unbundle:default) - needs //third_party/dav1d:dav1d_headers(//build/toolchain/linux/unbundle:default)" - - Change-Id: I85442e5fb67a804985354570fba453cc619c83d7 - Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5642761 - Reviewed-by: Lei Zhang - Reviewed-by: Thomas Anderson - Commit-Queue: Thomas Anderson - Cr-Commit-Position: refs/heads/main@{#1317534} - -diff --git a/build/linux/unbundle/dav1d.gn b/build/linux/unbundle/dav1d.gn -index 3d65158bc6144..a6d005a6622e3 100644 ---- a/build/linux/unbundle/dav1d.gn -+++ b/build/linux/unbundle/dav1d.gn -@@ -21,3 +21,14 @@ source_set("dav1d") { - deps = [ ":dav1d_shim" ] - public_configs = [ ":system_dav1d" ] - } -+ -+group("dav1d_headers") { -+ public_deps = [ ":dav1d_shim" ] -+} -+ -+config("dav1d_config") { -+ configs = [ -+ ":system_dav1d", -+ ":dav1d_shim_config", -+ ] -+} diff --git a/SOURCES/chromium-127-ninja-1.21.1-deps-part0.patch b/SOURCES/chromium-127-ninja-1.21.1-deps-part0.patch deleted file mode 100644 index 52581fde..00000000 --- a/SOURCES/chromium-127-ninja-1.21.1-deps-part0.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit 4ca70656fde83d2db6ed5a8ac9ec9e7443846924 -Author: Lei Zhang -Date: Wed Jun 26 16:35:34 2024 +0000 - - Move chrome/browser/ui:webui_name_variants to public_deps - - The chrome/browser/ui build target contains webui_contents_wrapper.h, - which included the generated webui_name_variants.h header. For this to - work correctly, the build system must process the webui_name_variants - target first and generate webui_name_variants.h. To do this reliably, - without having to depend on webui_name_variants in all targets that - transitively include webui_contents_wrapper.h, make it a public_deps. - - Bug: 40253918, 346711540, 346699817, 345645751 - Change-Id: I6e0b573427cda1b2b408702f139b2c9e83f05045 - Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5646245 - Reviewed-by: Anthony Vallée-Dubois - Commit-Queue: Lei Zhang - Cr-Commit-Position: refs/heads/main@{#1319828} - -diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index 46648a4c2194e..0883714163a31 100644 ---- a/chrome/browser/ui/BUILD.gn -+++ b/chrome/browser/ui/BUILD.gn -@@ -6436,7 +6436,6 @@ static_library("ui") { - } - - deps += [ -- ":webui_name_variants", - "side_search:side_search_tab_data_proto", - "//base", - "//chrome/browser:main_extra_parts", -@@ -6495,7 +6494,10 @@ static_library("ui") { - "//ui/lottie", - "//ui/views:buildflags", - ] -- public_deps += [ "//ui/base/dragdrop/mojom:mojom_headers" ] -+ public_deps += [ -+ ":webui_name_variants", -+ "//ui/base/dragdrop/mojom:mojom_headers", -+ ] - - allow_circular_includes_from += [ "//chrome/browser/ui/views" ] - diff --git a/SOURCES/chromium-127-ninja-1.21.1-deps-part1.patch b/SOURCES/chromium-127-ninja-1.21.1-deps-part1.patch deleted file mode 100644 index 6d62b32d..00000000 --- a/SOURCES/chromium-127-ninja-1.21.1-deps-part1.patch +++ /dev/null @@ -1,62 +0,0 @@ -commit 50d63ffee3f7f1b1b9303363742ad8ebbfec31fa -Author: Lei Zhang -Date: Wed Jun 26 21:27:51 2024 +0000 - - Make more deps entries public_deps in chrome/browser/ui/BUILD.gn - - The chrome/browser/ui build target includes several buildflag headers. - For this to work correctly, the build system must be able to generate - the buildflag headers first. To do this reliably, without having to - depend on buildflag targets in all targets that transitively include the - headers that includes buildflag heaers, make these dependencies - public_deps. - - For //components/paint_preview/buildflags, remove the deps entry, as it - is already in public_deps. - - Bug: 40253918, 346711540, 346699817, 345645751 - Change-Id: I00e78a430f2e99aa3732406882b352d31e3d7da7 - Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5647662 - Commit-Queue: Lei Zhang - Reviewed-by: Peter Kasting - Cr-Commit-Position: refs/heads/main@{#1320033} - -diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index bc6a7c03ecd1c..74f92f0431494 100644 ---- a/chrome/browser/ui/BUILD.gn -+++ b/chrome/browser/ui/BUILD.gn -@@ -415,8 +415,10 @@ static_library("ui") { - "//chrome/browser/ui/tabs:tab_enums", - "//components/cross_device/logging", - "//components/dom_distiller/core", -+ "//components/enterprise/buildflags", - "//components/paint_preview/buildflags", - "//components/safe_browsing:buildflags", -+ "//components/segmentation_platform/public", - "//components/sync", - "//components/sync_user_events", - "//components/translate/content/browser", -@@ -533,7 +535,6 @@ static_library("ui") { - "//components/embedder_support:browser_util", - "//components/encrypted_messages:encrypted_message_proto", - "//components/enterprise", -- "//components/enterprise/buildflags:buildflags", - "//components/error_page/content/browser", - "//components/facilitated_payments/core/features", - "//components/favicon/content", -@@ -644,7 +645,6 @@ static_library("ui") { - "//components/security_interstitials/core:unsafe_resource", - "//components/security_state/content", - "//components/security_state/core", -- "//components/segmentation_platform/public", - "//components/send_tab_to_self", - "//components/sessions", - "//components/sharing_message", -@@ -2119,7 +2119,6 @@ static_library("ui") { - "//components/omnibox/browser:mojo_bindings", - "//components/page_load_metrics/browser", - "//components/paint_preview/browser", -- "//components/paint_preview/buildflags", - "//components/paint_preview/common", - "//components/paint_preview/public", - "//components/password_manager/content/common", diff --git a/SOURCES/chromium-127-ninja-1.21.1-deps-part2.patch b/SOURCES/chromium-127-ninja-1.21.1-deps-part2.patch deleted file mode 100644 index 8cfce7a1..00000000 --- a/SOURCES/chromium-127-ninja-1.21.1-deps-part2.patch +++ /dev/null @@ -1,37 +0,0 @@ -commit 2c101186b60ed50f2ba4feaa2e963bd841bcca47 -Author: Takuto Ikuta -Date: Fri Jun 21 06:23:27 2024 +0000 - - chrome/browser: add missing dependency - - This is to fix build error due to missing dependency when we update - ninja to 1.12. - e.g. https://ci.chromium.org/ui/p/chromium/builders/build/linux-build-perf-no-rbe/1690/overview - - Bug: 346711540, 346699817, 345645751, 40253918 - Change-Id: Ife0a4e09969a4ad2e61dfc1598c9a63ac0b2abd5 - Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5641516 - Reviewed-by: Anthony Vallée-Dubois - Commit-Queue: Takuto Ikuta - Auto-Submit: Takuto Ikuta - Reviewed-by: Lei Zhang - Cr-Commit-Position: refs/heads/main@{#1317790} - -diff --git a/chrome/browser/ui/views/side_panel/BUILD.gn b/chrome/browser/ui/views/side_panel/BUILD.gn -index 96f2c30a6dd22..2957730277a29 100644 ---- a/chrome/browser/ui/views/side_panel/BUILD.gn -+++ b/chrome/browser/ui/views/side_panel/BUILD.gn -@@ -201,5 +201,13 @@ source_set("side_panel") { - "//ui/gfx:color_utils", - "//ui/gfx/geometry:geometry_skia", - "//ui/webui", -+ -+ # TODO(crbug.com/346711540,crbug.com/346699817,crbug.com/345645751): -+ # Use //chrome/browser/ui instead after fixing cyclic dependency. -+ "//chrome/browser/ui:webui_name_variants", -+ "//components/enterprise/buildflags", -+ "//components/paint_preview/buildflags", -+ "//components/segmentation_platform/public/proto", -+ "//components/webapps/common:mojo_bindings", - ] - } diff --git a/SOURCES/chromium-127-ninja-1.21.1-deps-part3.patch b/SOURCES/chromium-127-ninja-1.21.1-deps-part3.patch deleted file mode 100644 index bfb46d97..00000000 --- a/SOURCES/chromium-127-ninja-1.21.1-deps-part3.patch +++ /dev/null @@ -1,49 +0,0 @@ -commit f2b43c18b8ecfc3ddc49c42c062d796c8b563984 -Author: Takuto Ikuta -Date: Wed Jul 3 09:00:47 2024 +0000 - - chrome/browser/ui: add missing dependency - - This is to fix build error due to missing dependency when we update - ninja to 1.12. - e.g. https://ci.chromium.org/ui/p/chromium/builders/build.shadow/win-build-perf-developer/1/overview - - Bug: 40253918, 345645751, 346694160, 346709958, 346707816 - Change-Id: I3ede8e345aef5d6d2d8bf5b155601650828bc817 - Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5644627 - Reviewed-by: Hidehiko Abe - Auto-Submit: Takuto Ikuta - Commit-Queue: Takuto Ikuta - Reviewed-by: Lei Zhang - Cr-Commit-Position: refs/heads/main@{#1322655} - -diff --git a/chrome/browser/ui/views/side_panel/BUILD.gn b/chrome/browser/ui/views/side_panel/BUILD.gn -index 2957730277a29..2680a77d855d5 100644 ---- a/chrome/browser/ui/views/side_panel/BUILD.gn -+++ b/chrome/browser/ui/views/side_panel/BUILD.gn -@@ -202,12 +202,24 @@ source_set("side_panel") { - "//ui/gfx/geometry:geometry_skia", - "//ui/webui", - -- # TODO(crbug.com/346711540,crbug.com/346699817,crbug.com/345645751): -+ # TODO(crbug.com/345645751): Use //chrome/browser instead after fixing cyclic dependency. -+ "//components/enterprise/common/proto:connectors_proto", -+ -+ # TODO(crbug.com/346711540,crbug.com/346699817,crbug.com/345645751, -+ # crbug.com/346694160,crbug.com/346709958,crbug.com/346707816): - # Use //chrome/browser/ui instead after fixing cyclic dependency. -+ "//chrome/browser/cart:mojo_bindings", -+ "//chrome/browser/companion/visual_query", - "//chrome/browser/ui:webui_name_variants", -+ "//chrome/browser/ui/webui/side_panel/bookmarks:mojo_bindings", -+ "//chrome/browser/ui/webui/side_panel/customize_chrome:mojo_bindings", -+ "//chrome/browser/ui/webui/side_panel/reading_list:mojo_bindings", - "//components/enterprise/buildflags", -+ "//components/page_image_service/mojom:mojo_bindings", - "//components/paint_preview/buildflags", - "//components/segmentation_platform/public/proto", -+ "//components/user_education/webui", - "//components/webapps/common:mojo_bindings", -+ "//ui/webui/resources/cr_components/commerce:mojo_bindings", - ] - } diff --git a/SOURCES/chromium-81.0.4044.92-unbundle-zlib.patch b/SOURCES/chromium-81.0.4044.92-unbundle-zlib.patch deleted file mode 100644 index ff4e3b1e..00000000 --- a/SOURCES/chromium-81.0.4044.92-unbundle-zlib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up chromium-81.0.4044.92/third_party/perfetto/gn/BUILD.gn.unbundle-zlib chromium-81.0.4044.92/third_party/perfetto/gn/BUILD.gn ---- chromium-81.0.4044.92/third_party/perfetto/gn/BUILD.gn.unbundle-zlib 2020-04-13 12:25:09.001172601 -0400 -+++ chromium-81.0.4044.92/third_party/perfetto/gn/BUILD.gn 2020-04-13 12:25:23.688921586 -0400 -@@ -294,7 +294,7 @@ if (enable_perfetto_zlib) { - public_configs = [ "//buildtools:zlib_config" ] - public_deps = [ "//buildtools:zlib" ] - } else { -- public_configs = [ "//third_party/zlib:zlib_config" ] -+ public_configs = [ "//third_party/zlib:system_zlib" ] - public_deps = [ "//third_party/zlib" ] - } - } diff --git a/SOURCES/fix-swiftshader-compile.patch b/SOURCES/fix-swiftshader-compile.patch deleted file mode 100644 index 5411a0d4..00000000 --- a/SOURCES/fix-swiftshader-compile.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- chromium-101.0.4951.54/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn.orig 2022-05-15 10:30:50.887333316 +0200 -+++ chromium-101.0.4951.54/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn 2022-05-15 10:31:43.477318032 +0200 -@@ -133,7 +133,6 @@ swiftshader_llvm_source_set("swiftshader_llvm") { - if (is_ubsan_vptr) { - sources = [ - "llvm/lib/MC/MCWasmObjectTargetWriter.cpp", -- "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp", - "llvm/lib/Target/ARM/MCTargetDesc/ARMTargetStreamer.cpp", - "llvm/lib/Target/TargetIntrinsicInfo.cpp", - ] -@@ -583,6 +582,7 @@ swiftshader_llvm_source_set("swiftshader_llvm_most") { - "llvm/lib/MC/MCAsmInfoCOFF.cpp", - "llvm/lib/MC/MCAsmInfoDarwin.cpp", - "llvm/lib/MC/MCAsmInfoELF.cpp", -+ "llvm/lib/MC/MCAsmInfoXCOFF.cpp", - "llvm/lib/MC/MCAsmMacro.cpp", - "llvm/lib/MC/MCAsmStreamer.cpp", - "llvm/lib/MC/MCAssembler.cpp", -@@ -637,6 +637,7 @@ swiftshader_llvm_source_set("swiftshader_llvm_most") { - "llvm/lib/MC/MCWin64EH.cpp", - "llvm/lib/MC/MCWinCOFFStreamer.cpp", - "llvm/lib/MC/MCWinEH.cpp", -+ "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp", - "llvm/lib/MC/MCXCOFFStreamer.cpp", - "llvm/lib/MC/MachObjectWriter.cpp", - "llvm/lib/MC/StringTableBuilder.cpp", diff --git a/SPECS/chromium.spec b/SPECS/chromium.spec index abf8ee52..8e84039a 100644 --- a/SPECS/chromium.spec +++ b/SPECS/chromium.spec @@ -230,12 +230,10 @@ %global bundlehighway 1 %endif -# enable bundleminizip for Fedora > 39 due to switch to minizip-ng -# which breaks the build -%global bundleminizip 0 -%if 0%{?fedora} > 39 +# workaround for build error +# disable bundleminizip for Fedora > 39 due to switch to minizip-ng +# disable bundleminizip for epel and Fedora39 due to old minizip version %global bundleminizip 1 -%endif %if 0%{?fedora} || 0%{?rhel} >= 9 %global bundlezstd 0 @@ -246,15 +244,17 @@ %global bundlelibdrm 0 %global bundleffmpegfree 0 %global bundlefreetype 0 -%global bundlelibopenjpeg2 0 %global bundlelibtiff 0 %global bundlelibxml 0 %if 0%{?rhel} == 9 +# old version, need to update openjpeg to 2.5.x +%global bundlelibopenjpeg2 1 %global bundlecrc32c 1 %global bundleharfbuzz 1 %global bundlebrotli 1 %global bundlelibwebp 1 %else +%global bundlelibopenjpeg2 0 %global bundlecrc32c 0 %global bundleharfbuzz 0 %global bundlebrotli 0 @@ -314,12 +314,6 @@ Patch20: chromium-disable-font-tests.patch # don't download binary blob Patch21: chromium-123-screen-ai-service.patch -# https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-unbundle-zlib.patch -Patch52: chromium-81.0.4044.92-unbundle-zlib.patch - -# Fix headers to look for system paths when we are using system minizip -Patch61: chromium-119-system-minizip-header-fix.patch - # Fix issue where closure_compiler thinks java is only allowed in android builds # https://bugs.chromium.org/p/chromium/issues/detail?id=1192875 Patch65: chromium-91.0.4472.77-java-only-allowed-in-android-builds.patch @@ -362,8 +356,6 @@ Patch150: chromium-124-qt6.patch # it is not supported in old glibc < 2.30, error: fatal error: 'sys/ifunc.h' file not found Patch305: chromium-124-el8-arm64-memory_tagging.patch Patch306: chromium-127-el8-ifunc-header.patch -# 64kpage support on aarch64 (el8) -Patch308: chromium-124-el8-support-64kpage.patch # enable fstack-protector-strong Patch312: chromium-123-fstack-protector-strong.patch @@ -415,7 +407,10 @@ Patch379: 0001-third_party-lss-Don-t-look-for-mmap2-on-ppc64.patch Patch380: 0001-third_party-pffft-Include-altivec.h-on-ppc64-with-SI.patch Patch381: 0002-Add-PPC64-generated-files-for-boringssl.patch Patch382: 0002-third_party-lss-kernel-structs.patch + +# error: undefined symbol: llvm::MCAsmInfoXCOFF::MCAsmInfoXCOFF() Patch383: 0001-swiftshader-fix-build.patch + Patch384: Rtc_base-system-arch.h-PPC.patch Patch385: 0002-Include-cstddef-to-fix-build.patch @@ -459,9 +454,6 @@ Patch412: add-ppc64-architecture-to-extensions.diff # Suppress harmless compiler warning messages that appear on ppc64 due to arch-specific warning flags being passed Patch413: fix-unknown-warning-option-messages.diff -# error: undefined symbol: llvm::MCAsmInfoXCOFF::MCAsmInfoXCOFF() -Patch414: fix-swiftshader-compile.patch - # upstream patches # Use chromium-latest.py to generate clean tarball from released build tarballs, found here: @@ -1048,11 +1040,6 @@ Qt6 UI for chromium. %patch -P20 -p1 -b .disable-font-test %patch -P21 -p1 -b .screen-ai-service -%if ! %{bundleminizip} -%patch -P52 -p1 -b .unbundle-zlib -%patch -P61 -p1 -b .system-minizip -%endif - %patch -P65 -p1 -b .java-only-allowed %patch -P69 -p1 -b .update-rjsmin-to-1.2.0 %patch -P82 -p1 -b .remoting-no-tests @@ -1094,7 +1081,6 @@ Qt6 UI for chromium. %ifarch aarch64 %patch -P305 -p1 -b .el8-memory_tagging %patch -P306 -p1 -b .el8-ifunc-header -%patch -P308 -p1 -b .el8-support-64kpage.patch %endif %endif @@ -1137,7 +1123,6 @@ Qt6 UI for chromium. %patch -P373 -p1 -b .0007-sandbox-linux-add-ppc64-stat %patch -P374 -p1 -b .Sandbox-linux-services-credentials.cc-PPC %patch -P375 -p1 -b .0008-sandbox-fix-ppc64le-glibc234 - %patch -P376 -p1 -b .0001-third_party-angle-Include-missing-header-cstddef-in- %patch -P377 -p1 -b .0001-Add-PPC64-support-for-boringssl %patch -P378 -p1 -b .0001-third_party-libvpx-Properly-generate-gni-on-ppc64 @@ -1147,23 +1132,17 @@ Qt6 UI for chromium. %patch -P382 -p1 -b .0002-third_party-lss-kernel-structs %patch -P383 -p1 -b .0001-swiftshader-fix-build %patch -P384 -p1 -b .Rtc_base-system-arch.h-PPC - %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 - %patch -P392 -p1 -b .0002-third_party-libvpx-Remove-bad-ppc64-config %patch -P393 -p1 -b .0003-third_party-libvpx-Add-ppc64-generated-config %patch -P394 -p1 -b .0004-third_party-libvpx-work-around-ambiguous-vsx - %patch -P395 -p1 -b .skia-vsx-instructions - %patch -P396 -p1 -b .0001-Implement-support-for-ppc64-on-Linux %patch -P397 -p1 -b .0001-Implement-support-for-PPC64-on-Linux %patch -P398 -p1 -b .0001-Force-baseline-POWER8-AltiVec-VSX-CPU-features-when- @@ -1176,17 +1155,12 @@ Qt6 UI for chromium. %patch -P405 -p1 -b .memory-allocator-dcheck-assert-fix %patch -P406 -p1 -b .fix-different-data-layouts %patch -P407 -p1 -b .0002-Add-ppc64-trap-instructions - %patch -P408 -p1 -b .fix-ppc64-linux-syscalls-headers %patch -P409 -p1 -b .use-sysconf-page-size-on-ppc64 - %patch -P410 -p1 -b .dawn-fix-typos %patch -P411 -p1 -b .dawn-fix-ppc64le-detection - %patch -P412 -p1 -b .add-ppc64-architecture-to-extensions - %patch -P413 -p1 -b .fix-unknown-warning-option-messages -%patch -P414 -p1 -b .fix-swiftshader-compile %endif # Change shebang in all relevant files in this directory and all subdirectories @@ -1287,6 +1261,10 @@ CFLAGS="$FLAGS" CXXFLAGS="$FLAGS" %endif +%ifarch ppc64le +CXXFLAGS+=' -faltivec-src-compat=mixed -Wno-deprecated-altivec-src-compat' +%endif + # reduce the size of relocations %if 0%{?fedora} || 0%{?rhel} > 9 LDFLAGS="$LDFLAGS -Wl,-z,pack-relative-relocs"