From 47302ecee7b1cb2e7bf42b00468e439ad05dea86 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Sun, 6 Mar 2022 19:16:59 -0500 Subject: [PATCH] another == operator hack --- ...um-99.0.4844.51-el7-extra-operator==.patch | 26 +++++++++++++++++++ chromium.spec | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 chromium-99.0.4844.51-el7-extra-operator==.patch diff --git a/chromium-99.0.4844.51-el7-extra-operator==.patch b/chromium-99.0.4844.51-el7-extra-operator==.patch new file mode 100644 index 0000000..34c89d0 --- /dev/null +++ b/chromium-99.0.4844.51-el7-extra-operator==.patch @@ -0,0 +1,26 @@ +diff -up chromium-99.0.4844.51/base/allocator/partition_allocator/starscan/metadata_allocator.h.el7-extra-operator-equalequal chromium-99.0.4844.51/base/allocator/partition_allocator/starscan/metadata_allocator.h +--- chromium-99.0.4844.51/base/allocator/partition_allocator/starscan/metadata_allocator.h.el7-extra-operator-equalequal 2022-03-05 18:37:25.979241754 -0500 ++++ chromium-99.0.4844.51/base/allocator/partition_allocator/starscan/metadata_allocator.h 2022-03-05 18:37:25.979241754 -0500 +@@ -39,6 +39,11 @@ class MetadataAllocator { + } + + template ++ bool operator==(const MetadataAllocator&) const { ++ return true; ++ } ++ ++ template + bool operator!=(const MetadataAllocator& o) { + return !operator==(o); + } +diff -up chromium-99.0.4844.51/third_party/pdfium/core/fxcrt/fx_memory_wrappers.h.el7-extra-operator-equalequal chromium-99.0.4844.51/third_party/pdfium/core/fxcrt/fx_memory_wrappers.h +--- chromium-99.0.4844.51/third_party/pdfium/core/fxcrt/fx_memory_wrappers.h.el7-extra-operator-equalequal 2022-03-06 19:14:20.892513442 -0500 ++++ chromium-99.0.4844.51/third_party/pdfium/core/fxcrt/fx_memory_wrappers.h 2022-03-06 19:15:40.412060574 -0500 +@@ -70,6 +70,7 @@ struct FxPartitionAllocAllocator { + } + + // There's no state, so they are all the same, ++ bool operator==(const FxPartitionAllocAllocator&) const { return true; } + bool operator==(const FxPartitionAllocAllocator& that) { return true; } + bool operator!=(const FxPartitionAllocAllocator& that) { return false; } + }; diff --git a/chromium.spec b/chromium.spec index 5559291..ccd3f33 100644 --- a/chromium.spec +++ b/chromium.spec @@ -350,7 +350,7 @@ Patch109: chromium-98.0.4758.80-epel7-erase-fix.patch # AARCH64 neon symbols need to be prefixed too to prevent multiple definition issue at linktime Patch110: chromium-90.0.4430.93-epel8-aarch64-libpng16-symbol-prefixes.patch # Add additional operator== to make el7 happy. -Patch111: chromium-98.0.4758.80-el7-extra-operator==.patch +Patch111: chromium-99.0.4844.51-el7-extra-operator==.patch # VAAPI # Upstream turned VAAPI on in Linux in 86