rpms
/
chromium
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rawhide' into epel7

This commit is contained in:
Tom spot Callaway 2022-03-05 14:48:38 -05:00
parent f4b6d8de2a fed246998c
commit ed7be51b3b
9 changed files with 210 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
chromium-98.0.4758.102-gcc-12-subzero-fix.patch Normal file
View File

@ -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 <bool VarCanBeByte, bool SrcCanBeByte>
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 <bool VarCanBeByte = true, bool SrcCanBeByte = true>
-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<Assembler>();
+ 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<Variable>(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<X86OperandMem>(Src)) {
+ Mem->emitSegmentOverride(Asm);
+ (Asm->*(Emitter.GPRAddr))(Ty, VarReg, AsmAddress(Mem, Asm, Target));
+ } else if (const auto *Imm = llvm::dyn_cast<ConstantInteger32>(Src)) {
+ (Asm->*(Emitter.GPRImm))(Ty, VarReg, AssemblerImmediate(Imm->getValue()));
+ } else if (const auto *Imm = llvm::dyn_cast<ConstantInteger64>(Src)) {
+ assert(Utils::IsInt(32, Imm->getValue()));
+ (Asm->*(Emitter.GPRImm))(Ty, VarReg, AssemblerImmediate(Imm->getValue()));
+ } else if (const auto *Reloc = llvm::dyn_cast<ConstantRelocatable>(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 <typename InstX86Base::InstKindX86 K>

20
chromium-98.0.4758.102-remoting-no-tests.patch Normal file
View File

@ -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",
]

23
chromium-98.0.4758.80-missing-utility-for-std-exchange.patch Normal file
View File

@ -0,0 +1,23 @@
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"
+#include <utility>
+
#ifdef HAVE_SYMBOLIZE
#include <algorithm>
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 <utility>
#include <vector>
#include "include/cppgc/prefinalizer.h"

32
chromium-99-AutofillAssistantModelExecutor-NoDestructor.patch Normal file
View File

@ -0,0 +1,32 @@
From f1befebb6cea78950b5a8133bf3e65d56889d353 Mon Sep 17 00:00:00 2001
From: Jose Dapena Paz <jdapena@igalia.com>
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<std::string> AutofillAssistantModelExecutor::Postprocess(
const std::vector<const TfLiteTensor*>& output_tensors) {
- static const base::NoDestructor<std::vector<std::string>> output_roles(
+ static const base::NoDestructor<std::vector<std::string>> 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<float> data;

12
chromium-99.0.4844.51-fedora-user-agent.patch Normal file
View File

@ -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)

12
chromium-99.0.4844.51-rhel8-force-disable-use_gnome_keyring.patch Normal file
View File

@ -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.

14
chromium-99.0.4844.51-widevine-no-download.patch Normal file
View File

@ -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

50
chromium.spec
View File

@ -217,14 +217,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.80
Version: %{majorversion}.0.4844.51
Release: 1%{?dist}
%if %{?freeworld}
%if %{?shared}
@ -268,7 +268,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
@ -283,12 +283,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
@ -300,29 +296,32 @@ 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
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
# 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
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 <utility> for std::exchange
Patch100: chromium-98.0.4758.80-missing-utility-for-std-exchange.patch
# Use lstdc++ on EPEL7 only
@ -360,7 +359,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
@ -984,24 +983,21 @@ 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
%patch100 -p1 -b .missing-utility-for-std-exchange
# Fedora branded user agent
%if 0%{?fedora}
@ -1298,6 +1294,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' \
@ -2118,6 +2115,13 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
* Sat Mar 5 2022 Tom Callaway <spot@fedoraproject.org> - 99.0.4844.5-1
- update to 99.0.4844.5
* Fri Feb 25 2022 Tom Callaway <spot@fedoraproject.org> - 98.0.4758.102-1
- update to 98.0.4758.102
- fix build issue with subzero and gcc12
* Tue Feb 8 2022 Tom Callaway <spot@fedoraproject.org> - 98.0.4758.80-1
- update to 98.0.4758.80

2
sources
View File

@ -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-99.0.4844.51-clean.tar.xz) = b9c46bc120b4ec5841ee91c9c752cfb7178c885b9b324ca3512645a583375967cc82beb560364d0ec8028bd25e33f5933b52ef815c42ea0dbe5ddb724b5b30c5