From bf83007e0323548fd15eab9ad4344ee63990e1c4 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Wed, 16 Feb 2022 13:55:19 -0500 Subject: [PATCH 1/4] Add include for std::exchange --- ....0.4758.80-missing-utility-for-std-exchange.patch | 12 ++++++++++++ chromium.spec | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 chromium-98.0.4758.80-missing-utility-for-std-exchange.patch diff --git a/chromium-98.0.4758.80-missing-utility-for-std-exchange.patch b/chromium-98.0.4758.80-missing-utility-for-std-exchange.patch new file mode 100644 index 0000000..1b5a71f --- /dev/null +++ b/chromium-98.0.4758.80-missing-utility-for-std-exchange.patch @@ -0,0 +1,12 @@ +diff -up chromium-98.0.4758.80/base/third_party/symbolize/symbolize.h.f36 chromium-98.0.4758.80/base/third_party/symbolize/symbolize.h +--- chromium-98.0.4758.80/base/third_party/symbolize/symbolize.h.f36 2022-02-08 19:28:20.198873875 +0000 ++++ chromium-98.0.4758.80/base/third_party/symbolize/symbolize.h 2022-02-08 19:28:57.533127622 +0000 +@@ -58,6 +58,8 @@ + #include "config.h" + #include "glog/logging.h" + ++#include ++ + #ifdef HAVE_SYMBOLIZE + + #include diff --git a/chromium.spec b/chromium.spec index be223d8..99a3487 100644 --- a/chromium.spec +++ b/chromium.spec @@ -318,7 +318,8 @@ Patch97: chromium-98.0.4758.80-remoting-extra-qualification.patch Patch98: chromium-94.0.4606.71-InkDropHost-crash.patch # Enable WebRTCPPipeWireCapturer by default Patch99: chromium-96.0.4664.110-enable-WebRTCPipeWireCapturer-byDefault.patch - +# Add include for std::exchange +Patch100: chromium-98.0.4758.80-missing-utility-for-std-exchange.patch # Use lstdc++ on EPEL7 only @@ -998,6 +999,7 @@ udev. %patch97 -p1 -b .remoting-extra-qualification %patch98 -p1 -b .InkDropHost-crash %patch99 -p1 -b .enable-WebRTCPipeWireCapturer-byDefault +%patch100 -p1 -b .missing-utility-for-std-exchange # Fedora branded user agent %if 0%{?fedora} From 8dff5fe57ed46b4e2f3613a3b0e2324fc833bf3c Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Tue, 1 Mar 2022 17:59:29 -0500 Subject: [PATCH 2/4] 98.0.4758.102 --- ...ium-98.0.4758.102-gcc-12-subzero-fix.patch | 69 +++++++++++++++++++ ...mium-98.0.4758.102-remoting-no-tests.patch | 20 ++++++ ....80-missing-utility-for-std-exchange.patch | 17 ++++- chromium.spec | 14 +++- sources | 2 +- 5 files changed, 117 insertions(+), 5 deletions(-) create mode 100644 chromium-98.0.4758.102-gcc-12-subzero-fix.patch create mode 100644 chromium-98.0.4758.102-remoting-no-tests.patch diff --git a/chromium-98.0.4758.102-gcc-12-subzero-fix.patch b/chromium-98.0.4758.102-gcc-12-subzero-fix.patch new file mode 100644 index 0000000..fd5bbdb --- /dev/null +++ b/chromium-98.0.4758.102-gcc-12-subzero-fix.patch @@ -0,0 +1,69 @@ +diff -up chromium-98.0.4758.102/third_party/swiftshader/third_party/subzero/src/IceInstX8664.cpp.gcc12fix chromium-98.0.4758.102/third_party/swiftshader/third_party/subzero/src/IceInstX8664.cpp +--- chromium-98.0.4758.102/third_party/swiftshader/third_party/subzero/src/IceInstX8664.cpp.gcc12fix 2022-02-25 22:17:18.071775686 +0000 ++++ chromium-98.0.4758.102/third_party/swiftshader/third_party/subzero/src/IceInstX8664.cpp 2022-02-25 22:17:40.964996468 +0000 +@@ -659,6 +659,7 @@ void emitIASOpTyGPR(const Cfg *Func, Typ + } + } + ++#if 0 + template + void emitIASRegOpTyGPR(const Cfg *Func, Type Ty, const Variable *Var, + const Operand *Src, const GPREmitterRegOp &Emitter) { +@@ -697,6 +698,7 @@ void emitIASRegOpTyGPR(const Cfg *Func, + llvm_unreachable("Unexpected operand type"); + } + } ++#endif + + void emitIASAddrOpTyGPR(const Cfg *Func, Type Ty, const AsmAddress &Addr, + const Operand *Src, const GPREmitterAddrOp &Emitter) { +diff -up chromium-98.0.4758.102/third_party/swiftshader/third_party/subzero/src/IceInstX8664.h.gcc12fix chromium-98.0.4758.102/third_party/swiftshader/third_party/subzero/src/IceInstX8664.h +--- chromium-98.0.4758.102/third_party/swiftshader/third_party/subzero/src/IceInstX8664.h.gcc12fix 2022-02-25 22:17:51.409640955 +0000 ++++ chromium-98.0.4758.102/third_party/swiftshader/third_party/subzero/src/IceInstX8664.h 2022-02-25 22:19:13.478847553 +0000 +@@ -576,8 +576,44 @@ void emitIASXmmShift(const Cfg *Func, Ty + /// Emit a two-operand (GPR) instruction, where the dest operand is a Variable + /// that's guaranteed to be a register. + template +-void emitIASRegOpTyGPR(const Cfg *Func, Type Ty, const Variable *Dst, +- const Operand *Src, const GPREmitterRegOp &Emitter); ++ ++void emitIASRegOpTyGPR(const Cfg *Func, Type Ty, const Variable *Var, ++ const Operand *Src, const GPREmitterRegOp &Emitter) { ++ auto *Target = InstX86Base::getTarget(Func); ++ Assembler *Asm = Func->getAssembler(); ++ assert(Var->hasReg()); ++ // We cheat a little and use GPRRegister even for byte operations. ++ GPRRegister VarReg = VarCanBeByte ? RegX8664::getEncodedGPR(Var->getRegNum()) ++ : RegX8664::getEncodedGPR(Var->getRegNum()); ++ if (const auto *SrcVar = llvm::dyn_cast(Src)) { ++ if (SrcVar->hasReg()) { ++ GPRRegister SrcReg = SrcCanBeByte ++ ? RegX8664::getEncodedGPR(SrcVar->getRegNum()) ++ : RegX8664::getEncodedGPR(SrcVar->getRegNum()); ++ (Asm->*(Emitter.GPRGPR))(Ty, VarReg, SrcReg); ++ } else { ++ AsmAddress SrcStackAddr = AsmAddress(SrcVar, Target); ++ (Asm->*(Emitter.GPRAddr))(Ty, VarReg, SrcStackAddr); ++ } ++ } else if (const auto *Mem = llvm::dyn_cast(Src)) { ++ Mem->emitSegmentOverride(Asm); ++ (Asm->*(Emitter.GPRAddr))(Ty, VarReg, AsmAddress(Mem, Asm, Target)); ++ } else if (const auto *Imm = llvm::dyn_cast(Src)) { ++ (Asm->*(Emitter.GPRImm))(Ty, VarReg, AssemblerImmediate(Imm->getValue())); ++ } else if (const auto *Imm = llvm::dyn_cast(Src)) { ++ assert(Utils::IsInt(32, Imm->getValue())); ++ (Asm->*(Emitter.GPRImm))(Ty, VarReg, AssemblerImmediate(Imm->getValue())); ++ } else if (const auto *Reloc = llvm::dyn_cast(Src)) { ++ const auto FixupKind = (Reloc->getName().hasStdString() && ++ Reloc->getName().toString() == GlobalOffsetTable) ++ ? FK_GotPC ++ : FK_Abs; ++ AssemblerFixup *Fixup = Asm->createFixup(FixupKind, Reloc); ++ (Asm->*(Emitter.GPRImm))(Ty, VarReg, AssemblerImmediate(Fixup)); ++ } else { ++ llvm_unreachable("Unexpected operand type"); ++ } ++} + + /// Instructions of the form x := op(x). + template diff --git a/chromium-98.0.4758.102-remoting-no-tests.patch b/chromium-98.0.4758.102-remoting-no-tests.patch new file mode 100644 index 0000000..a8c4dbd --- /dev/null +++ b/chromium-98.0.4758.102-remoting-no-tests.patch @@ -0,0 +1,20 @@ +diff -up chromium-98.0.4758.102/remoting/BUILD.gn.remoting-no-tests chromium-98.0.4758.102/remoting/BUILD.gn +--- chromium-98.0.4758.102/remoting/BUILD.gn.remoting-no-tests 2022-02-28 19:15:23.835872267 +0000 ++++ chromium-98.0.4758.102/remoting/BUILD.gn 2022-03-01 17:55:50.625536957 +0000 +@@ -8,7 +8,7 @@ import("//remoting/build/config/remoting + group("remoting_all") { + testonly = true + +- deps = [ ":remoting_unittests" ] ++ deps = [ ] + + if (is_win) { + deps += [ +@@ -37,7 +37,6 @@ group("remoting_all") { + + if (enable_remoting_host) { + deps += [ +- ":remoting_perftests", + "//remoting/host", + ] + diff --git a/chromium-98.0.4758.80-missing-utility-for-std-exchange.patch b/chromium-98.0.4758.80-missing-utility-for-std-exchange.patch index 1b5a71f..1f6c7e8 100644 --- a/chromium-98.0.4758.80-missing-utility-for-std-exchange.patch +++ b/chromium-98.0.4758.80-missing-utility-for-std-exchange.patch @@ -1,6 +1,6 @@ -diff -up chromium-98.0.4758.80/base/third_party/symbolize/symbolize.h.f36 chromium-98.0.4758.80/base/third_party/symbolize/symbolize.h ---- chromium-98.0.4758.80/base/third_party/symbolize/symbolize.h.f36 2022-02-08 19:28:20.198873875 +0000 -+++ chromium-98.0.4758.80/base/third_party/symbolize/symbolize.h 2022-02-08 19:28:57.533127622 +0000 +diff -up chromium-98.0.4758.102/base/third_party/symbolize/symbolize.h.missing-utility-for-std-exchange chromium-98.0.4758.102/base/third_party/symbolize/symbolize.h +--- chromium-98.0.4758.102/base/third_party/symbolize/symbolize.h.missing-utility-for-std-exchange 2022-02-25 22:30:02.833745309 +0000 ++++ chromium-98.0.4758.102/base/third_party/symbolize/symbolize.h 2022-02-25 22:30:02.832745344 +0000 @@ -58,6 +58,8 @@ #include "config.h" #include "glog/logging.h" @@ -10,3 +10,14 @@ diff -up chromium-98.0.4758.80/base/third_party/symbolize/symbolize.h.f36 chromi #ifdef HAVE_SYMBOLIZE #include +diff -up chromium-98.0.4758.102/v8/src/heap/cppgc/prefinalizer-handler.h.missing-utility-for-std-exchange chromium-98.0.4758.102/v8/src/heap/cppgc/prefinalizer-handler.h +--- chromium-98.0.4758.102/v8/src/heap/cppgc/prefinalizer-handler.h.missing-utility-for-std-exchange 2022-02-27 20:08:40.027930037 +0000 ++++ chromium-98.0.4758.102/v8/src/heap/cppgc/prefinalizer-handler.h 2022-02-27 20:08:52.945490126 +0000 +@@ -5,6 +5,7 @@ + #ifndef V8_HEAP_CPPGC_PREFINALIZER_HANDLER_H_ + #define V8_HEAP_CPPGC_PREFINALIZER_HANDLER_H_ + ++#include + #include + + #include "include/cppgc/prefinalizer.h" diff --git a/chromium.spec b/chromium.spec index 99a3487..14ce080 100644 --- a/chromium.spec +++ b/chromium.spec @@ -220,7 +220,7 @@ Name: chromium%{chromium_channel}%{nsuffix} %else Name: chromium%{chromium_channel} %endif -Version: %{majorversion}.0.4758.80 +Version: %{majorversion}.0.4758.102 Release: 1%{?dist} %if %{?freeworld} %if %{?shared} @@ -304,6 +304,12 @@ Patch79: chromium-93.0.4577.63-widevine-no-download.patch # Fix crashes with components/cast_* # Thanks to Gentoo Patch80: chromium-98.0.4758.80-EnumTable-crash.patch +# Fix build issues with gcc12 +Patch81: chromium-98.0.4758.102-gcc-12-subzero-fix.patch +# Disable tests on remoting build +Patch82: chromium-98.0.4758.102-remoting-no-tests.patch + + # Add missing cmath header Patch84: chromium-94.0.4606.71-remoting-missing-cmath-header.patch @@ -993,6 +999,8 @@ udev. %endif %patch79 -p1 -b .widevine-no-download %patch80 -p1 -b .EnumTable-crash +%patch81 -p1 -b .gcc12fix +%patch82 -p1 -b .remoting-no-tests %patch84 -p1 -b .remoting-missing-cmath-header %patch86 -p1 -b .clang-format-py3 %patch95 -p1 -b .mojo-header-fix @@ -2116,6 +2124,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %changelog +* Fri Feb 25 2022 Tom Callaway - 98.0.4758.102-1 +- update to 98.0.4758.102 +- fix build issue with subzero and gcc12 + * Tue Feb 8 2022 Tom Callaway - 98.0.4758.80-1 - update to 98.0.4758.80 diff --git a/sources b/sources index 5f19837..6e2260c 100644 --- a/sources +++ b/sources @@ -21,4 +21,4 @@ SHA512 (NotoSansSymbols2-Regular.ttf) = 2644b42c3fdccfe12395f9b61553aced169a0f1d SHA512 (NotoSansTibetan-Regular.ttf) = fb5a48fcaea80eebe7d692f6fcf00d59d47658a358d0ec8e046fc559873f88bd595b2da474d2826abd9e9305f3741c69058d867b1e6048f37fe7d71b5d3af36a SHA512 (node-v12.22.6-linux-arm64.tar.xz) = 87ce5eb954deb1d0debe6fa02b28a3cc675e12fca1e51d44b123ab294aa39ce0c6b8ac9eae1e7a6e32673ea2c2d480651d9ba7eea73012f0529503eebe9eb34d SHA512 (node-v12.22.6-linux-x64.tar.xz) = e1b55c32343cb2ccc40d888c705414bebf9c46b02083d13731df79b1e79521b7277761f6bcca041e40e3a2e47c67bb8e7848aa2b919a9de5c2ebf62c4a9c7176 -SHA512 (chromium-98.0.4758.80-clean.tar.xz) = b3c95418683bc1ce24dcda8e1510fc5623ef97a9fca6574a75fb372648edaa078c715592c3f9fa0f6c0557b8edf1c3436faec093b620bef7b050a8c3aa4a2f96 +SHA512 (chromium-98.0.4758.102-clean.tar.xz) = c4d69e9e0c542a50a202ecc0fd2fb1b799110f825eb083878a2d965459e222fb5d319989aacd4f4f36ad38d51d82e1d3d4304cfba2dbebc8825555409114292a From 0834aaae899d1fc84f82e8a09b7a3841a389de33 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Sat, 5 Mar 2022 14:21:00 -0500 Subject: [PATCH 3/4] 99.0.4844.51 --- ...lAssistantModelExecutor-NoDestructor.patch | 32 +++++++++++++++++++ chromium-99.0.4844.51-fedora-user-agent.patch | 12 +++++++ ...um-99.0.4844.51-widevine-no-download.patch | 14 ++++++++ chromium.spec | 32 +++++++------------ sources | 2 +- 5 files changed, 70 insertions(+), 22 deletions(-) create mode 100644 chromium-99-AutofillAssistantModelExecutor-NoDestructor.patch create mode 100644 chromium-99.0.4844.51-fedora-user-agent.patch create mode 100644 chromium-99.0.4844.51-widevine-no-download.patch diff --git a/chromium-99-AutofillAssistantModelExecutor-NoDestructor.patch b/chromium-99-AutofillAssistantModelExecutor-NoDestructor.patch new file mode 100644 index 0000000..58b76a7 --- /dev/null +++ b/chromium-99-AutofillAssistantModelExecutor-NoDestructor.patch @@ -0,0 +1,32 @@ +From f1befebb6cea78950b5a8133bf3e65d56889d353 Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz +Date: Thu, 20 Jan 2022 09:38:13 +0100 +Subject: [PATCH] GCC: use braces initialization for NoDestructor in AutofillAssistantModelExecutor + +Fix build with GCC failing to resolve initialization of NoDestructor +with initializer list. + +Bug: 819294 +Change-Id: I5fe8d30b4aefdddd71ff7b220eeffcd838308f5a +--- + +diff --git a/components/autofill_assistant/content/renderer/autofill_assistant_model_executor.cc b/components/autofill_assistant/content/renderer/autofill_assistant_model_executor.cc +index 033205b..670376e 100644 +--- a/components/autofill_assistant/content/renderer/autofill_assistant_model_executor.cc ++++ b/components/autofill_assistant/content/renderer/autofill_assistant_model_executor.cc +@@ -156,13 +156,13 @@ + // TODO(b/204841212): Implement this with use of ModelMetadata. + absl::optional AutofillAssistantModelExecutor::Postprocess( + const std::vector& output_tensors) { +- static const base::NoDestructor> output_roles( ++ static const base::NoDestructor> output_roles{ + {"UNKNOWN_ROLE", "NAME_FIRST", "NAME_LAST", "NAME_FULL", "ADDRESS_LINE1", + "ADDRESS_LINE2", "CITY", "STATE", "COUNTRY", "POSTAL_CODE", + "CREDIT_CARD_NUMBER", "CREDIT_CARD_EXP_MONTH", + "CREDIT_CARD_VERIFICATION_CODE", "ORGANIZATION", + "CREDIT_CARD_EXPIRATION", "PHONE_NUMBER", "USERNAME_OR_EMAIL", +- "CREDIT_CARD_EXP_YEAR"}); ++ "CREDIT_CARD_EXP_YEAR"}}; + + DCHECK_GE(output_tensors.size(), 1u); + std::vector data; diff --git a/chromium-99.0.4844.51-fedora-user-agent.patch b/chromium-99.0.4844.51-fedora-user-agent.patch new file mode 100644 index 0000000..054ba4a --- /dev/null +++ b/chromium-99.0.4844.51-fedora-user-agent.patch @@ -0,0 +1,12 @@ +diff -up chromium-99.0.4844.51/content/common/user_agent.cc.fedora-user-agent chromium-99.0.4844.51/content/common/user_agent.cc +--- chromium-99.0.4844.51/content/common/user_agent.cc.fedora-user-agent 2022-03-04 15:06:27.774789749 +0000 ++++ chromium-99.0.4844.51/content/common/user_agent.cc 2022-03-04 15:07:22.837911148 +0000 +@@ -34,7 +34,7 @@ std::string GetUserAgentPlatform() { + #elif BUILDFLAG(IS_MAC) + return "Macintosh; "; + #elif defined(USE_OZONE) +- return "X11; "; // strange, but that's what Firefox uses ++ return "X11; Fedora; "; // strange, but that's what Firefox uses + #elif BUILDFLAG(IS_ANDROID) + return "Linux; "; + #elif BUILDFLAG(IS_FUCHSIA) diff --git a/chromium-99.0.4844.51-widevine-no-download.patch b/chromium-99.0.4844.51-widevine-no-download.patch new file mode 100644 index 0000000..951840d --- /dev/null +++ b/chromium-99.0.4844.51-widevine-no-download.patch @@ -0,0 +1,14 @@ +diff -up chromium-99.0.4844.51/chrome/browser/component_updater/registration.cc.widevine-no-download chromium-99.0.4844.51/chrome/browser/component_updater/registration.cc +--- chromium-99.0.4844.51/chrome/browser/component_updater/registration.cc.widevine-no-download 2022-03-04 14:57:16.459599123 +0000 ++++ chromium-99.0.4844.51/chrome/browser/component_updater/registration.cc 2022-03-04 14:58:39.560763939 +0000 +@@ -105,10 +105,6 @@ void RegisterComponentsForUpdate() { + RegisterMediaFoundationWidevineCdmComponent(cus); + #endif + +-#if BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) +- RegisterWidevineCdmComponent(cus); +-#endif // BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) +- + #if BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_ANDROID) + #if BUILDFLAG(IS_CHROMEOS_ASH) + // PNaCl on Chrome OS is on rootfs and there is no need to download it. But diff --git a/chromium.spec b/chromium.spec index 14ce080..5ce750c 100644 --- a/chromium.spec +++ b/chromium.spec @@ -213,14 +213,14 @@ BuildRequires: libicu-devel >= 5.4 %global chromoting_client_id %nil %endif -%global majorversion 98 +%global majorversion 99 %if %{freeworld} Name: chromium%{chromium_channel}%{nsuffix} %else Name: chromium%{chromium_channel} %endif -Version: %{majorversion}.0.4758.102 +Version: %{majorversion}.0.4844.51 Release: 1%{?dist} %if %{?freeworld} %if %{?shared} @@ -264,7 +264,7 @@ Patch11: chromium-93.0.4577.63-py3-bootstrap.patch Patch11: chromium-92.0.4515.107-py2-bootstrap.patch %endif # Add "Fedora" to the user agent string -Patch12: chromium-98.0.4758.80-fedora-user-agent.patch +Patch12: chromium-99.0.4844.51-fedora-user-agent.patch # Needs to be submitted.. Patch51: chromium-96.0.4664.45-gcc-remoting-constexpr.patch @@ -279,12 +279,8 @@ Patch57: chromium-96.0.4664.45-missing-cstring.patch # prepare for using system ffmpeg (clean) # http://svnweb.mageia.org/packages/cauldron/chromium-browser-stable/current/SOURCES/chromium-53-ffmpeg-no-deprecation-errors.patch?view=markup Patch58: chromium-53-ffmpeg-no-deprecation-errors.patch -# https://github.com/stha09/chromium-patches/blob/master/chromium-95-libyuv-arm.patch -Patch60: chromium-95-libyuv-arm.patch -# https://github.com/stha09/chromium-patches/blob/master/chromium-98-MiraclePtr-gcc-ice.patch -Patch61: chromium-98-MiraclePtr-gcc-ice.patch -# https://github.com/stha09/chromium-patches/blob/master/chromium-98-WaylandFrameManager-check.patch -Patch62: chromium-98-WaylandFrameManager-check.patch +# https://github.com/stha09/chromium-patches/blob/master/chromium-99-AutofillAssistantModelExecutor-NoDestructor.patch +Patch60: chromium-99-AutofillAssistantModelExecutor-NoDestructor.patch # Extra CXXFLAGS for aarch64 Patch64: chromium-91.0.4472.77-aarch64-cxxflags-addition.patch # Fix issue where closure_compiler thinks java is only allowed in android builds @@ -296,10 +292,8 @@ Patch67: chromium-98.0.4758.80-remoting-cstring.patch # Apply fix_textrels hack for i686 (even without lld) Patch68: chromium-84.0.4147.125-i686-fix_textrels.patch -# Rawhide (f35) glibc defines SIGSTKSZ as a long instead of a constant -Patch76: chromium-92.0.4515.107-rawhide-gcc-std-max-fix.patch # Do not download proprietary widevine module in the background (thanks Debian) -Patch79: chromium-93.0.4577.63-widevine-no-download.patch +Patch79: chromium-99.0.4844.51-widevine-no-download.patch # Fix crashes with components/cast_* # Thanks to Gentoo @@ -316,8 +310,6 @@ Patch84: chromium-94.0.4606.71-remoting-missing-cmath-header.patch # Clean up clang-format for python3 # thanks to Jon Nettleton Patch86: chromium-94.0.4606.81-clang-format.patch -# include full UrlResponseHead header -Patch95: chromium-93.0.4577.63-mojo-header-fix.patch # Fix extra qualification error Patch97: chromium-98.0.4758.80-remoting-extra-qualification.patch # From gentoo @@ -987,23 +979,17 @@ udev. %patch56 -p1 -b .missing-cstdint %patch57 -p1 -b .missing-cstring %patch58 -p1 -b .ffmpeg-deprecations -%patch60 -p1 -b .libyuv-arm -%patch61 -p1 -b .MiraclePtr-gcc-ice -%patch62 -p1 -b .WaylandFrameManager-check +%patch60 -p1 -b .AutofillAssistantModelExecutor-NoDestructor %patch64 -p1 -b .aarch64-cxxflags-addition %patch65 -p1 -b .java-only-allowed %patch67 -p1 -b .remoting-cstring %patch68 -p1 -b .i686-textrels -%if 0%{?fedora} >= 35 -%patch76 -p1 -b .sigstkszfix -%endif %patch79 -p1 -b .widevine-no-download %patch80 -p1 -b .EnumTable-crash %patch81 -p1 -b .gcc12fix %patch82 -p1 -b .remoting-no-tests %patch84 -p1 -b .remoting-missing-cmath-header %patch86 -p1 -b .clang-format-py3 -%patch95 -p1 -b .mojo-header-fix %patch97 -p1 -b .remoting-extra-qualification %patch98 -p1 -b .InkDropHost-crash %patch99 -p1 -b .enable-WebRTCPipeWireCapturer-byDefault @@ -1304,6 +1290,7 @@ build/linux/unbundle/remove_bundled_libraries.py \ 'third_party/devscripts' \ 'third_party/devtools-frontend' \ 'third_party/devtools-frontend/src/third_party/typescript' \ + 'third_party/devtools-frontend/src/front_end/third_party' \ 'third_party/devtools-frontend/src/front_end/third_party/acorn' \ 'third_party/devtools-frontend/src/front_end/third_party/axe-core' \ 'third_party/devtools-frontend/src/front_end/third_party/chromium' \ @@ -2124,6 +2111,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %changelog +* Sat Mar 5 2022 Tom Callaway - 99.0.4844.5-1 +- update to 99.0.4844.5 + * Fri Feb 25 2022 Tom Callaway - 98.0.4758.102-1 - update to 98.0.4758.102 - fix build issue with subzero and gcc12 diff --git a/sources b/sources index 6e2260c..141bbba 100644 --- a/sources +++ b/sources @@ -21,4 +21,4 @@ SHA512 (NotoSansSymbols2-Regular.ttf) = 2644b42c3fdccfe12395f9b61553aced169a0f1d SHA512 (NotoSansTibetan-Regular.ttf) = fb5a48fcaea80eebe7d692f6fcf00d59d47658a358d0ec8e046fc559873f88bd595b2da474d2826abd9e9305f3741c69058d867b1e6048f37fe7d71b5d3af36a SHA512 (node-v12.22.6-linux-arm64.tar.xz) = 87ce5eb954deb1d0debe6fa02b28a3cc675e12fca1e51d44b123ab294aa39ce0c6b8ac9eae1e7a6e32673ea2c2d480651d9ba7eea73012f0529503eebe9eb34d SHA512 (node-v12.22.6-linux-x64.tar.xz) = e1b55c32343cb2ccc40d888c705414bebf9c46b02083d13731df79b1e79521b7277761f6bcca041e40e3a2e47c67bb8e7848aa2b919a9de5c2ebf62c4a9c7176 -SHA512 (chromium-98.0.4758.102-clean.tar.xz) = c4d69e9e0c542a50a202ecc0fd2fb1b799110f825eb083878a2d965459e222fb5d319989aacd4f4f36ad38d51d82e1d3d4304cfba2dbebc8825555409114292a +SHA512 (chromium-99.0.4844.51-clean.tar.xz) = b9c46bc120b4ec5841ee91c9c752cfb7178c885b9b324ca3512645a583375967cc82beb560364d0ec8028bd25e33f5933b52ef815c42ea0dbe5ddb724b5b30c5 From fed246998c27ef6abd6ee12e9192dc318874bfc7 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Sat, 5 Mar 2022 14:26:19 -0500 Subject: [PATCH 4/4] merge + rhel 8 fix --- ...44.51-rhel8-force-disable-use_gnome_keyring.patch | 12 ++++++++++++ chromium.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 chromium-99.0.4844.51-rhel8-force-disable-use_gnome_keyring.patch diff --git a/chromium-99.0.4844.51-rhel8-force-disable-use_gnome_keyring.patch b/chromium-99.0.4844.51-rhel8-force-disable-use_gnome_keyring.patch new file mode 100644 index 0000000..a65f244 --- /dev/null +++ b/chromium-99.0.4844.51-rhel8-force-disable-use_gnome_keyring.patch @@ -0,0 +1,12 @@ +diff -up chromium-99.0.4844.51/components/os_crypt/features.gni.disblegnomekeyring chromium-99.0.4844.51/components/os_crypt/features.gni +--- chromium-99.0.4844.51/components/os_crypt/features.gni.disblegnomekeyring 2022-03-05 14:24:15.073877597 -0500 ++++ chromium-99.0.4844.51/components/os_crypt/features.gni 2022-03-05 14:25:04.174183483 -0500 +@@ -8,7 +8,7 @@ import("//build/config/ui.gni") + declare_args() { + # Whether to use libgnome-keyring (deprecated by libsecret). + # See http://crbug.com/466975 and http://crbug.com/355223. +- use_gnome_keyring = is_linux && use_glib ++ use_gnome_keyring = false + + # Whether to make account and service names for the crypto key storage + # configurable at runtime for embedders. diff --git a/chromium.spec b/chromium.spec index 5ce750c..e9616a4 100644 --- a/chromium.spec +++ b/chromium.spec @@ -355,7 +355,7 @@ Patch203: chromium-86.0.4240.75-vaapi-i686-fpermissive.patch Patch205: chromium-86.0.4240.75-fix-vaapi-on-intel.patch # Apply these patches to work around EPEL8 issues -Patch300: chromium-92.0.4515.107-rhel8-force-disable-use_gnome_keyring.patch +Patch300: chromium-99.0.4844.51-rhel8-force-disable-use_gnome_keyring.patch # And fixes for new compilers Patch400: %{name}-gcc11.patch