From 0834aaae899d1fc84f82e8a09b7a3841a389de33 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Sat, 5 Mar 2022 14:21:00 -0500 Subject: [PATCH] 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 00000000..58b76a74 --- /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 00000000..054ba4a8 --- /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 00000000..951840d5 --- /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 14ce080a..5ce750cd 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 6e2260cd..141bbba3 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