Request 5453 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 5453 (accepted)

- Update to 93.0.4577.82
Branch of https://build.opensuse.org/project/show/network:chromium
- Drop conditional build for libffmpeg, we want it here definitely

Created by Kieltux about 3 years ago
In state accepted
Package maintainer: awissu

Submit chromium-ffmpeg-extra

Submit package home:Kiel...es:Extra / chromium-...eg-extra to package Extra / chromium-ffmpeg-extra

chromium-ffmpeg-extra.changes Changed

chromium-ffmpeg-extra.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package chromium-ffmpeg-extra
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,47 +12,248 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
+%define rname chromium
+# bsc#1108175
+%define __provides_exclude ^lib.*\\.so.*$
+%if 0%{?suse_version} > 1500
+%bcond_without system_icu
+%bcond_with system_vpx
+%else
+%bcond_with system_icu
+%bcond_with system_vpx
+%endif
+%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
+%bcond_without system_harfbuzz
+%bcond_without pipewire
+%else
+%bcond_with system_harfbuzz
+%bcond_with pipewire
+%endif
+%ifarch %{arm} aarch64
+%bcond_with swiftshader
+%else
+%bcond_without swiftshader
+%endif
+%bcond_with lto
+%bcond_without clang
 Name:           chromium-ffmpeg-extra
-Version:        69.0.3497.100
+Version:        93.0.4577.82
 Release:        0
 Summary:        Extra ffmpeg codecs for browsers based on Chromium
-License: GPL-2.0
-Group:          Productivity/Networking/Web/Browsers
-URL:            http://code.google.com/p/chromium/
-Source0:        http://commondatastorage.googleapis.com/chromium-browser-official/chromium-%{version}.tar.xz
-Source1:        BUILD.gn
-Patch0:         fix_building_widevinecdm_with_chromium.patch
-Patch1:         chromium-dma-buf.patch
-Patch2:         chromium-non-void-return.patch
-Patch3:         chromium-system-icu.patch
-Patch4:         chromium-skia-system-fontconfig.patch
-Patch5:         chromium-old-glibc.patch
-BuildRequires:  ninja
+License:        BSD-3-Clause AND LGPL-2.1-or-later
+URL:            https://www.chromium.org/
+Source0:        https://commondatastorage.googleapis.com/chromium-browser-official/%{rname}-%{version}.tar.xz
+Source1:        README.SUSE
+Source2:        https://github.com/google/highway/archive/refs/tags/0.12.2.tar.gz#/highway-0.12.2.tar.gz
+# Toolchain definitions
+Source30:       master_preferences
+Source104:      chromium-symbolic.svg
+# https://github.com/chromium/chromium/tree/%{version}/chrome/installer/linux/common/installer.include
+Source105:      INSTALL.sh
+#
+Patch0:         chromium-libusb_interrupt_event_handler.patch
+# PATCH-FIX-OPENSUSE Make the 1-click-install ymp file always download [bnc#836059]
+Patch1:         exclude_ymp.patch
+# PATCH-FIX-OPENSUSE enables reading of the master preference
+Patch2:         chromium-master-prefs-path.patch
+# PATCH-FIX-OPENSUSE fix_building_widevinecdm_with_chromium.patch - Enable WideVine plugin
+Patch3:         fix_building_widevinecdm_with_chromium.patch
+Patch4:         chromium-buildname.patch
+Patch5:         chromium-system-libusb.patch
+Patch6:         gcc-enable-lto.patch
+# Do not use unrar code, it is non-free
+Patch7:         chromium-norar.patch
+# revert location on old GCC on 15.1, 15.2 gets it right tho
+Patch8:         no-location-leap151.patch
+Patch9:         system-libdrm.patch
+Patch10:        chromium-disable-parallel-gold.patch
+Patch11:        chromium-lp151-old-drm.patch
+# gentoo/fedora/arch patchset
+Patch12:        chromium-78-protobuf-RepeatedPtrField-export.patch
+Patch13:        chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch
+Patch15:        chromium-91-compiler.patch
+Patch17:        chromium-86-ImageMemoryBarrierData-init.patch
+Patch18:        chromium-86-nearby-explicit.patch
+Patch19:        chromium-86-nearby-include.patch
+Patch20:        chromium-86-f_seal.patch
+Patch21:        chromium-gcc11.patch
+Patch23:        chromium-glibc-2.33.patch
+Patch25:        chromium-90-fseal.patch
+Patch29:        chromium-93-EnumTable-crash.patch
+Patch30:        chromium-shim_headers.patch
+Patch31:        chromium-89-missing-cstring-header.patch
+Patch36:        chromium-90-ruy-include.patch
+Patch40:        chromium-91-java-only-allowed-in-android-builds.patch
+Patch44:        chromium-91-libyuv-aarch64.patch
+Patch46:        chromium-91-sql-standard-layout-type.patch
+Patch49:        chromium-freetype-2.11.patch
+Patch50:        chromium-clang-nomerge.patch
+Patch51:        chromium-glibc-2.34.patch
+Patch53:        chromium-93-ContextSet-permissive.patch
+Patch54:        chromium-93-ClassProperty-include.patch
+Patch55:        chromium-93-BluetoothLowEnergyScanFilter-include.patch
+Patch56:        chromium-93-HashPasswordManager-include.patch
+Patch57:        chromium-93-pdfium-include.patch
+Patch58:        chromium-93-DevToolsEmbedderMessageDispatcher-include.patch
+Patch59:        chromium-93-FormForest-constexpr.patch
+Patch60:        chromium-93-ScopedTestDialogAutoConfirm-include.patch
+Patch61:        chromium-93-InkDropHost-crash.patch
+Patch62:        chromium-93-ffmpeg-4.4.patch
+# Google seem not too keen on merging this but GPU accel is quite important
+#  https://chromium-review.googlesource.com/c/chromium/src/+/532294
+#  https://github.com/saiarcot895/chromium-ubuntu-build/tree/master/debian/patches
+#  Recreated from scratch to be smaller and use system the orginal switches
+#  (default on) compared to the PR
+Patch100:       chromium-vaapi.patch
+Patch101:       chromium-86-fix-vaapi-on-intel.patch
+# PATCH-FIX-SUSE: allow prop codecs to be set with chromium branding
+Patch102:       chromium-prop-codecs.patch
+BuildRequires:  SDL-devel
+BuildRequires:  bison
+BuildRequires:  cups-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  elfutils
+BuildRequires:  fdupes
+BuildRequires:  flex
+BuildRequires:  gn >= 0.1807
+BuildRequires:  gperf
+BuildRequires:  hicolor-icon-theme
+# Java used during build
+BuildRequires:  java-openjdk-headless
+BuildRequires:  libcap-devel
+BuildRequires:  libdc1394
+BuildRequires:  libgcrypt-devel
+BuildRequires:  libgsm-devel
+BuildRequires:  libjpeg-devel >= 8.1
+BuildRequires:  libpng-devel
+BuildRequires:  memory-constraints
+BuildRequires:  nasm
+BuildRequires:  ncurses-devel
+BuildRequires:  ninja >= 1.7.2
+BuildRequires:  nodejs >= 8.0
+BuildRequires:  pam-devel
 BuildRequires:  pkgconfig
-BuildRequires:  python-xml
+BuildRequires:  python
+BuildRequires:  python3
+BuildRequires:  python3-setuptools
+BuildRequires:  snappy-devel
+BuildRequires:  update-desktop-files
+BuildRequires:  util-linux
+BuildRequires:  wdiff
+BuildRequires:  perl(Switch)
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(bzip2)
+BuildRequires:  pkgconfig(cairo) >= 1.6
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(dirac) >= 1.0.0
 BuildRequires:  pkgconfig(dri)
+BuildRequires:  pkgconfig(expat)
+BuildRequires:  pkgconfig(flac++)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(gbm)
+BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gtk+-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(hunspell)
+BuildRequires:  pkgconfig(imlib2)
+BuildRequires:  pkgconfig(jack)
+BuildRequires:  pkgconfig(kadm-client)
+BuildRequires:  pkgconfig(kdb)
+BuildRequires:  pkgconfig(krb5)
+BuildRequires:  pkgconfig(libavcodec)
+BuildRequires:  pkgconfig(libavfilter)
+BuildRequires:  pkgconfig(libavformat) >= 58
+BuildRequires:  pkgconfig(libavutil)
+BuildRequires:  pkgconfig(libcrypto)
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(libdc1394-2)
+BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(libelf)
+BuildRequires:  pkgconfig(libevent)
 BuildRequires:  pkgconfig(libexif)
 BuildRequires:  pkgconfig(libffi)
 BuildRequires:  pkgconfig(libpci)
 BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(nss)
-BuildRequires:  pkgconfig(python)
-BuildRequires:  pkgconfig(uuid)
+BuildRequires:  pkgconfig(libssl)
+BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(libusb-1.0)
+BuildRequires:  pkgconfig(libva)
+BuildRequires:  pkgconfig(libwebp) >= 0.4.0
+BuildRequires:  pkgconfig(libxml-2.0) >= 2.9.5
+BuildRequires:  pkgconfig(libxslt)
+BuildRequires:  pkgconfig(minizip)
+BuildRequires:  pkgconfig(nspr) >= 4.9.5
+BuildRequires:  pkgconfig(nss) >= 3.26
+BuildRequires:  pkgconfig(ogg)
+BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(opus) >= 1.3.1
+BuildRequires:  pkgconfig(python3)
+BuildRequires:  pkgconfig(re2)
+BuildRequires:  pkgconfig(schroedinger-1.0)
+BuildRequires:  pkgconfig(slang)
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(theora) >= 1.1
+BuildRequires:  pkgconfig(vdpau)
+BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  pkgconfig(wayland-cursor)
+BuildRequires:  pkgconfig(wayland-scanner)
+BuildRequires:  pkgconfig(wayland-server)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xcb-dri3)
+BuildRequires:  pkgconfig(xcb-proto)
+BuildRequires:  pkgconfig(xcomposite)
+BuildRequires:  pkgconfig(xcursor)
+BuildRequires:  pkgconfig(xdamage)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xfixes)
+BuildRequires:  pkgconfig(xi)
+BuildRequires:  pkgconfig(xkbcommon)
+BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(xrender)
 BuildRequires:  pkgconfig(xscrnsaver)
+BuildRequires:  pkgconfig(xshmfence)
+BuildRequires:  pkgconfig(xt)
 BuildRequires:  pkgconfig(xtst)
-ExclusiveArch:  %{ix86} x86_64
-%if %{?suse_version} >= 1330
-BuildRequires:  gcc >= 6.0
-BuildRequires:  gcc-c++ >= 6.0
+BuildRequires:  pkgconfig(zlib)
+Requires:       xdg-utils
+Requires(pre):  permissions
+
+# no 32bit supported and it takes ages to build
+ExclusiveArch:  x86_64 aarch64 riscv64
+%if 0%{?suse_version} <= 1500
+BuildRequires:  pkgconfig(glproto)
+%endif
+%if %{with pipewire}
+BuildRequires:  pkgconfig(libpipewire-0.3)
+BuildRequires:  pkgconfig(libspa-0.2)
+%endif
+%if %{with system_harfbuzz}
+BuildRequires:  pkgconfig(harfbuzz) > 2.3.0
+%endif
+%if %{with system_icu}
+BuildRequires:  pkgconfig(icu-i18n) >= 67.0
+%endif
+%if %{with system_vpx}
+BuildRequires:  pkgconfig(vpx) >= 1.8.2
+%endif
+%if %{with clang}
+BuildRequires:  clang
+BuildRequires:  lld
+BuildRequires:  llvm
+%else
+BuildRequires:  binutils-gold
+%if %{?suse_version} > 1500
+BuildRequires:  gcc >= 10
+BuildRequires:  gcc-c++ >= 10
 %else
-BuildRequires:  gcc7
-BuildRequires:  gcc7-c++
+BuildRequires:  gcc10
+BuildRequires:  gcc10-c++
+%endif
 %endif
 
 %description
@@ -60,30 +261,291 @@
 (audio and video tags).
 
 %prep
-%setup -q -n chromium-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%ifarch aarch64
+%setup -q -T -D -b2 -n highway-0.12.2
+%endif
+%setup -q -n %{rname}-%{version}
+%autopatch -p1
 
-mkdir toolchain
-cp %{SOURCE1} toolchain/BUILD.gn
+%build
+%ifarch aarch64
+rm -rf third_party/highway/src/*
+mv ../highway-0.12.2/* third_party/highway/src
+%endif
+# Fix the path to nodejs binary
+mkdir -p third_party/node/linux/node-linux-x64/bin
+ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node
 
-if [ ! -f chrome/test/data/webui/i18n_process_css_test.html ]; then
-    touch chrome/test/data/webui/i18n_process_css_test.html
-fi
+rm buildtools/third_party/eu-strip/bin/eu-strip
+ln -s %{_bindir}/eu-strip buildtools/third_party/eu-strip/bin/eu-strip
 
-%build
-ARCH_FLAGS="`echo %{optflags} | sed -e 's/^-g / /g' -e 's/ -g / /g' -e 's/ -g$//g'`"
-export CFLAGS="${ARCH_FLAGS} -fpermissive"
-export CXXFLAGS="${ARCH_FLAGS} -fpermissive"
-%if 0%{?suse_version} < 1330
-export CC=gcc-7
-export CXX=g++-7
+# python3
+mkdir $HOME/bin
+export PYTHON=python3
+ln -sfn %{_bindir}/$PYTHON $HOME/bin/python
+export PATH="$HOME/bin/:$PATH"
+
+# Remove bundled libs
+keeplibs=(
+    base/third_party/cityhash
+    base/third_party/double_conversion
+    base/third_party/dynamic_annotations
+    base/third_party/icu
+    base/third_party/nspr
+    base/third_party/superfasthash
+    base/third_party/symbolize
+    base/third_party/valgrind
+    base/third_party/xdg_mime
+    base/third_party/xdg_user_dirs
+    buildtools/third_party/libc++
+    buildtools/third_party/libc++abi
+    buildtools/third_party/libunwind
+    buildtools/third_party/eu-strip
+    chrome/third_party/mozilla_security_manager
+    courgette/third_party
+    net/third_party/mozilla_security_manager
+    net/third_party/nss
+    net/third_party/quic
+    net/third_party/uri_template
+    third_party/abseil-cpp
+    third_party/angle
+    third_party/angle/src/common/third_party/base
+    third_party/angle/src/common/third_party/smhasher
+    third_party/angle/src/common/third_party/xxhash
+    third_party/angle/src/third_party/libXNVCtrl
+    third_party/angle/src/third_party/trace_event
+    third_party/angle/src/third_party/volk
+    third_party/apple_apsl
+    third_party/axe-core
+    third_party/blink
+    third_party/boringssl
+    third_party/boringssl/src/third_party/fiat
+    third_party/breakpad
+    third_party/breakpad/breakpad/src/third_party/curl
+    third_party/brotli
+    third_party/catapult
+    third_party/catapult/common/py_vulcanize/third_party/rcssmin
+    third_party/catapult/common/py_vulcanize/third_party/rjsmin
+    third_party/catapult/third_party/beautifulsoup4
+    third_party/catapult/third_party/html5lib-1.1/
+    third_party/catapult/third_party/html5lib-python
+    third_party/catapult/third_party/polymer
+    third_party/catapult/third_party/six
+    third_party/catapult/tracing/third_party/d3
+    third_party/catapult/tracing/third_party/gl-matrix
+    third_party/catapult/tracing/third_party/jpeg-js
+    third_party/catapult/tracing/third_party/jszip
+    third_party/catapult/tracing/third_party/mannwhitneyu
+    third_party/catapult/tracing/third_party/oboe
+    third_party/catapult/tracing/third_party/pako
+    third_party/ced
+    third_party/cld_3
+    third_party/closure_compiler
+    third_party/crashpad
+    third_party/crashpad/crashpad/third_party/lss
+    third_party/crashpad/crashpad/third_party/zlib
+    third_party/crc32c
+    third_party/cros_system_api
+    third_party/dav1d
+    third_party/dawn
+    third_party/depot_tools
+    third_party/depot_tools/third_party/six
+    third_party/devscripts
+    third_party/devtools-frontend
+    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
+    third_party/devtools-frontend/src/front_end/third_party/codemirror
+    third_party/devtools-frontend/src/front_end/third_party/diff
+    third_party/devtools-frontend/src/front_end/third_party/i18n
+    third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
+    third_party/devtools-frontend/src/front_end/third_party/lighthouse
+    third_party/devtools-frontend/src/front_end/third_party/lit-html
+    third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
+    third_party/devtools-frontend/src/front_end/third_party/marked
+    third_party/devtools-frontend/src/front_end/third_party/puppeteer
+    third_party/devtools-frontend/src/front_end/third_party/wasmparser
+    third_party/devtools-frontend/src/third_party
+    third_party/dom_distiller_js
+    third_party/eigen3
+    third_party/emoji-segmenter
+    third_party/farmhash
+    third_party/fdlibm
+    third_party/fft2d
+    third_party/flatbuffers
+    third_party/fusejs/dist
+    third_party/gemmlowp
+    third_party/google_input_tools
+    third_party/google_input_tools/third_party/closure_library
+    third_party/google_input_tools/third_party/closure_library/third_party/closure
+    third_party/googletest
+    third_party/harfbuzz-ng/utils
+    third_party/highway
+    third_party/hunspell
+    third_party/iccjpeg
+    third_party/inspector_protocol
+    third_party/jinja2
+    third_party/jsoncpp
+    third_party/jstemplate
+    third_party/khronos
+    third_party/leveldatabase
+    third_party/libaddressinput
+    third_party/libaom
+    third_party/libaom/source/libaom/third_party/fastfeat
+    third_party/libaom/source/libaom/third_party/vector
+    third_party/libaom/source/libaom/third_party/x86inc
+    third_party/libavif
+    third_party/libgav1
+    third_party/libgifcodec
+    third_party/libjingle
+    third_party/libjxl
+    third_party/libphonenumber
+    third_party/libsecret
+    third_party/libsrtp
+    third_party/libsync
+    third_party/libudev
+    third_party/liburlpattern
+    third_party/libva_protected_content
+    third_party/libwebm
+    third_party/libx11/src
+    third_party/libxcb-keysyms/keysyms
+    third_party/libxml/chromium
+    third_party/libXNVCtrl
+    third_party/libyuv
+    third_party/libzip
+    third_party/lottie
+    third_party/lss
+    third_party/lzma_sdk
+    third_party/mako
+    third_party/markupsafe
+    third_party/mesa
+    third_party/metrics_proto
+    third_party/minigbm
+    third_party/modp_b64
+    third_party/nasm
+    third_party/nearby
+    third_party/node
+    third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+    third_party/one_euro_filter
+    third_party/opencv
+    third_party/openscreen
+    third_party/openscreen/src/third_party/mozilla
+    third_party/openscreen/src/third_party/tinycbor/src/src
+    third_party/ots
+    third_party/pdfium
+    third_party/pdfium/third_party/agg23
+    third_party/pdfium/third_party/base
+    third_party/pdfium/third_party/bigint
+    third_party/pdfium/third_party/freetype
+    third_party/pdfium/third_party/lcms
+    third_party/pdfium/third_party/libopenjpeg20
+    third_party/pdfium/third_party/libpng16
+    third_party/pdfium/third_party/libtiff
+    third_party/pdfium/third_party/skia_shared
+    third_party/perfetto
+    third_party/perfetto/protos/third_party/chromium
+    third_party/pffft
+    third_party/ply
+    third_party/polymer
+    third_party/private-join-and-compute
+    third_party/private_membership
+    third_party/protobuf
+    third_party/protobuf/third_party/six
+    third_party/pyjson5
+    third_party/qcms
+    third_party/rnnoise
+    third_party/ruy
+    third_party/s2cellid
+    third_party/securemessage
+    third_party/shell-encryption
+    third_party/simplejson
+    third_party/skia
+    third_party/skia/include/third_party/skcms/
+    third_party/skia/include/third_party/vulkan/
+    third_party/skia/third_party/skcms
+    third_party/skia/third_party/vulkan
+    third_party/smhasher
+    third_party/sqlite
+    third_party/swiftshader
+    third_party/swiftshader/third_party/astc-encoder
+    third_party/swiftshader/third_party/llvm-10.0
+    third_party/swiftshader/third_party/llvm-subzero
+    third_party/swiftshader/third_party/marl
+    third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
+    third_party/swiftshader/third_party/subzero
+    third_party/tensorflow-text
+    third_party/tflite
+    third_party/tflite/src/third_party/eigen3
+    third_party/tflite/src/third_party/fft2d
+    third_party/tflite-support
+    third_party/ukey2
+    third_party/usrsctp
+    third_party/utf
+    third_party/vulkan
+    third_party/wayland
+    third_party/web-animations-js
+    third_party/webdriver
+    third_party/webgpu-cts
+    third_party/webrtc
+    third_party/webrtc/common_audio/third_party/ooura
+    third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+    third_party/webrtc/modules/third_party/fft
+    third_party/webrtc/modules/third_party/g711
+    third_party/webrtc/modules/third_party/g722
+    third_party/webrtc/rtc_base/third_party/base64
+    third_party/webrtc/rtc_base/third_party/sigslot
+    third_party/widevine
+    third_party/woff2
+    third_party/wuffs
+    third_party/x11proto
+    third_party/xcbproto
+    third_party/zlib/google
+    third_party/zxcvbn-cpp
+    url/third_party/mozilla
+    v8/src/third_party/siphash
+    v8/src/third_party/utf8-decoder
+    v8/src/third_party/valgrind
+    v8/third_party/inspector_protocol
+    v8/third_party/v8/builtins
+)
+%if !%{with system_harfbuzz}
+keeplibs+=(
+    third_party/freetype
+    third_party/harfbuzz-ng
+)
+%endif
+%if !%{with system_icu}
+keeplibs+=( third_party/icu )
+%endif
+keeplibs+=( third_party/ffmpeg )
+%if !%{with system_vpx}
+keeplibs+=(
+    third_party/libvpx
+    third_party/libvpx/source/libvpx/third_party/x86inc
+)
+%endif
+# needed due to bugs in GN
+keeplibs+=(
+    third_party/speech-dispatcher
+    third_party/usb_ids
+    third_party/xdg-utils
+)
+build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove
+
+# GN sets lto on its own and we need just ldflag options, not cflags
+%define _lto_cflags %{nil}
+%if %{with clang}
+export CC=clang
+export CXX=clang++
+export AR=llvm-ar
+export NM=llvm-nm
+%else
+export AR=ar
+export NM=nm
+%if 0%{?suse_version} <= 1500
+export CC=gcc-10
+export CXX=g++-10
 # some still call gcc/g++
-mkdir -p "$HOME/bin/"
 ln -sfn %{_bindir}/$CC $HOME/bin/gcc
 ln -sfn %{_bindir}/$CXX $HOME/bin/g++
 export PATH="$HOME/bin/:$PATH"
@@ -91,35 +553,176 @@
 export CC=gcc
 export CXX=g++
 %endif
+%endif
+# REDUCE DEBUG as it gets TOO large
+ARCH_FLAGS="`echo %{optflags} | sed -e 's/^-g / /g' -e 's/ -g / /g' -e 's/ -g$//g'`"
+export CXXFLAGS="${ARCH_FLAGS} -Wno-return-type"
+# extra flags to reduce warnings that aren't very useful
+export CXXFLAGS="${CXXFLAGS} -Wno-pedantic -Wno-unused-result -Wno-unused-function -Wno-unused-variable -Wno-deprecated-declarations"
+# ignore warnings for minor mistakes that are too common
+export CXXFLAGS="${CXXFLAGS} -Wno-return-type -Wno-parentheses -Wno-misleading-indentation"
+# ignore warnings that are not supported well until gcc 8
+export CXXFLAGS="${CXXFLAGS} -Wno-attributes"
+# ignore warnings due to gcc bug (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84055)
+export CXXFLAGS="${CXXFLAGS} -Wno-ignored-attributes"
+# ingore new gcc 8 warnings that aren't yet handled upstream
+export CXXFLAGS="${CXXFLAGS} -Wno-address -Wno-dangling-else"
+# for wayland
+export CXXFLAGS="${CXXFLAGS} -I/usr/include/wayland -I/usr/include/libxkbcommon"
+%if %{with clang}
+export LDFLAGS="${LDFLAGS} -Wl,--build-id=sha1"
+%endif
+%ifarch aarch64
+%if %{without clang}
+export CXXFLAGS="${CXXFLAGS} -flax-vector-conversions"
+%else
+%if 0%{?sle_version} == 150200
+export CXXFLAGS="${CXXFLAGS} -flax-vector-conversions"
+%else
+export CXXFLAGS="${CXXFLAGS} -flax-vector-conversions=all"
+%endif
+%endif
+%endif
+%if %{without clang}
+export CXXFLAGS="${CXXFLAGS} -Wno-unused-but-set-variable -Wno-packed-not-aligned"
+%endif
+export CFLAGS="${CXXFLAGS}"
+%if %{without clang}
+export CXXFLAGS="${CXXFLAGS} -Wno-subobject-linkage -Wno-class-memaccess"
+%endif
+export CXXFLAGS="${CXXFLAGS} -Wno-invalid-offsetof -fpermissive"
+# do not eat all memory
+%limit_build -m 2600
+%if %{with lto} && %{without clang}
+# reduce the threads for linking even more due to LTO eating ton of memory
+_link_threads=$(((%{jobs} - 2)))
+test "$_link_threads" -le 0 && _link_threads=1
+export LDFLAGS="-flto=$_link_threads --param lto-max-streaming-parallelism=1"
+%endif
 
+# Set system libraries to be used
+gn_system_libraries=(
+    flac
+    fontconfig
+    libdrm
+    libevent
+    libjpeg
+    libpng
+    libxslt
+    libusb
+    libwebp
+    libxml
+    opus
+    re2
+    snappy
+    zlib
+)
+%if %{with system_harfbuzz}
+gn_system_libraries+=(
+    harfbuzz-ng
+    freetype
+)
+%endif
+%if %{with system_icu}
+gn_system_libraries+=( icu )
+%endif
+%if %{with system_vpx}
+gn_system_libraries+=( libvpx )
+%endif
+build/linux/unbundle/replace_gn_files.py --system-libraries ${gn_system_libraries[@]}
+
+# Create the configuration for GN
+# Available options: out/Release/gn args --list out/Release/
 myconf_gn=""
-myconf_gn+=" custom_toolchain=\"./toolchain:default\""
-myconf_gn+=" ffmpeg_branding=\"ChromeOS\""
-myconf_gn+=" proprietary_codecs=true"
-myconf_gn+=" enable_swiftshader=false"
-myconf_gn+=" enable_hevc_demuxing=true"
+myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
 myconf_gn+=" use_custom_libcxx=false"
-myconf_gn+=" use_gio=false"
-myconf_gn+=" use_gnome_keyring=false"
-myconf_gn+=" use_kerberos=false"
-myconf_gn+=" use_cups=false"
+%ifarch x86_64
+myconf_gn+=" host_cpu=\"x64\""
+%endif
+%ifarch riscv64
+myconf_gn+=" host_cpu=\"riscv64\""
+%endif
+myconf_gn+=" host_os=\"linux\""
+myconf_gn+=" is_debug=false"
+myconf_gn+=" enable_nacl=false"
+%if %{with swiftshader}
+myconf_gn+=" use_swiftshader_with_subzero=true"
+%endif
+myconf_gn+=" is_component_ffmpeg=true"
+myconf_gn+=" use_cups=true"
+myconf_gn+=" use_aura=true"
+myconf_gn+=" symbol_level=1"
+myconf_gn+=" blink_symbol_level=0"
+myconf_gn+=" use_kerberos=true"
+myconf_gn+=" enable_vr=false"
+myconf_gn+=" optimize_webui=false"
+myconf_gn+=" enable_reading_list=false"
+myconf_gn+=" use_pulseaudio=true link_pulseaudio=true"
+myconf_gn+=" is_component_build=false"
 myconf_gn+=" use_sysroot=false"
-myconf_gn+=" use_gold=false"
-myconf_gn+=" linux_use_bundled_binutils=false"
 myconf_gn+=" fatal_linker_warnings=false"
+myconf_gn+=" use_allocator=\"partition\""
+myconf_gn+=" use_allocator_shim=true"
+myconf_gn+=" use_partition_alloc=true"
+myconf_gn+=" fieldtrial_testing_like_official_build=true"
+myconf_gn+=" use_gnome_keyring=false"
+myconf_gn+=" use_unofficial_version_number=false"
+myconf_gn+=" use_vaapi=true"
+myconf_gn+=" use_sysroot=false"
 myconf_gn+=" treat_warnings_as_errors=false"
-myconf_gn+=" is_clang=false"
-myconf_gn+=" is_component_build=true"
-myconf_gn+=" is_debug=false"
-myconf_gn+=" symbol_level=0"
-myconf_gn+=" enable_vulkan=true"
+myconf_gn+=" enable_widevine=true"
+myconf_gn+=" use_dbus=true"
+myconf_gn+=" media_use_openh264=false"
+myconf_gn+=" rtc_use_h264=false"
+myconf_gn+=" use_v8_context_snapshot=true"
+myconf_gn+=" v8_use_external_startup_data=true"
+# See dependency logic in third_party/BUILD.gn
+%if %{with system_harfbuzz}
+myconf_gn+=" use_system_harfbuzz=true"
 myconf_gn+=" use_system_freetype=true"
-myconf_gn+=" is_component_ffmpeg=true"
+%endif
+myconf_gn+=" enable_hangout_services_extension=true"
+myconf_gn+=" enable_vulkan=true"
+%if %{with pipewire}
+myconf_gn+=" rtc_use_pipewire=true rtc_link_pipewire=true"
+myconf_gn+=" rtc_pipewire_version=\"0.3\""
+%endif
+%if %{with clang}
+myconf_gn+=" is_clang=true clang_base_path=\"/usr\" clang_use_chrome_plugins=false"
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300
+myconf_gn+=" use_thin_lto=true"
+%endif
+myconf_gn+=" use_lld=true"
+%else
+myconf_gn+=" is_clang=false"
+myconf_gn+=" use_gold=true"
+%endif
+%if %{with lto}
+myconf_gn+=" gcc_lto=true"
+%endif
+%if %{with system_icu}
+myconf_gn+=" icu_use_data_file=false"
+%endif
+
+# The proprietary codecs just force the chromium to say they can use it and
+# offload the actual computation to the ffmpeg, otherwise the chromium
+# won't be able to load the codec even if the library can handle it
+myconf_gn+=" proprietary_codecs=true"
+myconf_gn+=" ffmpeg_branding=\"Chrome\""
+
+%ifarch aarch64
+myconf_gn+=" host_cpu=\"arm64\""
+%endif
+
+# GN does not support passing cflags:
+#  https://bugs.chromium.org/p/chromium/issues/detail?id=642016
+gn gen --args="${myconf_gn}" out/Release
+
+# bundled xcb proto for python2
+export PYTHONPATH="$PWD/xcb-proto-1.14${PYTHONPATH+:}${PYTHONPATH}"
 
-tools/gn/bootstrap/bootstrap.py --gn-gen-args "${myconf_gn}"
-out/Release/gn gen --args="${myconf_gn}" out/Release
-out/Release/gn args --list out/Release/
-ninja %{?_smp_mflags} -C out/Release media/ffmpeg
+ninja -v %{?_smp_mflags} -C out/Release media/ffmpeg
 
 %install
 install -Dm0644 out/Release/libffmpeg.so %{buildroot}%{_libdir}/%{name}/libffmpeg.so

chromium-78-protobuf-RepeatedPtrField-export.patch Added

chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch Added

@@ -0,0 +1,30 @@
+From 00f47df999c9b19e80fdc01db0ae9ca1b6a12b3a Mon Sep 17 00:00:00 2001
+From: vasilvv <vasilvv@google.com>
+Date: Wed, 03 Apr 2019 13:58:53 -0700
+Subject: [PATCH] GCC: do not delete move constructor of QuicStreamSendBuffer
+
+QuicStreamSendBuffer constructor is implicitely required in the
+initialization of the vector of substreams in QuicCryptoStream.
+Though clang apparently ignores that, GCC fails to build.
+
+BUG=chromium:819294
+
+Originally submitted by José Dapena Paz <jose.dapena@lge.com> at https://quiche-review.googlesource.com/c/quiche/+/2420
+
+PiperOrigin-RevId: 241800134
+Change-Id: I4e3c97d6e5895d85340e8c1b740e6196d9104066
+---
+
+diff --git a/net/third_party/quiche/src/quic/core/quic_stream_send_buffer.h b/net/third_party/quiche/src/quic/core/quic_stream_send_buffer.h
+index e34514b..74e9d0d 100644
+--- a/net/third_party/quiche/src/quic/core/quic_stream_send_buffer.h
++++ b/net/third_party/quiche/src/quic/core/quic_stream_send_buffer.h
+@@ -62,7 +62,7 @@
+  public:
+   explicit QuicStreamSendBuffer(QuicBufferAllocator* allocator);
+   QuicStreamSendBuffer(const QuicStreamSendBuffer& other) = delete;
+-  QuicStreamSendBuffer(QuicStreamSendBuffer&& other) = delete;
++  QuicStreamSendBuffer(QuicStreamSendBuffer&& other) = default;
+   ~QuicStreamSendBuffer();
+ 
+   // Save |data_length| of data starts at |iov_offset| in |iov| to send buffer.

chromium-86-ImageMemoryBarrierData-init.patch Added

@@ -0,0 +1,31 @@
+From 2879a6ba43b65c33e3c02432b4ae7a7462d24096 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 28 Aug 2020 07:23:29 +0000
+Subject: [PATCH] GCC: fix ImageMemoryBarrierData initialization
+
+GCC can't convert constant string to char[40]. Use const char * instead.
+Otherwise fails like this:
+
+src/libANGLE/renderer/vulkan/vk_helpers.cpp:121:1: error: could not convert
+'...' from '<brace-enclosed initializer list>' to
+'const angle::PackedEnumMap<rx::vk::ImageLayout, rx::vk::{anonymous}::ImageMemoryBarrierData>'
+---
+ third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.cpp b/third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.cpp
+index af957d7..7fe82ae 100644
+--- a/third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.cpp
++++ b/third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.cpp
+@@ -73,7 +73,7 @@ enum BarrierType
+ 
+ struct ImageMemoryBarrierData
+ {
+-    char name[44];
++    const char *name;
+ 
+     // The Vk layout corresponding to the ImageLayout key.
+     VkImageLayout layout;
+-- 
+2.26.2
+

chromium-86-f_seal.patch Added

chromium-86-fix-vaapi-on-intel.patch Added

@@ -0,0 +1,36 @@
+diff -up chromium-86.0.4240.75/media/gpu/vaapi/vaapi_video_decode_accelerator.cc.vaapi-intel-fix chromium-86.0.4240.75/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
+--- chromium-86.0.4240.75/media/gpu/vaapi/vaapi_video_decode_accelerator.cc.vaapi-intel-fix	2020-10-07 12:38:47.000000000 -0400
++++ chromium-86.0.4240.75/media/gpu/vaapi/vaapi_video_decode_accelerator.cc	2020-10-14 16:20:46.938556042 -0400
+@@ -58,6 +58,7 @@ unsigned int GetVaFormatForVideoCodecPro
+   return VA_RT_FORMAT_YUV420;
+ }
+ 
++#if defined(OS_ANDROID) || BUILDFLAG(IS_CHROMEOS_ASH)
+ // Returns true if the CPU is an Intel Gemini Lake or later (including Kaby
+ // Lake) Cpu platform id's are referenced from the following file in kernel
+ // source arch/x86/include/asm/intel-family.h
+@@ -70,6 +71,7 @@ bool IsGeminiLakeOrLater() {
+       cpuid.model() >= kGeminiLakeModelId;
+   return is_geminilake_or_later;
+ }
++#endif
+ 
+ }  // namespace
+ 
+@@ -1214,6 +1216,8 @@ VaapiVideoDecodeAccelerator::DecideBuffe
+   if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
+     return BufferAllocationMode::kNormal;
+ 
++#if defined(OS_ANDROID) || BUILDFLAG(IS_CHROMEOS_ASH)
++  // Move this to chromeOs only as it is causing problem in some intel linux drivers
+   // On Gemini Lake, Kaby Lake and later we can pass to libva the client's
+   // PictureBuffers to decode onto, which skips the use of the Vpp unit and its
+   // associated format reconciliation copy, avoiding all internal buffer
+@@ -1229,6 +1233,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe
+       num_extra_pics_ = 3;
+     return BufferAllocationMode::kNone;
+   }
++#endif
+ 
+   // For H.264 on older devices, another +1 is experimentally needed for
+   // high-to-high resolution changes.

chromium-86-nearby-explicit.patch Added

@@ -0,0 +1,25 @@
+From 849e5c6b3a8746d9205102bd3df4e140cead405a Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Sat, 18 Jul 2020 15:11:13 +0000
+Subject: [PATCH] GCC: remove explicit from AtomicReference constructor
+
+---
+ .../nearby/src/cpp/platform/public/atomic_reference.h        | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/third_party/nearby/src/cpp/platform/public/atomic_reference.h b/third_party/nearby/src/cpp/platform/public/atomic_reference.h
+index 5742724..bbb8c01 100644
+--- a/third_party/nearby/src/cpp/platform/public/atomic_reference.h
++++ b/third_party/nearby/src/cpp/platform/public/atomic_reference.h
+@@ -37,7 +37,7 @@ class AtomicReference<T, std::enable_if_t<sizeof(T) <= sizeof(std::uint32_t) &&
+     final {
+  public:
+   using Platform = api::ImplementationPlatform;
+-  explicit AtomicReference(T value)
++  AtomicReference(T value)
+       : impl_(Platform::CreateAtomicUint32(static_cast<std::uint32_t>(value))) {
+   }
+   ~AtomicReference() = default;
+-- 
+2.26.2
+

chromium-86-nearby-include.patch Added

chromium-89-missing-cstring-header.patch Added

@@ -0,0 +1,34 @@
+diff -up chromium-89.0.4389.72/third_party/webrtc/audio/utility/channel_mixer.cc.missing-cstring chromium-89.0.4389.72/third_party/webrtc/audio/utility/channel_mixer.cc
+--- chromium-89.0.4389.72/third_party/webrtc/audio/utility/channel_mixer.cc.missing-cstring	2021-03-02 12:48:16.000000000 -0500
++++ chromium-89.0.4389.72/third_party/webrtc/audio/utility/channel_mixer.cc	2021-03-04 13:31:42.894817353 -0500
+@@ -8,6 +8,8 @@
+  *  be found in the AUTHORS file in the root of the source tree.
+  */
+ 
++#include <cstring>
++
+ #include "audio/utility/channel_mixer.h"
+ 
+ #include "audio/utility/channel_mixing_matrix.h"
+diff -up chromium-89.0.4389.72/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc.missing-cstring chromium-89.0.4389.72/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
+--- chromium-89.0.4389.72/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc.missing-cstring	2021-03-04 13:31:42.895817359 -0500
++++ chromium-89.0.4389.72/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc	2021-03-04 13:45:27.795162431 -0500
+@@ -23,6 +23,7 @@
+ #include <sys/mman.h>
+ #include <sys/syscall.h>
+ 
++#include <cstring>
+ #include <memory>
+ #include <utility>
+ 
+diff -up chromium-89.0.4389.72/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc.missing-cstring chromium-89.0.4389.72/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc
+--- chromium-89.0.4389.72/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc.missing-cstring	2021-03-02 12:48:17.000000000 -0500
++++ chromium-89.0.4389.72/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc	2021-03-04 13:31:42.895817359 -0500
+@@ -10,6 +10,7 @@
+ 
+ #include "modules/video_coding/utility/ivf_file_reader.h"
+ 
++#include <cstring>
+ #include <string>
+ #include <vector>
+

chromium-90-fseal.patch Added

@@ -0,0 +1,48 @@
+--- chromium-90.0.4430.85/mojo/core/channel_linux.cc.xx	2021-04-26 10:31:10.188705842 +0200
++++ chromium-90.0.4430.85/mojo/core/channel_linux.cc	2021-04-26 11:23:26.997161282 +0200
+@@ -5,6 +5,21 @@
+ #include "mojo/core/channel_linux.h"
+ 
+ #include <fcntl.h>
++#ifndef F_SEAL_SEAL
++# define F_SEAL_SEAL    0x0001
++#endif
++#ifndef F_SEAL_SHRINK
++# define F_SEAL_SHRINK        0x0002
++#endif
++#ifndef F_SEAL_GROW
++# define F_SEAL_GROW  0x0004
++#endif
++#ifndef F_ADD_SEALS
++# define F_ADD_SEALS    1033
++#endif
++#ifndef F_GET_SEALS
++# define F_GET_SEALS    1034
++#endif
+ #include <linux/futex.h>
+ #include <linux/memfd.h>
+ #include <sys/eventfd.h>
+--- chromium-90.0.4430.85/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc.xx	2021-04-26 16:39:18.387482941 +0200
++++ chromium-90.0.4430.85/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc	2021-04-26 16:40:10.866754337 +0200
+@@ -6,6 +6,21 @@
+ 
+ #include <errno.h>
+ #include <fcntl.h>
++#ifndef F_SEAL_SEAL
++# define F_SEAL_SEAL    0x0001
++#endif
++#ifndef F_SEAL_SHRINK
++# define F_SEAL_SHRINK        0x0002
++#endif
++#ifndef F_SEAL_GROW
++# define F_SEAL_GROW  0x0004
++#endif
++#ifndef F_ADD_SEALS
++# define F_ADD_SEALS    1033
++#endif
++#ifndef F_GET_SEALS
++# define F_GET_SEALS    1034
++#endif
+ #include <linux/net.h>
+ #include <sched.h>
+ #include <signal.h>

chromium-90-ruy-include.patch Added

chromium-91-compiler.patch Added

@@ -0,0 +1,165 @@
+From f4d0b0eb899005b4b8b6388e1d8bb82cc0018fc8 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Wed, 7 Apr 2021 08:50:04 +0000
+Subject: [PATCH] Disable various compiler configs
+
+---
+ build/config/compiler/BUILD.gn | 59 ++++++++++------------------------
+ 1 file changed, 17 insertions(+), 42 deletions(-)
+
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 72ea590..539672d 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -273,8 +273,6 @@ config("compiler") {
+ 
+   configs += [
+     # See the definitions below.
+-    ":clang_revision",
+-    ":compiler_cpu_abi",
+     ":compiler_codegen",
+     ":compiler_deterministic",
+   ]
+@@ -518,24 +516,6 @@ config("compiler") {
+     ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
+   }
+ 
+-  if (is_clang && !is_nacl && !use_xcode_clang) {
+-    cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
+-
+-    # TODO(hans): Remove this once Clang generates better optimized debug info
+-    # by default. https://crbug.com/765793
+-    cflags += [
+-      "-mllvm",
+-      "-instcombine-lower-dbg-declare=0",
+-    ]
+-    if (!is_debug && use_thin_lto && is_a_target_toolchain) {
+-      if (is_win) {
+-        ldflags += [ "-mllvm:-instcombine-lower-dbg-declare=0" ]
+-      } else {
+-        ldflags += [ "-Wl,-mllvm,-instcombine-lower-dbg-declare=0" ]
+-      }
+-    }
+-  }
+-
+   # C11/C++11 compiler flags setup.
+   # ---------------------------
+   if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) ||
+@@ -1643,7 +1623,7 @@ config("chromium_code") {
+       defines = [ "_HAS_NODISCARD" ]
+     }
+   } else {
+-    cflags = [ "-Wall" ]
++    cflags = []
+     if (treat_warnings_as_errors) {
+       cflags += [ "-Werror" ]
+ 
+@@ -1652,10 +1632,6 @@ config("chromium_code") {
+       # well.
+       ldflags = [ "-Werror" ]
+     }
+-    if (is_clang) {
+-      # Enable extra warnings for chromium_code when we control the compiler.
+-      cflags += [ "-Wextra" ]
+-    }
+ 
+     # In Chromium code, we define __STDC_foo_MACROS in order to get the
+     # C99 macros on Mac and Linux.
+@@ -1664,15 +1640,6 @@ config("chromium_code") {
+       "__STDC_FORMAT_MACROS",
+     ]
+ 
+-    if (!is_debug && !using_sanitizer && current_cpu != "s390x" &&
+-        current_cpu != "s390" && current_cpu != "ppc64" &&
+-        current_cpu != "mips" && current_cpu != "mips64") {
+-      # Non-chromium code is not guaranteed to compile cleanly with
+-      # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
+-      # disabled, so only do that for Release build.
+-      defines += [ "_FORTIFY_SOURCE=2" ]
+-    }
+-
+     if (is_mac) {
+       cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
+       cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
+@@ -2068,7 +2035,8 @@ config("default_stack_frames") {
+ }
+ 
+ # Default "optimization on" config.
+-config("optimize") {
++config("optimize") { }
++config("xoptimize") {
+   if (is_win) {
+     if (chrome_pgo_phase != 2) {
+       # Favor size over speed, /O1 must be before the common flags.
+@@ -2103,7 +2071,8 @@ config("optimize") {
+ }
+ 
+ # Turn off optimizations.
+-config("no_optimize") {
++config("no_optimize") { }
++config("xno_optimize") {
+   if (is_win) {
+     cflags = [
+       "/Od",  # Disable optimization.
+@@ -2143,7 +2112,8 @@ config("no_optimize") {
+ # Turns up the optimization level. On Windows, this implies whole program
+ # optimization and link-time code generation which is very expensive and should
+ # be used sparingly.
+-config("optimize_max") {
++config("optimize_max") { }
++config("xoptimize_max") {
+   if (is_nacl && is_nacl_irt) {
+     # The NaCl IRT is a special case and always wants its own config.
+     # Various components do:
+@@ -2175,7 +2145,8 @@ config("optimize_max") {
+ #
+ # TODO(crbug.com/621335) - rework how all of these configs are related
+ # so that we don't need this disclaimer.
+-config("optimize_speed") {
++config("optimize_speed") { }
++config("xoptimize_speed") {
+   if (is_nacl && is_nacl_irt) {
+     # The NaCl IRT is a special case and always wants its own config.
+     # Various components do:
+@@ -2200,7 +2171,8 @@ config("optimize_speed") {
+   }
+ }
+ 
+-config("optimize_fuzzing") {
++config("optimize_fuzzing") { }
++config("xoptimize_fuzzing") {
+   cflags = [ "-O1" ] + common_optimize_on_cflags
+   ldflags = common_optimize_on_ldflags
+   visibility = [ ":default_optimization" ]
+@@ -2319,7 +2291,8 @@ config("win_pdbaltpath") {
+ }
+ 
+ # Full symbols.
+-config("symbols") {
++config("symbols") { }
++config("xsymbols") {
+   if (is_win) {
+     if (is_clang) {
+       cflags = [ "/Z7" ]  # Debug information in the .obj files.
+@@ -2422,7 +2395,8 @@ config("symbols") {
+ # Minimal symbols.
+ # This config guarantees to hold symbol for stack trace which are shown to user
+ # when crash happens in unittests running on buildbot.
+-config("minimal_symbols") {
++config("minimal_symbols") { }
++config("xminimal_symbols") {
+   if (is_win) {
+     # Functions, files, and line tables only.
+     cflags = []
+@@ -2481,7 +2455,8 @@ config("minimal_symbols") {
+ # This configuration contains function names only. That is, the compiler is
+ # told to not generate debug information and the linker then just puts function
+ # names in the final debug information.
+-config("no_symbols") {
++config("no_symbols") { }
++config("xno_symbols") {
+   if (is_win) {
+     ldflags = [ "/DEBUG" ]
+ 
+-- 
+2.26.3

chromium-91-java-only-allowed-in-android-builds.patch Added

chromium-91-libyuv-aarch64.patch Added

@@ -0,0 +1,91 @@
+diff --git a/third_party/libyuv/source/row_neon64.cc b/third_party/libyuv/source/row_neon64.cc
+index 350c964..2aab413 100644
+--- a/third_party/libyuv/source/row_neon64.cc
++++ b/third_party/libyuv/source/row_neon64.cc
+@@ -1835,7 +1835,7 @@ void ARGBToAB64Row_NEON(const uint8_t* src_argb,
+       : "+r"(src_argb),          // %0
+         "+r"(dst_ab64),          // %1
+         "+r"(width)              // %2
+-      : "m"(kShuffleARGBToABGR)  // %3
++      : "Q"(kShuffleARGBToABGR)  // %3
+       : "cc", "memory", "v0", "v1", "v2", "v3", "v4");
+ }
+ 
+@@ -1859,7 +1859,7 @@ void AR64ToARGBRow_NEON(const uint16_t* src_ar64,
+       : "+r"(src_ar64),          // %0
+         "+r"(dst_argb),          // %1
+         "+r"(width)              // %2
+-      : "m"(kShuffleAR64ToARGB)  // %3
++      : "Q"(kShuffleAR64ToARGB)  // %3
+       : "cc", "memory", "v0", "v1", "v2", "v3", "v4");
+ }
+ 
+@@ -1883,7 +1883,7 @@ void AB64ToARGBRow_NEON(const uint16_t* src_ab64,
+       : "+r"(src_ab64),          // %0
+         "+r"(dst_argb),          // %1
+         "+r"(width)              // %2
+-      : "m"(kShuffleAB64ToARGB)  // %3
++      : "Q"(kShuffleAB64ToARGB)  // %3
+       : "cc", "memory", "v0", "v1", "v2", "v3", "v4");
+ }
+ 
+diff --git a/third_party/libyuv/source/scale_neon64.cc b/third_party/libyuv/source/scale_neon64.cc
+index 8656fec..9f9636e 100644
+--- a/third_party/libyuv/source/scale_neon64.cc
++++ b/third_party/libyuv/source/scale_neon64.cc
+@@ -601,8 +601,8 @@ void ScaleRowUp2_Bilinear_NEON(const uint8_t* src_ptr,
+       "umlal       v4.8h, v1.8b, v31.8b          \n"  // 3*near+far (2, odd)
+       "umlal       v5.8h, v0.8b, v31.8b          \n"  // 3*near+far (2, even)
+ 
+-      "mov         v0.8h, v4.8h                  \n"
+-      "mov         v1.8h, v5.8h                  \n"
++      "mov         v0.16b, v4.16b                \n"
++      "mov         v1.16b, v5.16b                \n"
+       "mla         v4.8h, v2.8h, v30.8h          \n"  // 9 3 3 1 (1, odd)
+       "mla         v5.8h, v3.8h, v30.8h          \n"  // 9 3 3 1 (1, even)
+       "mla         v2.8h, v0.8h, v30.8h          \n"  // 9 3 3 1 (2, odd)
+@@ -642,7 +642,7 @@ void ScaleRowUp2_Linear_12_NEON(const uint16_t* src_ptr,
+       "ld1         {v1.8h}, [%1], #16            \n"  // 12345678 (16b)
+       "prfm        pldl1keep, [%0, 448]          \n"  // prefetch 7 lines ahead
+ 
+-      "mov         v2.8h, v0.8h                  \n"
++      "mov         v2.16b, v0.16b                \n"
+       "mla         v0.8h, v1.8h, v31.8h          \n"  // 3*near+far (odd)
+       "mla         v1.8h, v2.8h, v31.8h          \n"  // 3*near+far (even)
+ 
+@@ -679,7 +679,7 @@ void ScaleRowUp2_Bilinear_12_NEON(const uint16_t* src_ptr,
+       "ld1         {v3.8h}, [%2], #16            \n"  // 12345678 (16b)
+       "prfm        pldl1keep, [%0, 448]          \n"  // prefetch 7 lines ahead
+ 
+-      "mov         v0.8h, v2.8h                  \n"
++      "mov         v0.16b, v2.16b                \n"
+       "mla         v2.8h, v3.8h, v31.8h          \n"  // 3*near+far (odd)
+       "mla         v3.8h, v0.8h, v31.8h          \n"  // 3*near+far (even)
+ 
+@@ -687,12 +687,12 @@ void ScaleRowUp2_Bilinear_12_NEON(const uint16_t* src_ptr,
+       "ld1         {v5.8h}, [%3], #16            \n"  // 12345678 (16b)
+       "prfm        pldl1keep, [%1, 448]          \n"  // prefetch 7 lines ahead
+ 
+-      "mov         v0.8h, v4.8h                  \n"
++      "mov         v0.16b, v4.16b                \n"
+       "mla         v4.8h, v5.8h, v31.8h          \n"  // 3*near+far (odd)
+       "mla         v5.8h, v0.8h, v31.8h          \n"  // 3*near+far (even)
+ 
+-      "mov         v0.8h, v4.8h                  \n"
+-      "mov         v1.8h, v5.8h                  \n"
++      "mov         v0.16b, v4.16b                \n"
++      "mov         v1.16b, v5.16b                \n"
+       "mla         v4.8h, v2.8h, v31.8h          \n"  // 9 3 3 1 (1, odd)
+       "mla         v5.8h, v3.8h, v31.8h          \n"  // 9 3 3 1 (1, even)
+       "mla         v2.8h, v0.8h, v31.8h          \n"  // 9 3 3 1 (2, odd)
+@@ -887,8 +887,8 @@ void ScaleUVRowUp2_Bilinear_NEON(const uint8_t* src_ptr,
+       "umlal       v4.8h, v1.8b, v31.8b          \n"  // 3*near+far (2, odd)
+       "umlal       v5.8h, v0.8b, v31.8b          \n"  // 3*near+far (2, even)
+ 
+-      "mov         v0.8h, v4.8h                  \n"
+-      "mov         v1.8h, v5.8h                  \n"
++      "mov         v0.16b, v4.16b                \n"
++      "mov         v1.16b, v5.16b                \n"
+       "mla         v4.8h, v2.8h, v30.8h          \n"  // 9 3 3 1 (1, odd)
+       "mla         v5.8h, v3.8h, v30.8h          \n"  // 9 3 3 1 (1, even)
+       "mla         v2.8h, v0.8h, v30.8h          \n"  // 9 3 3 1 (2, odd)

chromium-91-sql-standard-layout-type.patch Added

@@ -0,0 +1,238 @@
+From 80368f8ba7a8bab13440463a254888311efe3986 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Tue, 4 May 2021 15:00:19 +0000
+Subject: [PATCH] sql: make VirtualCursor standard layout type
+
+sql::recover::VirtualCursor needs to be a standard layout type, but
+has members of type std::unique_ptr. However, std::unique_ptr is not
+guaranteed to be standard layout. Compiling with clang combined with
+gcc-11 libstdc++ fails because of this. Replace std::unique_ptr with
+raw pointers.
+
+Bug: 1189788
+Change-Id: Ia6dc388cc5ef1c0f2afc75f8ca45b9f12687ca9c
+---
+ sql/recover_module/btree.cc  | 21 +++++++++++++++------
+ sql/recover_module/btree.h   | 17 +++++++++++++----
+ sql/recover_module/cursor.cc | 24 ++++++++++++------------
+ sql/recover_module/cursor.h  |  2 +-
+ sql/recover_module/pager.cc  |  7 +++----
+ sql/recover_module/pager.h   |  5 +++--
+ 6 files changed, 47 insertions(+), 29 deletions(-)
+
+diff --git a/sql/recover_module/btree.cc b/sql/recover_module/btree.cc
+index 9ecaafe8a3..839318abf9 100644
+--- a/sql/recover_module/btree.cc
++++ b/sql/recover_module/btree.cc
+@@ -135,16 +135,25 @@ static_assert(std::is_trivially_destructible<LeafPageDecoder>::value,
+               "Move the destructor to the .cc file if it's non-trival");
+ #endif  // !DCHECK_IS_ON()
+ 
+-LeafPageDecoder::LeafPageDecoder(DatabasePageReader* db_reader) noexcept
+-    : page_id_(db_reader->page_id()),
+-      db_reader_(db_reader),
+-      cell_count_(ComputeCellCount(db_reader)),
+-      next_read_index_(0),
+-      last_record_size_(0) {
++void LeafPageDecoder::Initialize(DatabasePageReader* db_reader) {
++  DCHECK(db_reader);
+   DCHECK(IsOnValidPage(db_reader));
++  page_id_ = db_reader->page_id();
++  db_reader_ = db_reader;
++  cell_count_ = ComputeCellCount(db_reader);
++  next_read_index_ = 0;
++  last_record_size_ = 0;
+   DCHECK(DatabasePageReader::IsValidPageId(page_id_));
+ }
+ 
++void LeafPageDecoder::Reset() {
++  db_reader_ = nullptr;
++  page_id_ = 0;
++  cell_count_ = 0;
++  next_read_index_ = 0;
++  last_record_size_ = 0;
++}
++
+ bool LeafPageDecoder::TryAdvance() {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+   DCHECK(CanAdvance());
+diff --git a/sql/recover_module/btree.h b/sql/recover_module/btree.h
+index d76d076bf6..33114b01fa 100644
+--- a/sql/recover_module/btree.h
++++ b/sql/recover_module/btree.h
+@@ -102,7 +102,7 @@ class LeafPageDecoder {
+   //
+   // |db_reader| must have been used to read an inner page of a table B-tree.
+   // |db_reader| must outlive this instance.
+-  explicit LeafPageDecoder(DatabasePageReader* db_reader) noexcept;
++  explicit LeafPageDecoder() noexcept = default;
+   ~LeafPageDecoder() noexcept = default;
+ 
+   LeafPageDecoder(const LeafPageDecoder&) = delete;
+@@ -150,6 +150,15 @@ class LeafPageDecoder {
+   // read as long as CanAdvance() returns true.
+   bool TryAdvance();
+ 
++  // Initialize with DatabasePageReader
++  void Initialize(DatabasePageReader* db_reader);
++
++  // Reset internal DatabasePageReader
++  void Reset();
++
++  // True if DatabasePageReader is valid
++  bool IsValid() { return (db_reader_ != nullptr); }
++
+   // True if the given reader may point to an inner page in a table B-tree.
+   //
+   // The last ReadPage() call on |db_reader| must have succeeded.
+@@ -163,14 +172,14 @@ class LeafPageDecoder {
+   static int ComputeCellCount(DatabasePageReader* db_reader);
+ 
+   // The number of the B-tree page this reader is reading.
+-  const int64_t page_id_;
++  int64_t page_id_;
+   // Used to read the tree page.
+   //
+   // Raw pointer usage is acceptable because this instance's owner is expected
+   // to ensure that the DatabasePageReader outlives this.
+-  DatabasePageReader* const db_reader_;
++  DatabasePageReader* db_reader_;
+   // Caches the ComputeCellCount() value for this reader's page.
+-  const int cell_count_ = ComputeCellCount(db_reader_);
++  int cell_count_;
+ 
+   // The reader's cursor state.
+   //
+diff --git a/sql/recover_module/cursor.cc b/sql/recover_module/cursor.cc
+index 0029ff9295..42548bc4b5 100644
+--- a/sql/recover_module/cursor.cc
++++ b/sql/recover_module/cursor.cc
+@@ -26,7 +26,7 @@ VirtualCursor::~VirtualCursor() {
+ int VirtualCursor::First() {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+   inner_decoders_.clear();
+-  leaf_decoder_ = nullptr;
++  leaf_decoder_.Reset();
+ 
+   AppendPageDecoder(table_->root_page_id());
+   return Next();
+@@ -36,18 +36,18 @@ int VirtualCursor::Next() {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+   record_reader_.Reset();
+ 
+-  while (!inner_decoders_.empty() || leaf_decoder_.get()) {
+-    if (leaf_decoder_.get()) {
+-      if (!leaf_decoder_->CanAdvance()) {
++  while (!inner_decoders_.empty() || leaf_decoder_.IsValid()) {
++    if (leaf_decoder_.IsValid()) {
++      if (!leaf_decoder_.CanAdvance()) {
+         // The leaf has been exhausted. Remove it from the DFS stack.
+-        leaf_decoder_ = nullptr;
++        leaf_decoder_.Reset();
+         continue;
+       }
+-      if (!leaf_decoder_->TryAdvance())
++      if (!leaf_decoder_.TryAdvance())
+         continue;
+ 
+-      if (!payload_reader_.Initialize(leaf_decoder_->last_record_size(),
+-                                      leaf_decoder_->last_record_offset())) {
++      if (!payload_reader_.Initialize(leaf_decoder_.last_record_size(),
++                                      leaf_decoder_.last_record_offset())) {
+         continue;
+       }
+       if (!record_reader_.Initialize())
+@@ -99,13 +99,13 @@ int VirtualCursor::ReadColumn(int column_index,
+ int64_t VirtualCursor::RowId() {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+   DCHECK(record_reader_.IsInitialized());
+-  DCHECK(leaf_decoder_.get());
+-  return leaf_decoder_->last_record_rowid();
++  DCHECK(leaf_decoder_.IsValid());
++  return leaf_decoder_.last_record_rowid();
+ }
+ 
+ void VirtualCursor::AppendPageDecoder(int page_id) {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+-  DCHECK(leaf_decoder_.get() == nullptr)
++  DCHECK(!leaf_decoder_.IsValid())
+       << __func__
+       << " must only be called when the current path has no leaf decoder";
+ 
+@@ -113,7 +113,7 @@ void VirtualCursor::AppendPageDecoder(int page_id) {
+     return;
+ 
+   if (LeafPageDecoder::IsOnValidPage(&db_reader_)) {
+-    leaf_decoder_ = std::make_unique<LeafPageDecoder>(&db_reader_);
++    leaf_decoder_.Initialize(&db_reader_);
+     return;
+   }
+ 
+diff --git a/sql/recover_module/cursor.h b/sql/recover_module/cursor.h
+index afcd6900e1..b15c31d425 100644
+--- a/sql/recover_module/cursor.h
++++ b/sql/recover_module/cursor.h
+@@ -129,7 +129,7 @@ class VirtualCursor {
+   std::vector<std::unique_ptr<InnerPageDecoder>> inner_decoders_;
+ 
+   // Decodes the leaf page containing records.
+-  std::unique_ptr<LeafPageDecoder> leaf_decoder_;
++  LeafPageDecoder leaf_decoder_;
+ 
+   SEQUENCE_CHECKER(sequence_checker_);
+ };
+diff --git a/sql/recover_module/pager.cc b/sql/recover_module/pager.cc
+index 58e75de270..5fe96204e5 100644
+--- a/sql/recover_module/pager.cc
++++ b/sql/recover_module/pager.cc
+@@ -23,8 +23,7 @@ static_assert(DatabasePageReader::kMaxPageId <= std::numeric_limits<int>::max(),
+               "ints are not appropriate for representing page IDs");
+ 
+ DatabasePageReader::DatabasePageReader(VirtualTable* table)
+-    : page_data_(std::make_unique<uint8_t[]>(table->page_size())),
+-      table_(table) {
++    : page_data_(), table_(table) {
+   DCHECK(table != nullptr);
+   DCHECK(IsValidPageSize(table->page_size()));
+ }
+@@ -57,8 +56,8 @@ int DatabasePageReader::ReadPage(int page_id) {
+                     std::numeric_limits<int64_t>::max(),
+                 "The |read_offset| computation above may overflow");
+ 
+-  int sqlite_status =
+-      RawRead(sqlite_file, read_size, read_offset, page_data_.get());
++  int sqlite_status = RawRead(sqlite_file, read_size, read_offset,
++                              const_cast<uint8_t*>(page_data_.data()));
+ 
+   // |page_id_| needs to be set to kInvalidPageId if the read failed.
+   // Otherwise, future ReadPage() calls with the previous |page_id_| value
+diff --git a/sql/recover_module/pager.h b/sql/recover_module/pager.h
+index 0e388ddc3b..99314e30ff 100644
+--- a/sql/recover_module/pager.h
++++ b/sql/recover_module/pager.h
+@@ -5,6 +5,7 @@
+ #ifndef SQL_RECOVER_MODULE_PAGER_H_
+ #define SQL_RECOVER_MODULE_PAGER_H_
+ 
++#include <array>
+ #include <cstdint>
+ #include <memory>
+ 
+@@ -70,7 +71,7 @@ class DatabasePageReader {
+     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+     DCHECK_NE(page_id_, kInvalidPageId)
+         << "Successful ReadPage() required before accessing pager state";
+-    return page_data_.get();
++    return page_data_.data();
+   }
+ 
+   // The number of bytes in the page read by the last ReadPage() call.
+@@ -137,7 +138,7 @@ class DatabasePageReader {
+   int page_id_ = kInvalidPageId;
+   // Stores the bytes of the last page successfully read by ReadPage().
+   // The content is undefined if the last call to ReadPage() did not succeed.
+-  const std::unique_ptr<uint8_t[]> page_data_;
++  const std::array<uint8_t, kMaxPageSize> page_data_;
+   // Raw pointer usage is acceptable because this instance's owner is expected
+   // to ensure that the VirtualTable outlives this.
+   VirtualTable* const table_;

chromium-93-BluetoothLowEnergyScanFilter-include.patch Added

@@ -0,0 +1,30 @@
+From 2f5514051210388bfcff605570d33f08cfa7bcaa Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Wed, 21 Jul 2021 08:34:58 +0000
+Subject: [PATCH] IWYU: usage of unique_ptr requires including <memory> in bluetooth low energy scan filter.
+
+Fix build because of missing include:
+../../device/bluetooth/bluetooth_low_energy_scan_filter.h:57:15: error: ‘unique_ptr’ in namespace ‘std’ does not name a template type
+   57 |   static std::unique_ptr<BluetoothLowEnergyScanFilter> Create(
+      |               ^~~~~~~~~~
+
+Bug: 819294
+Change-Id: I347953a083f1bcdf744fd86e1a73954c6f86b32e
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041155
+Reviewed-by: Reilly Grant <reillyg@chromium.org>
+Commit-Queue: José Dapena Paz <jdapena@igalia.com>
+Cr-Commit-Position: refs/heads/master@{#903819}
+---
+
+diff --git a/device/bluetooth/bluetooth_low_energy_scan_filter.h b/device/bluetooth/bluetooth_low_energy_scan_filter.h
+index a0436c1..7ae606c 100644
+--- a/device/bluetooth/bluetooth_low_energy_scan_filter.h
++++ b/device/bluetooth/bluetooth_low_energy_scan_filter.h
+@@ -7,6 +7,7 @@
+ 
+ #include <stddef.h>
+ #include <stdint.h>
++#include <memory>
+ #include <vector>
+ 
+ #include "base/time/time.h"

chromium-93-ClassProperty-include.patch Added

@@ -0,0 +1,30 @@
+From 8ae99ee447cf5f0160ea4ae978cdf37f5dcecd1e Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Wed, 21 Jul 2021 08:36:20 +0000
+Subject: [PATCH] IWYU: missing memory include for unique_ptr usage in class_property.h
+
+Fix GCC build breakage because of missing inclide:
+./../ui/base/class_property.h:120:58: error: ‘std::unique_ptr’ has not been declared
+  120 |   T* SetProperty(const ClassProperty<T*>* property, std::unique_ptr<T> value);
+      |                                                          ^~~~~~~~~~
+
+Bug: 819294
+Change-Id: I46b921876702b8d44674689bbb5acdc107db21e5
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041030
+Reviewed-by: Peter Boström <pbos@chromium.org>
+Commit-Queue: José Dapena Paz <jdapena@igalia.com>
+Cr-Commit-Position: refs/heads/master@{#903820}
+---
+
+diff --git a/ui/base/class_property.h b/ui/base/class_property.h
+index f7b2f55..88b4938 100644
+--- a/ui/base/class_property.h
++++ b/ui/base/class_property.h
+@@ -8,6 +8,7 @@
+ #include <stdint.h>
+ 
+ #include <map>
++#include <memory>
+ #include <set>
+ #include <type_traits>
+

chromium-93-ContextSet-permissive.patch Added

@@ -0,0 +1,47 @@
+From 7108f83c8ad1bad4072e4f32da3db6d59cf51400 Mon Sep 17 00:00:00 2001
+From: Ivan Murashov <ivan.murashov@lge.com>
+Date: Tue, 20 Jul 2021 13:16:44 +0300
+Subject: [PATCH] GCC: Remove double declaration of ContextSet
+
+After the CL
+https://chromium-review.googlesource.com/c/angle/angle/+/2965780
+the build with GCC failed with error:
+/third_party/angle/src/libANGLE/Display.h:325:37: error: declaration of
+'typedef class std::__1::set<gl::Context*> egl::Display::ContextSet'
+changes meaning of 'ContextSet' [-fpermissive]
+/third_party/angle/src/libANGLE/Display.h:75:7: note: 'ContextSet'
+declared here as 'using ContextSet = class std::__1::set<gl::Context*>'
+
+To fix the error the double declaration of ContextSet is removed.
+
+Bug: angleproject:5878, chromium:819294
+Change-Id: Id9e52061af53ea18dd5d13b960daaa67a14f61ca
+Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3038804
+Reviewed-by: Jamie Madill <jmadill@chromium.org>
+Commit-Queue: Jamie Madill <jmadill@chromium.org>
+---
+
+diff --git a/third_party/angle/CONTRIBUTORS b/third_party/angle/CONTRIBUTORS
+index 887ddc2..94b1b4d 100644
+--- a/third_party/angle/CONTRIBUTORS
++++ b/third_party/angle/CONTRIBUTORS
+@@ -154,6 +154,7 @@
+ 
+ LG Electronics, Inc.
+  Jani Hautakangas
++ Ivan Murashov
+ 
+ IBM Inc.
+  Junliang Yan
+diff --git a/third_party/angle/src/libANGLE/Display.h b/third_party/angle/src/libANGLE/Display.h
+index f33123b..f0c0910 100644
+--- a/third_party/angle/src/libANGLE/Display.h
++++ b/third_party/angle/src/libANGLE/Display.h
+@@ -322,7 +322,6 @@
+ 
+     ConfigSet mConfigSet;
+ 
+-    typedef std::set<gl::Context *> ContextSet;
+     ContextSet mContextSet;
+ 
+     typedef std::set<Image *> ImageSet;

chromium-93-DevToolsEmbedderMessageDispatcher-include.patch Added

chromium-93-EnumTable-crash.patch Added

@@ -0,0 +1,79 @@
+diff --git a/components/cast_channel/enum_table.h b/components/cast_channel/enum_table.h
+index a63ae86..83ada65 100644
+--- a/components/cast_channel/enum_table.h
++++ b/components/cast_channel/enum_table.h
+@@ -8,6 +8,7 @@
+ #include <cstdint>
+ #include <cstring>
+ #include <ostream>
++#include <vector>
+ 
+ #include "base/check_op.h"
+ #include "base/macros.h"
+@@ -213,7 +214,7 @@ class
+ 
+   template <typename E>
+   friend class EnumTable;
+-  DISALLOW_COPY_AND_ASSIGN(GenericEnumTableEntry);
++  DISALLOW_ASSIGN(GenericEnumTableEntry);
+ };
+ 
+ // Yes, these constructors really needs to be inlined.  Even though they look
+@@ -251,8 +252,7 @@ class EnumTable {
+     // Constructor for regular entries.
+     constexpr Entry(E value, base::StringPiece str)
+         : GenericEnumTableEntry(static_cast<int32_t>(value), str) {}
+-
+-    DISALLOW_COPY_AND_ASSIGN(Entry);
++    DISALLOW_ASSIGN(Entry);
+   };
+ 
+   static_assert(sizeof(E) <= sizeof(int32_t),
+@@ -307,15 +307,14 @@ class EnumTable {
+     if (is_sorted_) {
+       const std::size_t index = static_cast<std::size_t>(value);
+       if (ANALYZER_ASSUME_TRUE(index < data_.size())) {
+-        const auto& entry = data_.begin()[index];
++        const auto& entry = data_[index];
+         if (ANALYZER_ASSUME_TRUE(entry.has_str()))
+           return entry.str();
+       }
+       return absl::nullopt;
+     }
+     return GenericEnumTableEntry::FindByValue(
+-        reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
+-        data_.size(), static_cast<int32_t>(value));
++        &data_[0], data_.size(), static_cast<int32_t>(value));
+   }
+ 
+   // This overload of GetString is designed for cases where the argument is a
+@@ -343,8 +342,7 @@ class EnumTable {
+   // enum value directly.
+   absl::optional<E> GetEnum(base::StringPiece str) const {
+     auto* entry = GenericEnumTableEntry::FindByString(
+-        reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
+-        data_.size(), str);
++        &data_[0], data_.size(), str);
+     return entry ? static_cast<E>(entry->value) : absl::optional<E>();
+   }
+ 
+@@ -359,7 +357,7 @@ class EnumTable {
+   // Align the data on a cache line boundary.
+   alignas(64)
+ #endif
+-      std::initializer_list<Entry> data_;
++      const std::vector<Entry> data_;
+   bool is_sorted_;
+ 
+   constexpr EnumTable(std::initializer_list<Entry> data, bool is_sorted)
+@@ -371,8 +369,8 @@ class EnumTable {
+ 
+     for (std::size_t i = 0; i < data.size(); i++) {
+       for (std::size_t j = i + 1; j < data.size(); j++) {
+-        const Entry& ei = data.begin()[i];
+-        const Entry& ej = data.begin()[j];
++        const Entry& ei = data[i];
++        const Entry& ej = data[j];
+         DCHECK(ei.value != ej.value)
+             << "Found duplicate enum values at indices " << i << " and " << j;
+         DCHECK(!(ei.has_str() && ej.has_str() && ei.str() == ej.str()))

chromium-93-FormForest-constexpr.patch Added

@@ -0,0 +1,49 @@
+From 802150d7be94e5317b257df545d55ce5b007ae65 Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Tue, 20 Jul 2021 18:50:11 +0000
+Subject: [PATCH] libstdc++: do not use unique_ptr bool() operator in a constexpr in form_forest.h
+
+Fix build breakage in GCC, because of calling non constexpr functions from a
+constexpr function. In this case, libstdc++ unique_ptr bool() operator is not
+constexpr, so it cannot be used inside CompareByFrameToken.
+
+An example of build breakage caused by this:
+    ../../components/autofill/content/browser/form_forest.h:157:21: error: call to non-‘constexpr’ function ‘std::unique_ptr<_Tp, _Dp>::operator bool() const [with _Tp = autofill::internal::FormForest::FrameData; _Dp = std::default_delete<autofill::internal::FormForest::FrameData>]’
+      157 |         return f && g ? f->frame_token < g->frame_token : f.get() < g.get();
+          |                     ^
+
+Bug: 957519
+Change-Id: I3c49559084fe58886a03520729873b7c4ac89bbf
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041050
+Commit-Queue: Dominic Battré <battre@chromium.org>
+Reviewed-by: Dominic Battré <battre@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#903595}
+---
+
+diff --git a/components/autofill/content/browser/form_forest.h b/components/autofill/content/browser/form_forest.h
+index c89a8eb..f414ab8 100644
+--- a/components/autofill/content/browser/form_forest.h
++++ b/components/autofill/content/browser/form_forest.h
+@@ -152,16 +152,16 @@
+     // used by FrameData sets.
+     struct CompareByFrameToken {
+       using is_transparent = void;
+-      constexpr bool operator()(const std::unique_ptr<FrameData>& f,
+-                                const std::unique_ptr<FrameData>& g) const {
++      bool operator()(const std::unique_ptr<FrameData>& f,
++                      const std::unique_ptr<FrameData>& g) const {
+         return f && g ? f->frame_token < g->frame_token : f.get() < g.get();
+       }
+-      constexpr bool operator()(const std::unique_ptr<FrameData>& f,
+-                                const LocalFrameToken& g) const {
++      bool operator()(const std::unique_ptr<FrameData>& f,
++                      const LocalFrameToken& g) const {
+         return f ? f->frame_token < g : true;
+       }
+-      constexpr bool operator()(const LocalFrameToken& f,
+-                                const std::unique_ptr<FrameData>& g) const {
++      bool operator()(const LocalFrameToken& f,
++                      const std::unique_ptr<FrameData>& g) const {
+         return g ? f < g->frame_token : false;
+       }
+     };

chromium-93-HashPasswordManager-include.patch Added

@@ -0,0 +1,30 @@
+From 17d0e3dfcd0690df0e7b212fedcb95402f16935d Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Fri, 23 Jul 2021 10:17:49 +0000
+Subject: [PATCH] IWYU: missing include for using std::vector in hash password manager.
+
+Fix build breakage:
+../../components/password_manager/core/browser/hash_password_manager.h:44:8: error: ‘vector’ in namespace ‘std’ does not name a template type
+   44 |   std::vector<PasswordHashData> RetrieveAllPasswordHashes();
+      |        ^~~~~~
+
+Bug: 819294
+Change-Id: I8c8a4ec3972eedb87a312c5ec56adf4a21b1b2a2
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041046
+Commit-Queue: Vasilii Sukhanov <vasilii@chromium.org>
+Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#904696}
+---
+
+diff --git a/components/password_manager/core/browser/hash_password_manager.h b/components/password_manager/core/browser/hash_password_manager.h
+index c762c5a..85e656ed 100644
+--- a/components/password_manager/core/browser/hash_password_manager.h
++++ b/components/password_manager/core/browser/hash_password_manager.h
+@@ -6,6 +6,7 @@
+ #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_HASH_PASSWORD_MANAGER_H_
+ 
+ #include <string>
++#include <vector>
+ 
+ #include "base/callback.h"
+ #include "base/callback_list.h"

chromium-93-InkDropHost-crash.patch Added

@@ -0,0 +1,25 @@
+diff --git a/ui/views/animation/ink_drop_host_view.h b/ui/views/animation/ink_drop_host_view.h
+index bd0975b..e5df288 100644
+--- a/ui/views/animation/ink_drop_host_view.h
++++ b/ui/views/animation/ink_drop_host_view.h
+@@ -238,6 +238,11 @@ class VIEWS_EXPORT InkDropHost {
+   // Used to observe View and inform the InkDrop of host-transform changes.
+   ViewLayerTransformObserver host_view_transform_observer_;
+ 
++  // Declared before |ink_drop_|, because InkDropImpl may call
++  // RemoveInkDropLayer on partly destructed InkDropHost. In
++  // that case |ink_drop_mask_| must be still valid.
++  std::unique_ptr<views::InkDropMask> ink_drop_mask_;
++
+   // Should not be accessed directly. Use GetInkDrop() instead.
+   std::unique_ptr<InkDrop> ink_drop_;
+ 
+@@ -261,8 +266,6 @@ class VIEWS_EXPORT InkDropHost {
+   int ink_drop_small_corner_radius_ = 2;
+   int ink_drop_large_corner_radius_ = 4;
+ 
+-  std::unique_ptr<views::InkDropMask> ink_drop_mask_;
+-
+   base::RepeatingCallback<std::unique_ptr<InkDrop>()> create_ink_drop_callback_;
+   base::RepeatingCallback<std::unique_ptr<InkDropRipple>()>
+       create_ink_drop_ripple_callback_;

chromium-93-ScopedTestDialogAutoConfirm-include.patch Added

chromium-93-ffmpeg-4.4.patch Added

@@ -0,0 +1,85 @@
+From: 52c3e9c0f140a8742034e107fb0f371c0d73bf1d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <kabel@kernel.org>
+Date: Sun, 12 Sep 2021 04:20:11 +0200
+Subject: [PATCH] chromium-93: fix building with system-ffmpeg
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The version of ffmpeg bundled in Chromium changed ABI a little, which
+affected the code in that the type of the last parameter of
+av_packet_get_side_data() is now size_t instead of int.
+
+This causes Chromium to fail to build with system-ffmpeg if the system
+ffmpeg's version does not yet have this ABI change.
+
+Fix the code to be able to compile with older ffmpeg as well.
+
+Signed-off-by: Marek Behún <kabel@kernel.org>
+---
+ media/filters/audio_decoder_unittest.cc |  4 ++++
+ media/filters/ffmpeg_demuxer.cc         | 16 ++++++++++++++++
+ 2 files changed, 20 insertions(+)
+
+diff --git a/media/filters/audio_decoder_unittest.cc b/media/filters/audio_decoder_unittest.cc
+--- a/media/filters/audio_decoder_unittest.cc
++++ b/media/filters/audio_decoder_unittest.cc
+@@ -109,7 +109,11 @@ void SetDiscardPadding(AVPacket* packet,
+   }
+ 
+   // If the timestamp is positive, try to use FFmpeg's discard data.
++#if LIBAVUTIL_VERSION_MAJOR < 57
++  int skip_samples_size = 0;
++#else
+   size_t skip_samples_size = 0;
++#endif
+   const uint32_t* skip_samples_ptr =
+       reinterpret_cast<const uint32_t*>(av_packet_get_side_data(
+           packet, AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size));
+diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
+--- a/media/filters/ffmpeg_demuxer.cc
++++ b/media/filters/ffmpeg_demuxer.cc
+@@ -427,11 +427,19 @@ void FFmpegDemuxerStream::EnqueuePacket(
+   scoped_refptr<DecoderBuffer> buffer;
+ 
+   if (type() == DemuxerStream::TEXT) {
++#if LIBAVUTIL_VERSION_MAJOR < 57
++    int id_size = 0;
++#else
+     size_t id_size = 0;
++#endif
+     uint8_t* id_data = av_packet_get_side_data(
+         packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size);
+ 
++#if LIBAVUTIL_VERSION_MAJOR < 57
++    int settings_size = 0;
++#else
+     size_t settings_size = 0;
++#endif
+     uint8_t* settings_data = av_packet_get_side_data(
+         packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size);
+ 
+@@ -443,7 +451,11 @@ void FFmpegDemuxerStream::EnqueuePacket(
+     buffer = DecoderBuffer::CopyFrom(packet->data, packet->size,
+                                      side_data.data(), side_data.size());
+   } else {
++#if LIBAVUTIL_VERSION_MAJOR < 57
++    int side_data_size = 0;
++#else
+     size_t side_data_size = 0;
++#endif
+     uint8_t* side_data = av_packet_get_side_data(
+         packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size);
+ 
+@@ -504,7 +516,11 @@ void FFmpegDemuxerStream::EnqueuePacket(
+                                        packet->size - data_offset);
+     }
+ 
++#if LIBAVUTIL_VERSION_MAJOR < 57
++    int skip_samples_size = 0;
++#else
+     size_t skip_samples_size = 0;
++#endif
+     const uint32_t* skip_samples_ptr =
+         reinterpret_cast<const uint32_t*>(av_packet_get_side_data(
+             packet.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size));

chromium-93-pdfium-include.patch Added

@@ -0,0 +1,117 @@
+From 7a6289c5ace52cf88f0e19caa5f78b7c15d0e7a6 Mon Sep 17 00:00:00 2001
+From: Miklos Vajna <vmiklos@collabora.co.uk>
+Date: Wed, 21 Jul 2021 17:42:30 +0000
+Subject: [PATCH] fxcodec, fxge: fix missing includes with libstdc++
+
+These missing includes break the build with gcc/libstdc++, they were not
+a problem in practice with clang/libc++.
+
+Change-Id: I40013f97ba7ab06f32aa59f87b04aec06a19478c
+Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/83210
+Commit-Queue: Lei Zhang <thestig@chromium.org>
+Reviewed-by: Lei Zhang <thestig@chromium.org>
+---
+
+diff --git a/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp b/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp
+index cea0679..036f250 100644
+--- a/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp
++++ b/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp
+@@ -7,6 +7,7 @@
+ #include "core/fxcodec/jpeg/jpegmodule.h"
+ 
+ #include <setjmp.h>
++#include <string.h>
+ 
+ #include <memory>
+ #include <utility>
+diff --git a/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp b/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp
+index c66985a..9c1122b 100644
+--- a/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp
++++ b/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp
+@@ -6,6 +6,8 @@
+ 
+ #include "core/fxcodec/jpx/cjpx_decoder.h"
+ 
++#include <string.h>
++
+ #include <algorithm>
+ #include <limits>
+ #include <utility>
+diff --git a/third_party/pdfium/core/fxge/cfx_cliprgn.cpp b/third_party/pdfium/core/fxge/cfx_cliprgn.cpp
+index 5369d52..d198852 100644
+--- a/third_party/pdfium/core/fxge/cfx_cliprgn.cpp
++++ b/third_party/pdfium/core/fxge/cfx_cliprgn.cpp
+@@ -6,6 +6,8 @@
+ 
+ #include "core/fxge/cfx_cliprgn.h"
+ 
++#include <string.h>
++
+ #include <utility>
+ 
+ #include "core/fxge/dib/cfx_dibitmap.h"
+diff --git a/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp b/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp
+index 6f9b420..0f1ffae 100644
+--- a/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp
++++ b/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp
+@@ -6,6 +6,8 @@
+ 
+ #include "core/fxge/dib/cfx_bitmapcomposer.h"
+ 
++#include <string.h>
++
+ #include "core/fxge/cfx_cliprgn.h"
+ #include "core/fxge/dib/cfx_dibitmap.h"
+ 
+diff --git a/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp b/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp
+index f57c00e..45a0a18 100644
+--- a/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp
++++ b/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp
+@@ -6,6 +6,8 @@
+ 
+ #include "core/fxge/dib/cfx_bitmapstorer.h"
+ 
++#include <string.h>
++
+ #include <utility>
+ 
+ #include "core/fxge/dib/cfx_dibitmap.h"
+diff --git a/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp b/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp
+index 4ec0ddb..a1de2fb 100644
+--- a/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp
++++ b/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp
+@@ -6,6 +6,8 @@
+ 
+ #include "core/fxge/dib/cfx_dibbase.h"
+ 
++#include <string.h>
++
+ #include <algorithm>
+ #include <memory>
+ #include <utility>
+diff --git a/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp b/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp
+index d7ccf6c..94e8acc 100644
+--- a/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp
++++ b/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp
+@@ -6,6 +6,8 @@
+ 
+ #include "core/fxge/dib/cfx_dibitmap.h"
+ 
++#include <string.h>
++
+ #include <limits>
+ #include <memory>
+ #include <utility>
+diff --git a/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp b/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp
+index e8362d7..c04c6dc 100644
+--- a/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp
++++ b/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp
+@@ -6,6 +6,8 @@
+ 
+ #include "core/fxge/dib/cfx_scanlinecompositor.h"
+ 
++#include <string.h>
++
+ #include <algorithm>
+ 
+ #include "core/fxge/dib/fx_dib.h"

chromium-buildname.patch Added

chromium-clang-nomerge.patch Added

@@ -0,0 +1,43 @@
+Upstream-status: Inapproriate
+
+Upstream suggests to use Chromium's hermetic clang
+instead.
+
+Signed-off-by: Maksim Sisov <msisov@igalia.com>
+---
+From bde3186ccba169391fb428fcc296b2236ada0010 Mon Sep 17 00:00:00 2001
+From: Maksim Sisov <msisov@igalia.com>
+Date: Wed, 5 May 2021 15:20:43 +0300
+Subject: [PATCH] nomerge attribute on declaration is only available since
+ clang 12
+
+This change fixes builds with older clangs that do not allow
+nomerge attributes on declaration. Otherwise, the following error
+is produced -
+
+build error: 'nomerge' attribute cannot be applied to a declaration
+
+See https://reviews.llvm.org/D92800
+
+Change-Id: I32e1f7dc9049737d54d8a16de5308aa5aae1ced1
+---
+ base/compiler_specific.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/base/compiler_specific.h b/base/compiler_specific.h
+index 6693e9ea33e9..d3b425abe9ca 100644
+--- a/base/compiler_specific.h
++++ b/base/compiler_specific.h
+@@ -340,7 +340,8 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) {
+ #endif  // defined(__clang_analyzer__)
+ 
+ // Use nomerge attribute to disable optimization of merging multiple same calls.
+-#if defined(__clang__) && __has_attribute(nomerge)
++#if defined(__clang__) && (__clang_major__ >= 12) && \
++    __has_attribute(nomerge) && !defined(OS_CHROMEOS)
+ #define NOMERGE [[clang::nomerge]]
+ #else
+ #define NOMERGE
+-- 
+2.25.1
+

chromium-disable-parallel-gold.patch Added

chromium-dma-buf.patch Deleted

chromium-ffmpeg-lp152.patch Added

chromium-freetype-2.11.patch Added

@@ -0,0 +1,52 @@
+diff -up chromium-93.0.4577.63/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp.freetype-2.11 chromium-93.0.4577.63/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp
+--- chromium-93.0.4577.63/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp.freetype-2.11	2021-09-02 08:49:18.996863417 -0400
++++ chromium-93.0.4577.63/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp	2021-09-02 08:56:07.716626801 -0400
+@@ -712,7 +712,11 @@ void colrv1_draw_paint(SkCanvas* canvas,
+             canvas->drawPaint(colrPaint);
+             break;
+         }
++#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
+         case FT_COLR_PAINTFORMAT_TRANSFORM:
++#else
++        case FT_COLR_PAINTFORMAT_TRANSFORMED:
++#endif
+         case FT_COLR_PAINTFORMAT_TRANSLATE:
+         case FT_COLR_PAINTFORMAT_SCALE:
+         case FT_COLR_PAINTFORMAT_ROTATE:
+@@ -760,10 +764,17 @@ void colrv1_transform(SkCanvas* canvas,
+     SkMatrix transform;
+ 
+     switch (colrv1_paint.format) {
++#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
+         case FT_COLR_PAINTFORMAT_TRANSFORM: {
+             transform = ToSkMatrix(colrv1_paint.u.transform.affine);
+             break;
+         }
++#else
++        case FT_COLR_PAINTFORMAT_TRANSFORMED: {
++            transform = ToSkMatrix(colrv1_paint.u.transformed.affine);
++            break;
++        }
++#endif
+         case FT_COLR_PAINTFORMAT_TRANSLATE: {
+             transform = SkMatrix::Translate(
+                 SkFixedToScalar(colrv1_paint.u.translate.dx),
+@@ -889,11 +900,18 @@ bool colrv1_traverse_paint(SkCanvas* can
+             traverse_result = colrv1_start_glyph(canvas, palette, face, paint.u.colr_glyph.glyphID,
+                                                  FT_COLOR_NO_ROOT_TRANSFORM);
+             break;
++#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
+         case FT_COLR_PAINTFORMAT_TRANSFORM:
+             colrv1_transform(canvas, face, paint);
+             traverse_result = colrv1_traverse_paint(canvas, palette, face,
+                                                     paint.u.transform.paint, visited_set);
+             break;
++#else
++        case FT_COLR_PAINTFORMAT_TRANSFORMED:
++            colrv1_transform(canvas, face, paint);
++            traverse_result = colrv1_traverse_paint(canvas, palette, face,
++                                                    paint.u.transformed.paint, visited_set);
++#endif
+         case FT_COLR_PAINTFORMAT_TRANSLATE:
+             colrv1_transform(canvas, face, paint);
+             traverse_result = colrv1_traverse_paint(canvas, palette, face,

chromium-gcc11.patch Added

@@ -0,0 +1,127 @@
+diff --git a/third_party/angle/src/libANGLE/HandleAllocator.cpp b/third_party/angle/src/libANGLE/HandleAllocator.cpp
+index 013f1dfb2..3ce63c192 100644
+--- a/third_party/angle/src/libANGLE/HandleAllocator.cpp
++++ b/third_party/angle/src/libANGLE/HandleAllocator.cpp
+@@ -9,6 +9,7 @@
+ 
+ #include "libANGLE/HandleAllocator.h"
+ 
++#include <limits>
+ #include <algorithm>
+ #include <functional>
+ 
+diff --git a/third_party/perfetto/src/trace_processor/containers/string_pool.cc b/third_party/perfetto/src/trace_processor/containers/string_pool.cc
+index fd651958f..1e8d0606c 100644
+--- a/third_party/perfetto/src/trace_processor/containers/string_pool.cc
++++ b/third_party/perfetto/src/trace_processor/containers/string_pool.cc
+@@ -14,9 +14,9 @@
+  * limitations under the License.
+  */
+ 
++#include <limits>
+ #include "src/trace_processor/containers/string_pool.h"
+ 
+-#include <limits>
+ 
+ #include "perfetto/base/logging.h"
+ #include "perfetto/ext/base/utils.h"
+diff --git a/third_party/perfetto/src/trace_processor/db/column.cc b/third_party/perfetto/src/trace_processor/db/column.cc
+index 00496b335..0dccfeb8a 100644
+--- a/third_party/perfetto/src/trace_processor/db/column.cc
++++ b/third_party/perfetto/src/trace_processor/db/column.cc
+@@ -14,6 +14,7 @@
+  * limitations under the License.
+  */
+ 
++#include <limits>
+ #include "src/trace_processor/db/column.h"
+ 
+ #include "src/trace_processor/db/compare.h"
+diff --git a/third_party/perfetto/src/trace_processor/types/variadic.cc b/third_party/perfetto/src/trace_processor/types/variadic.cc
+index 837bfeba9..cdd56817d 100644
+--- a/third_party/perfetto/src/trace_processor/types/variadic.cc
++++ b/third_party/perfetto/src/trace_processor/types/variadic.cc
+@@ -14,6 +14,7 @@
+  * limitations under the License.
+  */
+ 
++#include <limits>
+ #include "src/trace_processor/types/variadic.h"
+ 
+ namespace perfetto {
+diff --git a/ui/accessibility/platform/ax_platform_atk_hyperlink.cc b/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
+index be91def6b..73f202356 100644
+--- a/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
++++ b/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
+@@ -245,7 +245,7 @@ static void AXPlatformAtkHyperlinkInit(AXPlatformAtkHyperlink* self, gpointer) {
+ }
+ 
+ GType ax_platform_atk_hyperlink_get_type() {
+-  static volatile gsize type_volatile = 0;
++  static gsize type_volatile = 0;
+ 
+   AXPlatformNodeAuraLinux::EnsureGTypeInit();
+ 
+diff --git a/ui/accessibility/platform/ax_platform_node_auralinux.cc b/ui/accessibility/platform/ax_platform_node_auralinux.cc
+index 04125c6fd..6c64e5d8e 100644
+--- a/ui/accessibility/platform/ax_platform_node_auralinux.cc
++++ b/ui/accessibility/platform/ax_platform_node_auralinux.cc
+@@ -2274,7 +2274,7 @@ void ClassInit(gpointer class_pointer, gpointer /* class_data */) {
+ GType GetType() {
+   AXPlatformNodeAuraLinux::EnsureGTypeInit();
+ 
+-  static volatile gsize type_volatile = 0;
++  static gsize type_volatile = 0;
+   if (g_once_init_enter(&type_volatile)) {
+     static const GTypeInfo type_info = {
+         sizeof(AXPlatformNodeAuraLinuxClass),  // class_size
+diff --git a/ui/gtk/gtk_key_bindings_handler.cc b/ui/gtk/gtk_key_bindings_handler.cc
+index c663a2074..38a342484 100644
+--- a/ui/gtk/gtk_key_bindings_handler.cc
++++ b/ui/gtk/gtk_key_bindings_handler.cc
+@@ -141,7 +141,7 @@ void GtkKeyBindingsHandler::HandlerClassInit(HandlerClass* klass) {
+ }
+ 
+ GType GtkKeyBindingsHandler::HandlerGetType() {
+-  static volatile gsize type_id_volatile = 0;
++  static gsize type_id_volatile = 0;
+   if (g_once_init_enter(&type_id_volatile)) {
+     GType type_id = g_type_register_static_simple(
+         GTK_TYPE_TEXT_VIEW, g_intern_static_string("GtkKeyBindingsHandler"),
+diff --git a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
+index c0b5a805b..e6f921926 100644
+--- a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
++++ b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
+@@ -2,6 +2,7 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
++#include <cstddef>
+ #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
+ 
+ #include "base/observer_list.h"
+diff --git a/components/bookmarks/browser/bookmark_expanded_state_tracker.cc b/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
+index 4ad2afa1f..5c4596e12 100644
+--- a/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
++++ b/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
+@@ -2,6 +2,7 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
++#include <cstddef>
+ #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h"
+ 
+ #include <stdint.h>
+diff --git a/components/bookmarks/browser/base_bookmark_model_observer.cc b/components/bookmarks/browser/base_bookmark_model_observer.cc
+index 657a3c96b..ad641a082 100644
+--- a/components/bookmarks/browser/base_bookmark_model_observer.cc
++++ b/components/bookmarks/browser/base_bookmark_model_observer.cc
+@@ -2,6 +2,8 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
++#include <cstddef>
++
+ #include "components/bookmarks/browser/base_bookmark_model_observer.h"
+ 
+ namespace bookmarks {

chromium-glibc-2.33.patch Added

@@ -0,0 +1,149 @@
+# Patch made by Kevin Kofler <Kevin@tigcc.ticalc.org>
+# https://bugzilla.redhat.com/show_bug.cgi?id=1904652
+
+Index: chromium-90.0.4430.72/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+===================================================================
+--- chromium-90.0.4430.72.orig/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ chromium-90.0.4430.72/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -269,6 +269,18 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return Allow();
+   }
+ 
++#if defined(__NR_newfstatat)
++  if (sysno == __NR_newfstatat) {
++    return RewriteFstatatSIGSYS();
++  }
++#endif
++
++#if defined(__NR_fstatat64)
++  if (sysno == __NR_fstatat64) {
++    return RewriteFstatatSIGSYS();
++  }
++#endif
++
+   if (SyscallSets::IsFileSystem(sysno) ||
+       SyscallSets::IsCurrentDirectory(sysno)) {
+     return Error(fs_denied_errno);
+Index: chromium-90.0.4430.72/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
+===================================================================
+--- chromium-90.0.4430.72.orig/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
++++ chromium-90.0.4430.72/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
+@@ -6,6 +6,8 @@
+ 
+ #include "sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h"
+ 
++#include <errno.h>
++#include <fcntl.h>
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <string.h>
+@@ -355,6 +357,35 @@ intptr_t SIGSYSSchedHandler(const struct
+   return -ENOSYS;
+ }
+ 
++intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args,
++                              void* aux) {
++  switch (args.nr) {
++#if defined(__NR_newfstatat)
++    case __NR_newfstatat:
++#endif
++#if defined(__NR_fstatat64)
++    case __NR_fstatat64:
++#endif
++#if defined(__NR_newfstatat) || defined(__NR_fstatat64)
++      if (*reinterpret_cast<const char *>(args.args[1]) == '\0'
++          && args.args[3] == static_cast<uint64_t>(AT_EMPTY_PATH)) {
++        return sandbox::sys_fstat64(static_cast<int>(args.args[0]),
++                                    reinterpret_cast<struct stat64 *>(args.args[2]));
++      } else {
++        errno = EACCES;
++        return -1;
++      }
++      break;
++#endif
++  }
++
++  CrashSIGSYS_Handler(args, aux);
++
++  // Should never be reached.
++  RAW_CHECK(false);
++  return -ENOSYS;
++}
++
+ bpf_dsl::ResultExpr CrashSIGSYS() {
+   return bpf_dsl::Trap(CrashSIGSYS_Handler, NULL);
+ }
+@@ -387,6 +418,10 @@ bpf_dsl::ResultExpr RewriteSchedSIGSYS()
+   return bpf_dsl::Trap(SIGSYSSchedHandler, NULL);
+ }
+ 
++bpf_dsl::ResultExpr RewriteFstatatSIGSYS() {
++  return bpf_dsl::Trap(SIGSYSFstatatHandler, NULL);
++}
++
+ void AllocateCrashKeys() {
+ #if !defined(OS_NACL_NONSFI)
+   if (seccomp_crash_key)
+Index: chromium-90.0.4430.72/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h
+===================================================================
+--- chromium-90.0.4430.72.orig/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h
++++ chromium-90.0.4430.72/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h
+@@ -62,6 +62,10 @@ SANDBOX_EXPORT intptr_t SIGSYSPtraceFail
+ // sched_setparam(), sched_setscheduler()
+ SANDBOX_EXPORT intptr_t SIGSYSSchedHandler(const arch_seccomp_data& args,
+                                            void* aux);
++// If the fstatat syscall is actually a disguised fstat, calls the regular fstat
++// syscall, otherwise, crashes in the same way as CrashSIGSYS_Handler.
++SANDBOX_EXPORT intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args, 
++                                             void* aux);
+ 
+ // Variants of the above functions for use with bpf_dsl.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYS();
+@@ -72,6 +76,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Crash
+ SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSFutex();
+ SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSPtrace();
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteSchedSIGSYS();
++SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteFstatatSIGSYS();
+ 
+ // Allocates a crash key so that Seccomp information can be recorded.
+ void AllocateCrashKeys();
+Index: chromium-90.0.4430.72/sandbox/linux/services/syscall_wrappers.cc
+===================================================================
+--- chromium-90.0.4430.72.orig/sandbox/linux/services/syscall_wrappers.cc
++++ chromium-90.0.4430.72/sandbox/linux/services/syscall_wrappers.cc
+@@ -261,4 +261,13 @@ int sys_sigaction(int signum,
+ 
+ #endif  // defined(MEMORY_SANITIZER)
+ 
++SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf)
++{
++#if defined(__NR_fstat64)
++    return syscall(__NR_fstat64, fd, buf);
++#else
++    return syscall(__NR_fstat, fd, buf);
++#endif
++}
++
+ }  // namespace sandbox
+Index: chromium-90.0.4430.72/sandbox/linux/services/syscall_wrappers.h
+===================================================================
+--- chromium-90.0.4430.72.orig/sandbox/linux/services/syscall_wrappers.h
++++ chromium-90.0.4430.72/sandbox/linux/services/syscall_wrappers.h
+@@ -17,6 +17,7 @@ struct sock_fprog;
+ struct rlimit64;
+ struct cap_hdr;
+ struct cap_data;
++struct stat64;
+ 
+ namespace sandbox {
+ 
+@@ -84,6 +85,9 @@ SANDBOX_EXPORT int sys_sigaction(int sig
+                                  const struct sigaction* act,
+                                  struct sigaction* oldact);
+ 
++// Recent glibc rewrites fstat to fstatat.
++SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf);
++
+ }  // namespace sandbox
+ 
+ #endif  // SANDBOX_LINUX_SERVICES_SYSCALL_WRAPPERS_H_

chromium-glibc-2.34.patch Added

@@ -0,0 +1,26 @@
+diff -up chromium-92.0.4515.107/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.sigstkszfix chromium-92.0.4515.107/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+--- chromium-92.0.4515.107/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.sigstkszfix	2021-07-19 14:47:20.000000000 -0400
++++ chromium-92.0.4515.107/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc	2021-07-26 17:28:50.155924005 -0400
+@@ -138,7 +139,7 @@
+   // SIGSTKSZ may be too small to prevent the signal handlers from overrunning
+   // the alternative stack. Ensure that the size of the alternative stack is
+   // large enough.
+-  static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
++  static const unsigned kSigStackSize = std::max<size_t>(16384, SIGSTKSZ);
+
+   // Only set an alternative stack if there isn't already one, or if the current
+   // one is too small.
+From: https://forums.gentoo.org/viewtopic-p-8644495.html
+--- a/sandbox/linux/services/credentials.cc
++++ b/sandbox/linux/services/credentials.cc
+@@ -98,7 +98,9 @@
+   // attempt this optimization.
+   clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS;
+
+-  char tls_buf[PTHREAD_STACK_MIN] = {0};
++  const std::size_t pthread_stack_min = PTHREAD_STACK_MIN;
++  char tls_buf[pthread_stack_min];
++  memset(tls_buf, 0, pthread_stack_min);
+   tls = tls_buf;
+ #endif
+

chromium-libusb_interrupt_event_handler.patch Added

chromium-lp151-old-drm.patch Added

@@ -0,0 +1,32 @@
+Index: chromium-85.0.4183.69/ui/gfx/linux/drm_util_linux.cc
+===================================================================
+--- chromium-85.0.4183.69.orig/ui/gfx/linux/drm_util_linux.cc
++++ chromium-85.0.4183.69/ui/gfx/linux/drm_util_linux.cc
+@@ -6,6 +6,27 @@
+ 
+ #include <drm_fourcc.h>
+ 
++#ifndef DRM_FORMAT_P010
++/*
++ * 2 plane YCbCr MSB aligned
++ * index 0 = Y plane, [15:0] Y:x [10:6] little endian
++ * index 1 = Cr:Cb plane, [31:0] Cr:x:Cb:x [10:6:10:6] little endian
++ */
++#define DRM_FORMAT_P010		fourcc_code('P', '0', '1', '0') /* 2x2 subsampled Cr:Cb plane 10 bits per channel */
++/*
++ * 2 plane YCbCr MSB aligned
++ * index 0 = Y plane, [15:0] Y:x [12:4] little endian
++ * index 1 = Cr:Cb plane, [31:0] Cr:x:Cb:x [12:4:12:4] little endian
++ */
++#define DRM_FORMAT_P012		fourcc_code('P', '0', '1', '2') /* 2x2 subsampled Cr:Cb plane 12 bits per channel */
++/*
++ * 2 plane YCbCr MSB aligned
++ * index 0 = Y plane, [15:0] Y little endian
++ * index 1 = Cr:Cb plane, [31:0] Cr:Cb [16:16] little endian
++ */
++#define DRM_FORMAT_P016		fourcc_code('P', '0', '1', '6') /* 2x2 subsampled Cr:Cb plane 16 bits per channel */
++#endif
++
+ #include "base/notreached.h"
+ 
+ namespace ui {

chromium-master-prefs-path.patch Added

chromium-non-void-return.patch Deleted

@@ -1,507 +0,0 @@
-Index: chromium-69.0.3497.57/media/gpu/vaapi/vaapi_wrapper.cc
-===================================================================
---- chromium-69.0.3497.57.orig/media/gpu/vaapi/vaapi_wrapper.cc
-+++ chromium-69.0.3497.57/media/gpu/vaapi/vaapi_wrapper.cc
-@@ -400,6 +400,8 @@ static VAEntrypoint GetVaEntryPoint(Vaap
-     case VaapiWrapper::kCodecModeMax:
-       NOTREACHED();
-       return VAEntrypointVLD;
-+    default:
-+      return 0;
-   }
- }
- 
-Index: chromium-69.0.3497.57/cc/input/snap_fling_controller.cc
-===================================================================
---- chromium-69.0.3497.57.orig/cc/input/snap_fling_controller.cc
-+++ chromium-69.0.3497.57/cc/input/snap_fling_controller.cc
-@@ -26,6 +26,8 @@ bool SnapFlingController::FilterEventFor
-     case GestureScrollType::kEnd: {
-       return state_ == State::kActive || state_ == State::kFinished;
-     }
-+    default:
-+      return false;
-   }
- }
- 
-Index: chromium-69.0.3497.57/chrome/browser/ui/webui/discards/discards_ui.cc
-===================================================================
---- chromium-69.0.3497.57.orig/chrome/browser/ui/webui/discards/discards_ui.cc
-+++ chromium-69.0.3497.57/chrome/browser/ui/webui/discards/discards_ui.cc
-@@ -48,6 +48,8 @@ mojom::LifecycleUnitVisibility GetLifecy
-       return mojom::LifecycleUnitVisibility::OCCLUDED;
-     case content::Visibility::VISIBLE:
-       return mojom::LifecycleUnitVisibility::VISIBLE;
-+    default:
-+      return mojom::LifecycleUnitVisibility::VISIBLE;
-   }
- #if defined(COMPILER_MSVC)
-   NOTREACHED();
-Index: chromium-69.0.3497.57/components/autofill/core/browser/autofill_manager.cc
-===================================================================
---- chromium-69.0.3497.57.orig/components/autofill/core/browser/autofill_manager.cc
-+++ chromium-69.0.3497.57/components/autofill/core/browser/autofill_manager.cc
-@@ -285,6 +285,7 @@ PopupType AutofillManager::GetPopupType(
- 
-     default:
-       NOTREACHED();
-+      return PopupType::kUnspecified;
-   }
- }
- 
-Index: chromium-69.0.3497.57/components/cast_channel/cast_message_util.cc
-===================================================================
---- chromium-69.0.3497.57.orig/components/cast_channel/cast_message_util.cc
-+++ chromium-69.0.3497.57/components/cast_channel/cast_message_util.cc
-@@ -368,6 +368,8 @@ const char* GetAppAvailabilityResultToSt
-       return "unavailable";
-     case GetAppAvailabilityResult::kUnknown:
-       return "unknown";
-+    default:
-+      return "unknown";
-   }
- }
- 
-Index: chromium-69.0.3497.57/components/data_reduction_proxy/core/browser/data_reduction_proxy_util.cc
-===================================================================
---- chromium-69.0.3497.57.orig/components/data_reduction_proxy/core/browser/data_reduction_proxy_util.cc
-+++ chromium-69.0.3497.57/components/data_reduction_proxy/core/browser/data_reduction_proxy_util.cc
-@@ -337,6 +337,8 @@ PageloadMetrics_ConnectionType ProtoConn
-       return PageloadMetrics_ConnectionType_CONNECTION_NONE;
-     case net::NetworkChangeNotifier::CONNECTION_BLUETOOTH:
-       return PageloadMetrics_ConnectionType_CONNECTION_BLUETOOTH;
-+    default:
-+      return PageloadMetrics_ConnectionType_CONNECTION_UNKNOWN;
-   }
- }
- 
-@@ -351,6 +353,8 @@ RequestInfo_Protocol ProtoRequestInfoPro
-       return RequestInfo_Protocol_QUIC;
-     case DataReductionProxyData::RequestInfo::Protocol::UNKNOWN:
-       return RequestInfo_Protocol_UNKNOWN;
-+    default:
-+      return RequestInfo_Protocol_UNKNOWN;
-   }
- }
- 
-Index: chromium-69.0.3497.57/content/browser/cache_storage/cache_storage_quota_client.cc
-===================================================================
---- chromium-69.0.3497.57.orig/content/browser/cache_storage/cache_storage_quota_client.cc
-+++ chromium-69.0.3497.57/content/browser/cache_storage/cache_storage_quota_client.cc
-@@ -98,6 +98,8 @@ storage::QuotaClient::ID CacheStorageQuo
-       return kServiceWorkerCache;
-     case CacheStorageOwner::kBackgroundFetch:
-       return kBackgroundFetch;
-+    default:
-+      return kBackgroundFetch;
-   }
- }
- 
-Index: chromium-69.0.3497.57/media/capture/video/video_capture_device_descriptor.cc
-===================================================================
---- chromium-69.0.3497.57.orig/media/capture/video/video_capture_device_descriptor.cc
-+++ chromium-69.0.3497.57/media/capture/video/video_capture_device_descriptor.cc
-@@ -94,6 +94,8 @@ const char* VideoCaptureDeviceDescriptor
-       return "Virtual Device";
-     case VideoCaptureApi::UNKNOWN:
-       return "Unknown";
-+    default:
-+      return "Unknown";
-   }
- }
- 
-Index: chromium-69.0.3497.57/net/nqe/network_quality_estimator.cc
-===================================================================
---- chromium-69.0.3497.57.orig/net/nqe/network_quality_estimator.cc
-+++ chromium-69.0.3497.57/net/nqe/network_quality_estimator.cc
-@@ -1342,6 +1342,8 @@ base::TimeDelta NetworkQualityEstimator:
-     case nqe::internal::OBSERVATION_CATEGORY_COUNT:
-       NOTREACHED();
-       return base::TimeDelta();
-+    default:
-+      return base::TimeDelta();
-   }
- }
- 
-Index: chromium-69.0.3497.57/services/audio/public/cpp/audio_system_to_service_adapter.cc
-===================================================================
---- chromium-69.0.3497.57.orig/services/audio/public/cpp/audio_system_to_service_adapter.cc
-+++ chromium-69.0.3497.57/services/audio/public/cpp/audio_system_to_service_adapter.cc
-@@ -66,6 +66,8 @@ const char* GetTraceEvent(Action action)
-       return "AudioSystemToServiceAdapter::GetAssociatedOutputDeviceID";
-     case kGetInputDeviceInfo:
-       return "AudioSystemToServiceAdapter::GetInputDeviceInfo";
-+    default:
-+      return "Unknown";
-   }
-   NOTREACHED();
- }
-Index: chromium-69.0.3497.57/services/network/cross_origin_read_blocking.cc
-===================================================================
---- chromium-69.0.3497.57.orig/services/network/cross_origin_read_blocking.cc
-+++ chromium-69.0.3497.57/services/network/cross_origin_read_blocking.cc
-@@ -800,6 +800,8 @@ bool CrossOriginReadBlocking::ResponseAn
-       return sniffers_.empty() && !found_blockable_content_;
-     case kBlock:
-       return false;
-+    default:
-+      return true;
-   }
- }
- 
-@@ -811,6 +813,8 @@ bool CrossOriginReadBlocking::ResponseAn
-       return sniffers_.empty() && found_blockable_content_;
-     case kBlock:
-       return true;
-+    default:
-+      return false;
-   }
- }
- 
-Index: chromium-69.0.3497.57/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc
-===================================================================
---- chromium-69.0.3497.57.orig/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc
-+++ chromium-69.0.3497.57/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc
-@@ -1191,6 +1191,8 @@ AXTextPosition AXLayoutObject::GetTextPo
-       return kAXTextPositionSubscript;
-     case EVerticalAlign::kSuper:
-       return kAXTextPositionSuperscript;
-+    default:
-+      return AXNodeObject::GetTextPosition();
-   }
- }
- 
-Index: chromium-69.0.3497.57/third_party/blink/renderer/modules/webaudio/audio_param.cc
-===================================================================
---- chromium-69.0.3497.57.orig/third_party/blink/renderer/modules/webaudio/audio_param.cc
-+++ chromium-69.0.3497.57/third_party/blink/renderer/modules/webaudio/audio_param.cc
-@@ -144,6 +144,7 @@ String AudioParamHandler::GetParamName()
-       return custom_param_name_;
-     default:
-       NOTREACHED();
-+      return "Unknown";
-   }
- }
- 
-Index: chromium-69.0.3497.57/ui/accessibility/platform/ax_platform_node_auralinux.cc
-===================================================================
---- chromium-69.0.3497.57.orig/ui/accessibility/platform/ax_platform_node_auralinux.cc
-+++ chromium-69.0.3497.57/ui/accessibility/platform/ax_platform_node_auralinux.cc
-@@ -1291,6 +1291,8 @@ AtkRole AXPlatformNodeAuraLinux::GetAtkR
-     case ax::mojom::Role::kPresentational:
-     case ax::mojom::Role::kUnknown:
-       return ATK_ROLE_REDUNDANT_OBJECT;
-+    default:
-+      return ATK_ROLE_REDUNDANT_OBJECT;
-   }
- }
- 
-Index: chromium-69.0.3497.57/chrome/browser/chrome_browser_main.cc
-===================================================================
---- chromium-69.0.3497.57.orig/chrome/browser/chrome_browser_main.cc
-+++ chromium-69.0.3497.57/chrome/browser/chrome_browser_main.cc
-@@ -769,6 +769,8 @@ bool WaitUntilMachineLevelUserCloudPolic
-     case RegisterResult::kQuitDueToFailure:
-       chrome::AttemptExit();
-       return false;
-+    default:
-+      return true;
-   }
- #else
-   return true;
-Index: chromium-69.0.3497.57/chrome/browser/resource_coordinator/tab_lifecycle_unit.cc
-===================================================================
---- chromium-69.0.3497.57.orig/chrome/browser/resource_coordinator/tab_lifecycle_unit.cc
-+++ chromium-69.0.3497.57/chrome/browser/resource_coordinator/tab_lifecycle_unit.cc
-@@ -161,6 +161,7 @@ bool IsValidStateChange(LifecycleUnitSta
-         default: { return false; }
-       }
-     }
-+    default: { return false; }
-   }
- }
- 
-@@ -172,6 +173,8 @@ StateChangeReason DiscardReasonToStateCh
-       return StateChangeReason::BROWSER_INITIATED;
-     case DiscardReason::kUrgent:
-       return StateChangeReason::SYSTEM_MEMORY_PRESSURE;
-+    default:
-+      return StateChangeReason::BROWSER_INITIATED;
-   }
- }
- 
-Index: chromium-69.0.3497.57/chrome/browser/ui/views/harmony/material_refresh_layout_provider.cc
-===================================================================
---- chromium-69.0.3497.57.orig/chrome/browser/ui/views/harmony/material_refresh_layout_provider.cc
-+++ chromium-69.0.3497.57/chrome/browser/ui/views/harmony/material_refresh_layout_provider.cc
-@@ -43,6 +43,8 @@ int MaterialRefreshLayoutProvider::GetCo
-       return 8;
-     case views::EMPHASIS_MAXIMUM:
-       return std::min(size.width(), size.height()) / 2;
-+    default:
-+      return 0;
-   }
- }
- 
-@@ -60,6 +62,8 @@ int MaterialRefreshLayoutProvider::GetSh
-       return 3;
-     case views::EMPHASIS_MAXIMUM:
-       return 16;
-+    default:
-+      return 0;
-   }
- }
- 
-Index: chromium-69.0.3497.57/components/password_manager/core/browser/browser_save_password_progress_logger.cc
-===================================================================
---- chromium-69.0.3497.57.orig/components/password_manager/core/browser/browser_save_password_progress_logger.cc
-+++ chromium-69.0.3497.57/components/password_manager/core/browser/browser_save_password_progress_logger.cc
-@@ -86,6 +86,8 @@ std::string VoteTypeToString(
-       return "HTML classifier";
-     case AutofillUploadContents::Field::FIRST_USE:
-       return "First use";
-+    default:
-+      return "No information";
-   }
- }
- 
-Index: chromium-69.0.3497.57/components/policy/core/common/policy_proto_decoders.cc
-===================================================================
---- chromium-69.0.3497.57.orig/components/policy/core/common/policy_proto_decoders.cc
-+++ chromium-69.0.3497.57/components/policy/core/common/policy_proto_decoders.cc
-@@ -42,6 +42,8 @@ bool GetPolicyLevel(const AnyPolicyProto
-       return true;
-     case em::PolicyOptions::UNSET:
-       return false;
-+    default:
-+      return false;
-   }
- }
- 
-@@ -186,4 +188,4 @@ void DecodeProtoFields(
-   }
- }
- 
--}  // namespace policy
-\ No newline at end of file
-+}  // namespace policy
-Index: chromium-69.0.3497.57/components/previews/content/previews_hints.cc
-===================================================================
---- chromium-69.0.3497.57.orig/components/previews/content/previews_hints.cc
-+++ chromium-69.0.3497.57/components/previews/content/previews_hints.cc
-@@ -94,6 +94,8 @@ ConvertProtoOptimizationTypeToPreviewsOp
-       return PreviewsType::NOSCRIPT;
-     case optimization_guide::proto::RESOURCE_LOADING:
-       return PreviewsType::RESOURCE_LOADING_HINTS;
-+    default:
-+      return base::nullopt;
-   }
- }
- 
-Index: chromium-69.0.3497.57/components/previews/core/previews_black_list.cc
-===================================================================
---- chromium-69.0.3497.57.orig/components/previews/core/previews_black_list.cc
-+++ chromium-69.0.3497.57/components/previews/core/previews_black_list.cc
-@@ -33,6 +33,9 @@ PreviewsEligibilityReason BlacklistReaso
-       return PreviewsEligibilityReason::ALLOWED;
-     case blacklist::BlacklistReason::kAllowed:
-       return PreviewsEligibilityReason::ALLOWED;
-+    default:
-+      NOTREACHED() << "Previews does not support type-base blacklisting";
-+      return PreviewsEligibilityReason::ALLOWED;
-   }
- }
- 
-Index: chromium-69.0.3497.57/content/browser/frame_host/frame_tree_node.cc
-===================================================================
---- chromium-69.0.3497.57.orig/content/browser/frame_host/frame_tree_node.cc
-+++ chromium-69.0.3497.57/content/browser/frame_host/frame_tree_node.cc
-@@ -624,6 +624,7 @@ bool FrameTreeNode::UpdateUserActivation
-       return NotifyUserActivation();
-   }
-   NOTREACHED() << "Invalid update_type.";
-+  return false;
- }
- 
- void FrameTreeNode::OnSetHasReceivedUserGestureBeforeNavigation(bool value) {
-Index: chromium-69.0.3497.57/content/renderer/input/input_event_prediction.cc
-===================================================================
---- chromium-69.0.3497.57.orig/content/renderer/input/input_event_prediction.cc
-+++ chromium-69.0.3497.57/content/renderer/input/input_event_prediction.cc
-@@ -76,6 +76,8 @@ std::unique_ptr<ui::InputPredictor> Inpu
-       return std::make_unique<ui::LeastSquaresPredictor>();
-     case PredictorType::kKalman:
-       return std::make_unique<ui::KalmanPredictor>();
-+    default:
-+      return std::make_unique<ui::EmptyPredictor>();
-   }
- }
- 
-Index: chromium-69.0.3497.57/content/renderer/media/webrtc/peer_connection_tracker.cc
-===================================================================
---- chromium-69.0.3497.57.orig/content/renderer/media/webrtc/peer_connection_tracker.cc
-+++ chromium-69.0.3497.57/content/renderer/media/webrtc/peer_connection_tracker.cc
-@@ -112,6 +112,8 @@ static const char* SerializeDirection(
-       return "'recvonly'";
-     case webrtc::RtpTransceiverDirection::kInactive:
-       return "'inactive'";
-+    default:
-+      return "'unknown'";
-   }
- }
- 
-Index: chromium-69.0.3497.57/device/bluetooth/bluetooth_remote_gatt_characteristic.cc
-===================================================================
---- chromium-69.0.3497.57.orig/device/bluetooth/bluetooth_remote_gatt_characteristic.cc
-+++ chromium-69.0.3497.57/device/bluetooth/bluetooth_remote_gatt_characteristic.cc
-@@ -397,6 +397,8 @@ bool BluetoothRemoteGattCharacteristic::
-       return hasNotify;
-     case NotificationType::kIndication:
-       return hasIndicate;
-+    default:
-+      return false;
-   }
- }
- 
-Index: chromium-69.0.3497.57/media/blink/watch_time_reporter.cc
-===================================================================
---- chromium-69.0.3497.57.orig/media/blink/watch_time_reporter.cc
-+++ chromium-69.0.3497.57/media/blink/watch_time_reporter.cc
-@@ -571,6 +571,8 @@ WatchTimeKey WatchTimeReporter::GetDispl
-       return DISPLAY_TYPE_KEY(DisplayFullscreen);
-     case DisplayType::kPictureInPicture:
-       return DISPLAY_TYPE_KEY(DisplayPictureInPicture);
-+    default:
-+      return DISPLAY_TYPE_KEY(DisplayInline);
-   }
- }
- 
-Index: chromium-69.0.3497.57/services/ui/public/cpp/gpu/command_buffer_metrics.cc
-===================================================================
---- chromium-69.0.3497.57.orig/services/ui/public/cpp/gpu/command_buffer_metrics.cc
-+++ chromium-69.0.3497.57/services/ui/public/cpp/gpu/command_buffer_metrics.cc
-@@ -86,6 +86,8 @@ std::string ContextTypeToString(ContextT
-       return "Unknown";
-     case ContextType::FOR_TESTING:
-       return "ForTesting";
-+    default:
-+      return "Unknown";
-   }
- }
- 
-Index: chromium-69.0.3497.57/third_party/blink/renderer/core/css/style_environment_variables.cc
-===================================================================
---- chromium-69.0.3497.57.orig/third_party/blink/renderer/core/css/style_environment_variables.cc
-+++ chromium-69.0.3497.57/third_party/blink/renderer/core/css/style_environment_variables.cc
-@@ -67,6 +67,7 @@ const AtomicString StyleEnvironmentVaria
-   }
- 
-   NOTREACHED();
-+  return "unknown";
- }
- 
- // static
-Index: chromium-69.0.3497.57/third_party/blink/renderer/core/html/media/media_controls.cc
-===================================================================
---- chromium-69.0.3497.57.orig/third_party/blink/renderer/core/html/media/media_controls.cc
-+++ chromium-69.0.3497.57/third_party/blink/renderer/core/html/media/media_controls.cc
-@@ -36,6 +36,9 @@ AtomicString MediaControls::GetSizingCSS
-       return kMediaControlsSizingMediumCSSClass;
-     case MediaControlsSizingClass::kLarge:
-       return kMediaControlsSizingLargeCSSClass;
-+    default:
-+      NOTREACHED();
-+      return kMediaControlsSizingMediumCSSClass;
-   }
- 
-   NOTREACHED();
-Index: chromium-69.0.3497.57/third_party/blink/renderer/modules/cookie_store/cookie_change_event.cc
-===================================================================
---- chromium-69.0.3497.57.orig/third_party/blink/renderer/modules/cookie_store/cookie_change_event.cc
-+++ chromium-69.0.3497.57/third_party/blink/renderer/modules/cookie_store/cookie_change_event.cc
-@@ -53,6 +53,9 @@ String ToCookieListItemSameSite(network:
-       return "lax";
-     case network::mojom::CookieSameSite::NO_RESTRICTION:
-       return "unrestricted";
-+    default:
-+      NOTREACHED();
-+      return "unknown";
-   }
- 
-   NOTREACHED();
-Index: chromium-69.0.3497.57/third_party/blink/renderer/modules/peerconnection/rtc_rtp_transceiver.cc
-===================================================================
---- chromium-69.0.3497.57.orig/third_party/blink/renderer/modules/peerconnection/rtc_rtp_transceiver.cc
-+++ chromium-69.0.3497.57/third_party/blink/renderer/modules/peerconnection/rtc_rtp_transceiver.cc
-@@ -28,6 +28,8 @@ String TransceiverDirectionToString(
-       return "recvonly";
-     case webrtc::RtpTransceiverDirection::kInactive:
-       return "inactive";
-+    default:
-+      return "unknown";
-   }
- }
- 
-Index: chromium-69.0.3497.57/third_party/blink/renderer/platform/heap/heap_stats_collector.h
-===================================================================
---- chromium-69.0.3497.57.orig/third_party/blink/renderer/platform/heap/heap_stats_collector.h
-+++ chromium-69.0.3497.57/third_party/blink/renderer/platform/heap/heap_stats_collector.h
-@@ -94,6 +94,8 @@ class PLATFORM_EXPORT ThreadHeapStatsCol
-         return "BlinkGC.VisitPersistents";
-       case Id::kVisitStackRoots:
-         return "BlinkGC.VisitStackRoots";
-+      default:
-+        return "BlinkGC.Unknown";
-     }
-   }
- 
-Index: chromium-69.0.3497.57/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc
-===================================================================
---- chromium-69.0.3497.57.orig/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc
-+++ chromium-69.0.3497.57/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc
-@@ -670,6 +670,9 @@ PageSchedulerImpl::PageLifecycleStateTra
-           NOTREACHED();
-           return base::nullopt;
-       }
-+    default:
-+      NOTREACHED();
-+      return base::nullopt;
-   }
- }
- 
-Index: chromium-69.0.3497.57/ui/base/mojo/clipboard_struct_traits.h
-===================================================================
---- chromium-69.0.3497.57.orig/ui/base/mojo/clipboard_struct_traits.h
-+++ chromium-69.0.3497.57/ui/base/mojo/clipboard_struct_traits.h
-@@ -20,6 +20,9 @@ struct EnumTraits<ui::mojom::ClipboardTy
-         return ui::mojom::ClipboardType::SELECTION;
-       case ui::CLIPBOARD_TYPE_DRAG:
-         return ui::mojom::ClipboardType::DRAG;
-+      default:
-+        NOTREACHED();
-+        return ui::mojom::ClipboardType::SELECTION;
-     }
-   }
- 
-@@ -34,6 +37,8 @@ struct EnumTraits<ui::mojom::ClipboardTy
-       case ui::mojom::ClipboardType::DRAG:
-         *out = ui::CLIPBOARD_TYPE_DRAG;
-         return true;
-+      default:
-+        return false;
-     }
-     NOTREACHED();
-     return false;
-Index: chromium-69.0.3497.57/ui/views/layout/layout_provider.cc
-===================================================================
---- chromium-69.0.3497.57.orig/ui/views/layout/layout_provider.cc
-+++ chromium-69.0.3497.57/ui/views/layout/layout_provider.cc
-@@ -156,6 +156,8 @@ int LayoutProvider::GetCornerRadiusMetri
-       return is_touch ? 8 : 4;
-     case EMPHASIS_MAXIMUM:
-       return is_touch ? std::min(size.width(), size.height()) / 2 : 4;
-+    default:
-+      return 0;
-   }
- }
-

chromium-norar.patch Added

@@ -0,0 +1,90 @@
+diff -up chromium-93.0.4577.63/chrome/common/safe_browsing/BUILD.gn.nounrar chromium-93.0.4577.63/chrome/common/safe_browsing/BUILD.gn
+--- chromium-93.0.4577.63/chrome/common/safe_browsing/BUILD.gn.nounrar	2021-09-02 08:22:31.280927364 -0400
++++ chromium-93.0.4577.63/chrome/common/safe_browsing/BUILD.gn	2021-09-02 08:23:32.143189935 -0400
+@@ -43,39 +43,6 @@ if (safe_browsing_mode == 1) {
+     public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ]
+   }
+ 
+-  source_set("rar_analyzer") {
+-    sources = [
+-      "rar_analyzer.cc",
+-      "rar_analyzer.h",
+-    ]
+-
+-    deps = [
+-      ":archive_analyzer_results",
+-      ":download_type_util",
+-      "//base",
+-      "//base:i18n",
+-      "//components/safe_browsing/content/common:file_type_policies",
+-      "//components/safe_browsing/core/common",
+-      "//third_party/unrar:unrar",
+-    ]
+-
+-    defines = [
+-      "_FILE_OFFSET_BITS=64",
+-      "LARGEFILE_SOURCE",
+-      "RAR_SMP",
+-      "SILENT",
+-
+-      # The following is set to disable certain macro definitions in the unrar
+-      # source code.
+-      "CHROMIUM_UNRAR",
+-
+-      # Disables exceptions in unrar, replaces them with process termination.
+-      "UNRAR_NO_EXCEPTIONS",
+-    ]
+-
+-    public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ]
+-  }
+-
+   if (is_mac) {
+     source_set("disk_image_type_sniffer_mac") {
+       sources = [
+@@ -149,7 +116,6 @@ source_set("safe_browsing") {
+       ":archive_analyzer_results",
+       ":binary_feature_extractor",
+       ":download_type_util",
+-      ":rar_analyzer",
+       "//components/safe_browsing/core/common",
+     ]
+ 
+diff -up chromium-93.0.4577.63/chrome/common/safe_browsing/DEPS.nounrar chromium-93.0.4577.63/chrome/common/safe_browsing/DEPS
+--- chromium-93.0.4577.63/chrome/common/safe_browsing/DEPS.nounrar	2021-09-02 08:22:31.280927364 -0400
++++ chromium-93.0.4577.63/chrome/common/safe_browsing/DEPS	2021-09-02 08:23:56.092293262 -0400
+@@ -2,6 +2,5 @@ include_rules = [
+   "+components/safe_browsing/content/common",
+   "+components/safe_browsing/core/common",
+   "+third_party/protobuf",
+-  "+third_party/unrar",
+   "+third_party/zlib",
+ ]
+diff -up chromium-93.0.4577.63/chrome/services/file_util/BUILD.gn.nounrar chromium-93.0.4577.63/chrome/services/file_util/BUILD.gn
+--- chromium-93.0.4577.63/chrome/services/file_util/BUILD.gn.nounrar	2021-08-31 21:39:29.000000000 -0400
++++ chromium-93.0.4577.63/chrome/services/file_util/BUILD.gn	2021-09-02 08:22:31.280927364 -0400
+@@ -50,7 +50,6 @@ source_set("file_util") {
+     deps += [
+       "//chrome/common/safe_browsing",
+       "//chrome/common/safe_browsing:archive_analyzer_results",
+-      "//chrome/common/safe_browsing:rar_analyzer",
+     ]
+   }
+ 
+diff -up chromium-93.0.4577.63/chrome/services/file_util/safe_archive_analyzer.cc.nounrar chromium-93.0.4577.63/chrome/services/file_util/safe_archive_analyzer.cc
+--- chromium-93.0.4577.63/chrome/services/file_util/safe_archive_analyzer.cc.nounrar	2021-08-31 21:39:29.000000000 -0400
++++ chromium-93.0.4577.63/chrome/services/file_util/safe_archive_analyzer.cc	2021-09-02 08:22:31.281927369 -0400
+@@ -45,10 +45,14 @@ void SafeArchiveAnalyzer::AnalyzeDmgFile
+ void SafeArchiveAnalyzer::AnalyzeRarFile(base::File rar_file,
+                                          base::File temporary_file,
+                                          AnalyzeRarFileCallback callback) {
++#if 0
+   DCHECK(rar_file.IsValid());
+ 
+   safe_browsing::ArchiveAnalyzerResults results;
+   safe_browsing::rar_analyzer::AnalyzeRarFile(
+       std::move(rar_file), std::move(temporary_file), &results);
+   std::move(callback).Run(results);
++#else
++  NOTREACHED();
++#endif
+ }

chromium-old-glibc.patch Deleted

@@ -1,73 +0,0 @@
-Index: chromium-69.0.3497.72/gpu/config/gpu_info.cc
-===================================================================
---- chromium-69.0.3497.72.orig/gpu/config/gpu_info.cc
-+++ chromium-69.0.3497.72/gpu/config/gpu_info.cc
-@@ -99,15 +99,15 @@ GPUInfo::GPUDevice::GPUDevice()
- 
- GPUInfo::GPUDevice::GPUDevice(const GPUInfo::GPUDevice& other) = default;
- 
--GPUInfo::GPUDevice::GPUDevice(GPUInfo::GPUDevice&& other) noexcept = default;
-+GPUInfo::GPUDevice::GPUDevice(GPUInfo::GPUDevice&& other) = default;
- 
--GPUInfo::GPUDevice::~GPUDevice() noexcept = default;
-+GPUInfo::GPUDevice::~GPUDevice() = default;
- 
- GPUInfo::GPUDevice& GPUInfo::GPUDevice::operator=(
-     const GPUInfo::GPUDevice& other) = default;
- 
- GPUInfo::GPUDevice& GPUInfo::GPUDevice::operator=(
--    GPUInfo::GPUDevice&& other) noexcept = default;
-+    GPUInfo::GPUDevice&& other) = default;
- 
- GPUInfo::GPUInfo()
-     : optimus(false),
-Index: chromium-69.0.3497.72/components/policy/core/common/policy_map.cc
-===================================================================
---- chromium-69.0.3497.72.orig/components/policy/core/common/policy_map.cc
-+++ chromium-69.0.3497.72/components/policy/core/common/policy_map.cc
-@@ -15,8 +15,8 @@ PolicyMap::Entry::Entry() = default;
- 
- PolicyMap::Entry::~Entry() = default;
- 
--PolicyMap::Entry::Entry(Entry&&) noexcept = default;
--PolicyMap::Entry& PolicyMap::Entry::operator=(Entry&&) noexcept = default;
-+PolicyMap::Entry::Entry(Entry&&) = default;
-+PolicyMap::Entry& PolicyMap::Entry::operator=(Entry&&) = default;
- 
- PolicyMap::Entry PolicyMap::Entry::DeepCopy() const {
-   Entry copy;
-Index: chromium-69.0.3497.72/components/search_provider_logos/logo_common.cc
-===================================================================
---- chromium-69.0.3497.72.orig/components/search_provider_logos/logo_common.cc
-+++ chromium-69.0.3497.72/components/search_provider_logos/logo_common.cc
-@@ -12,24 +12,24 @@ const int64_t kMaxTimeToLiveMS = INT64_C
- 
- LogoMetadata::LogoMetadata() = default;
- LogoMetadata::LogoMetadata(const LogoMetadata&) = default;
--LogoMetadata::LogoMetadata(LogoMetadata&&) noexcept = default;
-+LogoMetadata::LogoMetadata(LogoMetadata&&) = default;
- LogoMetadata& LogoMetadata::operator=(const LogoMetadata&) = default;
--LogoMetadata& LogoMetadata::operator=(LogoMetadata&&) noexcept = default;
-+LogoMetadata& LogoMetadata::operator=(LogoMetadata&&) = default;
- LogoMetadata::~LogoMetadata() = default;
- 
- EncodedLogo::EncodedLogo() = default;
- EncodedLogo::EncodedLogo(const EncodedLogo&) = default;
--EncodedLogo::EncodedLogo(EncodedLogo&&) noexcept = default;
-+EncodedLogo::EncodedLogo(EncodedLogo&&) = default;
- EncodedLogo& EncodedLogo::operator=(const EncodedLogo&) = default;
--EncodedLogo& EncodedLogo::operator=(EncodedLogo&&) noexcept = default;
-+EncodedLogo& EncodedLogo::operator=(EncodedLogo&&) = default;
- EncodedLogo::~EncodedLogo() = default;
- 
- Logo::Logo() = default;
- Logo::~Logo() = default;
- 
- LogoCallbacks::LogoCallbacks() = default;
--LogoCallbacks::LogoCallbacks(LogoCallbacks&&) noexcept = default;
--LogoCallbacks& LogoCallbacks::operator=(LogoCallbacks&&) noexcept = default;
-+LogoCallbacks::LogoCallbacks(LogoCallbacks&&) = default;
-+LogoCallbacks& LogoCallbacks::operator=(LogoCallbacks&&) = default;
- LogoCallbacks::~LogoCallbacks() = default;
- 
- }  // namespace search_provider_logos

chromium-prop-codecs.patch Added

chromium-shim_headers.patch Added

@@ -0,0 +1,48 @@
+From e273172bbafedca36984fc40f4aa6c44b79ac2ef Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 25 Dec 2020 09:10:32 +0000
+Subject: [PATCH] shim_headers: fix outputs generation
+
+---
+ build/shim_headers.gni | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/build/shim_headers.gni b/build/shim_headers.gni
+index 0900cba..5138647 100644
+--- a/build/shim_headers.gni
++++ b/build/shim_headers.gni
+@@ -6,6 +6,8 @@ template("shim_headers") {
+   action_name = "gen_${target_name}"
+   config_name = "${target_name}_config"
+   shim_headers_path = "${root_gen_dir}/shim_headers/${target_name}"
++  shim_root_path    = rebase_path(invoker.root_path)
++  shim_rel_path     = rebase_path("${shim_root_path}", rebase_path("//"))
+ 
+   config(config_name) {
+     include_dirs = [ shim_headers_path ]
+@@ -16,7 +18,7 @@ template("shim_headers") {
+     args = [
+       "--generate",
+       "--headers-root",
+-      rebase_path(invoker.root_path),
++      "${shim_root_path}",
+       "--output-directory",
+       rebase_path(shim_headers_path),
+     ]
+@@ -27,9 +29,10 @@ template("shim_headers") {
+       ]
+     }
+     args += invoker.headers
+-
+-    outputs = process_file_template(invoker.headers,
+-                                    "${shim_headers_path}/{{source_file_part}}")
++    outputs = []
++    foreach(shim_header, invoker.headers) {
++      outputs += [ "${shim_headers_path}/${shim_rel_path}/" + shim_header ]
++    }
+   }
+ 
+   group(target_name) {
+-- 
+2.26.2
+

chromium-skia-system-fontconfig.patch Deleted

@@ -1,77 +0,0 @@
---- chromium-69.0.3493.3.old/third_party/skia/src/ports/SkFontHost_FreeType.cpp	2018-07-25 16:42:39.217368047 +0200
-+++ chromium-69.0.3493.3/third_party/skia/src/ports/SkFontHost_FreeType.cpp	2018-07-25 16:44:03.387793112 +0200
-@@ -112,8 +112,6 @@
-         : fGetVarDesignCoordinates(nullptr)
-         , fGetVarAxisFlags(nullptr)
-         , fLibrary(nullptr)
--        , fIsLCDSupported(false)
--        , fLCDExtra(0)
-     {
-         if (FT_New_Library(&gFTMemory, &fLibrary)) {
-             return;
-@@ -173,12 +171,7 @@
-         }
- #endif
- 
--        // Setup LCD filtering. This reduces color fringes for LCD smoothed glyphs.
--        // The default has changed over time, so this doesn't mean the same thing to all users.
--        if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) {
--            fIsLCDSupported = true;
--            fLCDExtra = 2; //Using a filter adds one full pixel to each side.
--        }
-+        FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT);
-     }
-     ~FreeTypeLibrary() {
-         if (fLibrary) {
-@@ -187,8 +180,6 @@
-     }
- 
-     FT_Library library() { return fLibrary; }
--    bool isLCDSupported() { return fIsLCDSupported; }
--    int lcdExtra() { return fLCDExtra; }
- 
-     // FT_Get_{MM,Var}_{Blend,Design}_Coordinates were added in FreeType 2.7.1.
-     // Prior to this there was no way to get the coordinates out of the FT_Face.
-@@ -205,8 +196,6 @@
- 
- private:
-     FT_Library fLibrary;
--    bool fIsLCDSupported;
--    int fLCDExtra;
- 
-     // FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0.
-     // The following platforms provide FreeType of at least 2.4.0.
-@@ -704,17 +693,6 @@
-         rec->fTextSize = SkIntToScalar(1 << 14);
-     }
- 
--    if (isLCD(*rec)) {
--        // TODO: re-work so that FreeType is set-up and selected by the SkFontMgr.
--        SkAutoMutexAcquire ama(gFTMutex);
--        ref_ft_library();
--        if (!gFTLibrary->isLCDSupported()) {
--            // If the runtime Freetype library doesn't support LCD, disable it here.
--            rec->fMaskFormat = SkMask::kA8_Format;
--        }
--        unref_ft_library();
--    }
--
-     SkPaint::Hinting h = rec->getHinting();
-     if (SkPaint::kFull_Hinting == h && !isLCD(*rec)) {
-         // collapse full->normal hinting if we're not doing LCD
-@@ -1109,11 +1087,11 @@
- void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) {
-     if (isLCD(fRec)) {
-         if (fLCDIsVert) {
--            glyph->fHeight += gFTLibrary->lcdExtra();
--            glyph->fTop -= gFTLibrary->lcdExtra() >> 1;
-+            glyph->fHeight += 2;
-+            glyph->fTop -= 1;
-         } else {
--            glyph->fWidth += gFTLibrary->lcdExtra();
--            glyph->fLeft -= gFTLibrary->lcdExtra() >> 1;
-+            glyph->fWidth += 2;
-+            glyph->fLeft -= 1;
-         }
-     }
- }

chromium-system-icu.patch Deleted

chromium-system-libusb.patch Added

@@ -0,0 +1,41 @@
+Index: chromium-70.0.3538.54/build/linux/unbundle/libusb.gn
+===================================================================
+--- /dev/null
++++ chromium-70.0.3538.54/build/linux/unbundle/libusb.gn
+@@ -0,0 +1,24 @@
++# Copyright 2016 The Chromium Authors. All rights reserved.
++# Use of this source code is governed by a BSD-style license that can be
++# found in the LICENSE file.
++
++import("//build/config/linux/pkg_config.gni")
++import("//build/shim_headers.gni")
++
++pkg_config("system_libusb") {
++  packages = [ "libusb-1.0" ]
++}
++
++shim_headers("libusb_shim") {
++  root_path = "src/libusb"
++  headers = [
++    "libusb.h",
++  ]
++}
++
++source_set("libusb") {
++  deps = [
++    ":libusb_shim",
++  ]
++  public_configs = [ ":system_libusb" ]
++}
+Index: chromium-70.0.3538.54/build/linux/unbundle/replace_gn_files.py
+===================================================================
+--- chromium-70.0.3538.54.orig/build/linux/unbundle/replace_gn_files.py
++++ chromium-70.0.3538.54/build/linux/unbundle/replace_gn_files.py
+@@ -27,6 +27,7 @@ REPLACEMENTS = {
+   'libevent': 'base/third_party/libevent/BUILD.gn',
+   'libjpeg': 'third_party/libjpeg.gni',
+   'libpng': 'third_party/libpng/BUILD.gn',
++  'libusb': 'third_party/libusb/BUILD.gn',
+   'libvpx': 'third_party/libvpx/BUILD.gn',
+   'libwebp': 'third_party/libwebp/BUILD.gn',
+   'libxml': 'third_party/libxml/BUILD.gn',

chromium-vaapi.patch Added

@@ -0,0 +1,72 @@
+diff -up chromium-88.0.4324.11/chrome/browser/about_flags.cc.accel-mjpeg chromium-88.0.4324.11/chrome/browser/about_flags.cc
+--- chromium-88.0.4324.11/chrome/browser/about_flags.cc.accel-mjpeg	2020-11-19 20:51:19.000000000 -0500
++++ chromium-88.0.4324.11/chrome/browser/about_flags.cc	2020-11-30 16:14:32.393366384 -0500
+@@ -3526,12 +3526,12 @@
+      flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop,
+      MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)},
+ #endif  // ENABLE_VR
+-#if BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_CHROMEOS_ASH) || (defined(OS_LINUX) && !defined(OS_ANDROID))
+     {"disable-accelerated-mjpeg-decode",
+      flag_descriptions::kAcceleratedMjpegDecodeName,
+-     flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
++     flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux,
+      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
+-#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
++#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || (defined(OS_LINUX) && !defined(OS_ANDROID))
+     {"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName,
+      flag_descriptions::kSystemKeyboardLockDescription, kOsDesktop,
+      FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)},
+diff -up chromium-88.0.4324.11/chrome/browser/flag_descriptions.cc.accel-mjpeg chromium-88.0.4324.11/chrome/browser/flag_descriptions.cc
+--- chromium-88.0.4324.11/chrome/browser/flag_descriptions.cc.accel-mjpeg	2020-11-30 16:14:32.393366384 -0500
++++ chromium-88.0.4324.11/chrome/browser/flag_descriptions.cc	2020-11-30 16:20:50.174195910 -0500
+@@ -3704,12 +3704,24 @@
+     "Settings. "
+     "See go/betterAM";
+
++#endif
++
++// Chrome OS and Linux --------------------------------------------------------
++
++#if BUILDFLAG(IS_CHROMEOS_ASH) || (defined(OS_LINUX) && !defined(OS_ANDROID))
++
+ const char kAcceleratedMjpegDecodeName[] =
+     "Hardware-accelerated mjpeg decode for captured frame";
+ const char kAcceleratedMjpegDecodeDescription[] =
+     "Enable hardware-accelerated mjpeg decode for captured frame where "
+     "available.";
+
++#endif
++
++// Chrome OS ------------------------------------------------------------------
++
++#if BUILDFLAG(IS_CHROMEOS_ASH)
++
+ const char kAllowDisableMouseAccelerationName[] =
+     "Allow disabling mouse acceleration";
+ const char kAllowDisableMouseAccelerationDescription[] =
+diff -up chromium-88.0.4324.11/chrome/browser/flag_descriptions.h.accel-mjpeg chromium-88.0.4324.11/chrome/browser/flag_descriptions.h
+--- chromium-88.0.4324.11/chrome/browser/flag_descriptions.h.accel-mjpeg	2020-11-30 16:14:32.394366389 -0500
++++ chromium-88.0.4324.11/chrome/browser/flag_descriptions.h	2020-11-30 16:22:13.831601058 -0500
+@@ -2138,9 +2138,21 @@
+ extern const char kAccountManagementFlowsV2Name[];
+ extern const char kAccountManagementFlowsV2Description[];
+
++#endif
++
++// Chrome OS and Linux --------------------------------------------------------
++
++#if BUILDFLAG(IS_CHROMEOS_ASH) || (defined(OS_LINUX) && !defined(OS_ANDROID))
++
+ extern const char kAcceleratedMjpegDecodeName[];
+ extern const char kAcceleratedMjpegDecodeDescription[];
+
++#endif
++
++#if BUILDFLAG(IS_CHROMEOS_ASH)
++
++// Chrome OS ------------------------------------------------------------------
++
+ extern const char kAllowDisableMouseAccelerationName[];
+ extern const char kAllowDisableMouseAccelerationDescription[];
+

exclude_ymp.patch Added

fix_building_widevinecdm_with_chromium.patch Changed

@@ -1,27 +1,11 @@
-diff -urN chromium-67.0.3371.0.old/third_party/widevine/cdm/BUILD.gn chromium-67.0.3371.0/third_party/widevine/cdm/BUILD.gn
---- chromium-67.0.3371.0.old/third_party/widevine/cdm/BUILD.gn	2018-03-20 12:06:16.192778982 +0100
-+++ chromium-67.0.3371.0/third_party/widevine/cdm/BUILD.gn	2018-03-20 12:09:54.184846595 +0100
-@@ -10,12 +10,6 @@
- import("//media/media_options.gni")
- import("//third_party/widevine/cdm/widevine.gni")
- 
--# Internal Cast builds set enable_widevine=true to bring in Widevine support.
--# TODO(xhwang): Support component updated CDM on other platforms and remove this
--# assert.
--assert(!enable_widevine || is_win || is_mac || is_chromecast,
--       "Component updated CDM only supported on Windows and Mac for now.")
--
- widevine_arch = current_cpu
- if (widevine_arch == "x86") {
-   widevine_arch = "ia32"
-diff -urN chromium-67.0.3371.0.old/third_party/widevine/cdm/stub/widevine_cdm_version.h chromium-67.0.3371.0/third_party/widevine/cdm/stub/widevine_cdm_version.h
---- chromium-67.0.3371.0.old/third_party/widevine/cdm/stub/widevine_cdm_version.h	2018-03-20 12:06:16.192778982 +0100
-+++ chromium-67.0.3371.0/third_party/widevine/cdm/stub/widevine_cdm_version.h	2018-03-20 12:08:24.415172133 +0100
-@@ -10,6 +10,7 @@
- 
- #include "third_party/widevine/cdm/widevine_cdm_common.h"
- 
+Index: chromium-79.0.3941.4/third_party/widevine/cdm/widevine_cdm_version.h
+===================================================================
+--- chromium-79.0.3941.4.orig/third_party/widevine/cdm/widevine_cdm_version.h
++++ chromium-79.0.3941.4/third_party/widevine/cdm/widevine_cdm_version.h
+@@ -11,5 +11,6 @@
+ // If the Widevine CDM is available define the following:
+ //  - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
+ //    as a string, e.g., "1.0.123.456").
 +#define WIDEVINE_CDM_VERSION_STRING "unknown"
- #define WIDEVINE_CDM_AVAILABLE
  
  #endif  // WIDEVINE_CDM_VERSION_H_

gcc-enable-lto.patch Added

@@ -0,0 +1,55 @@
+Index: chromium-85.0.4183.69/build/config/BUILDCONFIG.gn
+===================================================================
+--- chromium-85.0.4183.69.orig/build/config/BUILDCONFIG.gn
++++ chromium-85.0.4183.69/build/config/BUILDCONFIG.gn
+@@ -130,6 +130,8 @@ declare_args() {
+   # separate flags.
+   is_official_build = false
+ 
++  gcc_lto = false
++
+   # Set to true when compiling with the Clang compiler.
+   is_clang = current_os != "linux" ||
+              (current_cpu != "s390x" && current_cpu != "s390" &&
+@@ -441,6 +443,12 @@ default_compiler_configs = [
+   "//build/config/sanitizers:default_sanitizer_flags",
+ ]
+ 
++if (gcc_lto) {
++  default_compiler_configs += [
++    "//build/config/compiler:gcc_lto",
++  ]
++}
++
+ if (is_win) {
+   default_compiler_configs += [
+     "//build/config/win:default_cfg_compiler",
+Index: chromium-85.0.4183.69/build/config/compiler/BUILD.gn
+===================================================================
+--- chromium-85.0.4183.69.orig/build/config/compiler/BUILD.gn
++++ chromium-85.0.4183.69/build/config/compiler/BUILD.gn
+@@ -1947,6 +1947,10 @@ if (is_win) {
+   }
+ }
+ 
++config("gcc_lto") {
++  cflags = [ "-flto" ]
++}
++
+ config("default_stack_frames") {
+   if (is_posix || is_fuchsia) {
+     if (enable_frame_pointers) {
+Index: chromium-85.0.4183.69/sandbox/linux/BUILD.gn
+===================================================================
+--- chromium-85.0.4183.69.orig/sandbox/linux/BUILD.gn
++++ chromium-85.0.4183.69/sandbox/linux/BUILD.gn
+@@ -250,6 +250,9 @@ component("seccomp_bpf") {
+     "//build:chromeos_buildflags",
+     "//sandbox:sandbox_buildflags",
+   ]
++  if (gcc_lto) {
++    configs -= [ "//build/config/compiler:gcc_lto" ]
++  }
+ 
+   if (is_android) {
+     sources += [

no-location-leap151.patch Added

@@ -0,0 +1,26 @@
+Index: chromium-86.0.4240.75/base/location.h
+===================================================================
+--- chromium-86.0.4240.75.orig/base/location.h
++++ chromium-86.0.4240.75/base/location.h
+@@ -23,7 +23,7 @@ namespace base {
+ #define SUPPORTS_LOCATION_BUILTINS                                       \
+   (__has_builtin(__builtin_FUNCTION) && __has_builtin(__builtin_FILE) && \
+    __has_builtin(__builtin_LINE))
+-#elif defined(COMPILER_GCC) && __GNUC__ >= 7
++#elif defined(COMPILER_GCC) && __GNUC__ >= 10
+ // GCC has supported these for a long time, but they point at the function
+ // declaration in the case of default arguments, rather than at the call site.
+ #define SUPPORTS_LOCATION_BUILTINS 1
+Index: chromium-86.0.4240.75/base/location.cc
+===================================================================
+--- chromium-86.0.4240.75.orig/base/location.cc
++++ chromium-86.0.4240.75/base/location.cc
+@@ -92,7 +92,7 @@ NOINLINE Location Location::Current(cons
+ #else
+ // static
+ NOINLINE Location Location::Current() {
+-  return Location(nullptr, RETURN_ADDRESS());
++  return Location("[unknown file]", RETURN_ADDRESS());
+ }
+ #endif
+

system-libdrm.patch Added

BUILD.gn Deleted

INSTALL.sh Added

@@ -0,0 +1,149 @@
+#!/bin/bash
+set -x
+while getopts s:l:i: option
+do
+case "${option}" in
+s) STAGEDIR=${OPTARG};;
+l) LIBDIR=${OPTARG};;
+i) ICUDATAFILE=${OPTARG};;
+esac
+done
+OUTPUTDIR="out/Release"
+SHLIB_PERMS="755"
+PROGNAME="chrome"
+PACKAGE="chromium-browser"
+MENUNAME="Chromium Web Browser"
+CHANNEL="stable"
+INSTALLDIR="${LIBDIR}/chromium"
+
+install -m 755 -d \
+    "${STAGEDIR}/${INSTALLDIR}" \
+    "${STAGEDIR}/usr/bin" \
+    "${STAGEDIR}/usr/share/applications" \
+    "${STAGEDIR}/usr/share/metainfo" \
+    "${STAGEDIR}/usr/share/man/man1"
+
+# app
+buildfile="${OUTPUTDIR}/${PROGNAME}"
+install -m 755 "${buildfile}" "${STAGEDIR}/${INSTALLDIR}/${PROGNAME}"
+
+# crashpad
+buildfile="${OUTPUTDIR}/crashpad_handler"
+install -m 755 "${buildfile}" "${STAGEDIR}/${INSTALLDIR}/crashpad_handler"
+
+# resources
+install -m 644 "${OUTPUTDIR}/resources.pak" "${STAGEDIR}/${INSTALLDIR}/"
+install -m 644 "${OUTPUTDIR}/chrome_100_percent.pak" "${STAGEDIR}/${INSTALLDIR}/"
+install -m 644 "${OUTPUTDIR}/chrome_200_percent.pak" "${STAGEDIR}/${INSTALLDIR}/"
+
+# ICU data file; Necessary when the GN icu_use_data_file flag is true.
+if [ "x$ICUDATAFILE" == "xtrue" ]; then
+    install -m 644 "${OUTPUTDIR}/icudtl.dat" "${STAGEDIR}/${INSTALLDIR}/"
+fi
+
+# V8 snapshot files; Necessary when the GN v8_use_external_startup_data flag
+  # is true.
+  # Use v8_context_snapshot.bin instead of snapshot_blob.bin if it is available.
+  # TODO(crbug.com/764576): Unship snapshot_blob.bin on ChromeOS and drop this branch
+install -m 644 "${OUTPUTDIR}/v8_context_snapshot.bin" "${STAGEDIR}/${INSTALLDIR}/"
+
+# l10n paks
+install -m 755 -d "${STAGEDIR}/${INSTALLDIR}/locales/"
+find "${OUTPUTDIR}/locales" -type f -name '*.pak' -print -exec \
+    cp -a {} "${STAGEDIR}/${INSTALLDIR}/locales/" \;
+find "${STAGEDIR}/${INSTALLDIR}/locales" -type f -print -exec chmod 644 {} \;
+
+# MEI Preload
+if [ -f "${OUTPUTDIR}/MEIPreload/manifest.json" ]; then
+    install -m 755 -d "${STAGEDIR}/${INSTALLDIR}/MEIPreload/"
+    install -m 644 "${OUTPUTDIR}/MEIPreload/manifest.json" "${STAGEDIR}/${INSTALLDIR}/MEIPreload/"
+    install -m 644 "${OUTPUTDIR}/MEIPreload/preloaded_data.pb" "${STAGEDIR}/${INSTALLDIR}/MEIPreload/"
+fi
+
+# ANGLE
+if [ -f "${OUTPUTDIR}/libEGL.so" ]; then
+    for file in libEGL.so libGLESv2.so;
+    do
+        buildfile="${OUTPUTDIR}/${file}"
+        install -m ${SHLIB_PERMS} "${buildfile}" "${STAGEDIR}/${INSTALLDIR}/${file}"
+    done
+fi
+
+# ANGLE's libvulkan library
+if [ -f "${OUTPUTDIR}/libvulkan.so.1" ]; then
+    file="libvulkan.so.1"
+    buildfile="${OUTPUTDIR}/${file}"
+    install -m 755 "${buildfile}" "${STAGEDIR}/${INSTALLDIR}/${file}"
+fi
+
+# SwiftShader ES
+if [ -f "${OUTPUTDIR}/swiftshader/libEGL.so" ]; then
+    install -m 755 -d "${STAGEDIR}/${INSTALLDIR}/swiftshader/"
+    for file in libEGL.so libGLESv2.so;
+    do
+        buildfile="${OUTPUTDIR}/swiftshader/${file}"
+        install -m ${SHLIB_PERMS} "${buildfile}" "${STAGEDIR}/${INSTALLDIR}/swiftshader/${file}"
+    done
+fi
+
+# SwiftShader VK
+if [ -f "${OUTPUTDIR}/libvk_swiftshader.so" ]; then
+    install -m 755 -d "${STAGEDIR}/${INSTALLDIR}/"
+    file="libvk_swiftshader.so"
+    buildfile="${OUTPUTDIR}/${file}"
+    install -m ${SHLIB_PERMS} "${buildfile}" "${STAGEDIR}/${INSTALLDIR}/${file}"
+fi
+if [ -f "${OUTPUTDIR}/vk_swiftshader_icd.json" ]; then
+# Install the ICD json file to point ANGLE to libvk_swiftshader.so
+    install -m 644 "${OUTPUTDIR}/vk_swiftshader_icd.json" "${STAGEDIR}/${INSTALLDIR}/"
+fi
+
+# default apps
+if [ -d "${OUTPUTDIR}/default_apps" ]; then
+    cp -a "${OUTPUTDIR}/default_apps" "${STAGEDIR}/${INSTALLDIR}/"
+    find "${STAGEDIR}/${INSTALLDIR}/default_apps" -type d -exec chmod 755 '{}' \;
+    find "${STAGEDIR}/${INSTALLDIR}/default_apps" -type f -exec chmod 644 '{}' \;
+fi
+
+# launcher script and symlink
+sed \
+    -e "s#@@PROGNAME@@#${PROGNAME}#g" \
+    -e "s#@@CHANNEL@@#${CHANNEL}#g" \
+    "chrome/installer/linux/common/wrapper" > "${STAGEDIR}/${INSTALLDIR}/chrome-wrapper"
+chmod 755 "${STAGEDIR}/${INSTALLDIR}/chrome-wrapper"
+ln -s "${INSTALLDIR}/chrome-wrapper" "${STAGEDIR}/usr/bin/${PACKAGE}" 
+
+# app icons
+for size in 16 32;
+do
+    icon="chrome/app/theme/default_100_percent/chromium/product_logo_${size}.png"
+    installpath="${STAGEDIR}/usr/share/icons/hicolor/${size}x${size}/apps/chromium-browser.png"
+    install -D -m 644 ${icon} ${installpath}
+done
+for size in 24 48 64 128 256;
+do
+    icon="chrome/app/theme/chromium/product_logo_${size}.png"
+    installpath="${STAGEDIR}/usr/share/icons/hicolor/${size}x${size}/apps/chromium-browser.png"
+    install -D -m 644 ${icon} ${installpath}
+done
+
+# desktop integration
+## AppData
+install -m 644 "chrome/installer/linux/common/chromium-browser/chromium-browser.appdata.xml" \
+"${STAGEDIR}/usr/share/metainfo/${PACKAGE}.appdata.xml"
+
+## Desktop file
+sed \
+    -e "s#@@MENUNAME@@#${MENUNAME}#g" \
+    -e "s#@@USR_BIN_SYMLINK_NAME@@#${PACKAGE}#g" \
+    -e "s#@@PACKAGE@@#${PACKAGE}#g" \
+    "chrome/installer/linux/common/desktop.template" > "${STAGEDIR}/usr/share/applications/${PACKAGE}.desktop"
+chmod 644 "${STAGEDIR}/usr/share/applications/${PACKAGE}.desktop"
+
+# documentation
+sed \
+    -e "s#@@MENUNAME@@#${MENUNAME}#g" \
+    -e "s#@@PACKAGE@@#${PACKAGE}#g" \
+    "chrome/app/resources/manpage.1.in" > "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1"
+gzip -9n "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1"
+chmod 644 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1.gz"

README.SUSE Added

_constraints Changed

chromium-69.0.3497.100.tar.xz -> chromium-93.0.4577.82.tar.xz Changed

chromium-symbolic.svg Added

@@ -0,0 +1,8 @@
+<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -292.77)" fill-rule="evenodd">
+  <path transform="translate(0 292.77)" d="m8 0c-2.9688 0-5.5431 1.6049-6.9238 3.9941l3.4629 5.998 0.0058594-0.0039063c-0.33743-0.587-0.54492-1.2599-0.54492-1.9883 0-2.216 1.784-4 4-4h6.918l0.007812-0.0039062c-1.3803-2.3906-3.956-3.9961-6.9258-3.9961zm-6.9238 3.9941c-0.16618 0.28757-0.31369 0.58593-0.44336 0.89453 0.12852-0.30638 0.27614-0.60523 0.44336-0.89453zm-0.81445 2.002c-0.063348 0.24696-0.11637 0.49818-0.15625 0.75391 0.040321-0.25396 0.09178-0.50523 0.15625-0.75391zm-0.19336 1.002c-0.031547 0.25414-0.049317 0.51231-0.056641 0.77344 0.0074787-0.25874 0.024224-0.51758 0.056641-0.77344zm-0.066406 0.96289c-6.3137e-5 0.013175-0.0019531 0.025872-0.0019531 0.039062 0 0.31231 0.022151 0.61909 0.056641 0.92188-0.037536-0.3208-0.05629-0.64074-0.054688-0.96094zm0.076172 1.1016c0.038415 0.29125 0.093448 0.5771 0.16211 0.85742-0.070883-0.28406-0.12335-0.57082-0.16211-0.85742zm0.19727 0.99805c0.091086 0.3385 0.20625 0.67364 0.34375 1.0039-0.13429-0.32476-0.25247-0.65856-0.34375-1.0039zm0.34375 1.0039c0.093646 0.22647 0.20902 0.4391 0.32227 0.6543-0.11418-0.21652-0.22997-0.43262-0.32227-0.6543zm0.32227 0.6543c0.047723 0.090496 0.083121 0.18399 0.13477 0.27344 0.0068955 0.011943 0.016491 0.021308 0.023438 0.033203-0.057828-0.099177-0.10459-0.20477-0.1582-0.30664zm0.1582 0.30664c0.18369 0.31503 0.38946 0.61488 0.61328 0.90039-0.22081-0.2833-0.42705-0.5815-0.61328-0.90039zm0.67383 0.98828c0.24745 0.30711 0.51472 0.59779 0.80469 0.86523-0.286-0.26475-0.5556-0.55416-0.80469-0.86523zm1.4141 1.373c0.19915 0.15005 0.40407 0.29066 0.61719 0.42188-0.21156-0.1305-0.41738-0.27099-0.61719-0.42188zm0.64844 0.44141c0.20201 0.12309 0.40966 0.23664 0.62305 0.3418-0.21134-0.10449-0.42088-0.21838-0.62305-0.3418zm0.71484 0.38672c0.19014 0.090687 0.38386 0.17422 0.58203 0.25-0.1972-0.075792-0.39101-0.15859-0.58203-0.25zm0.74609 0.30859c0.18385 0.065711 0.36872 0.12728 0.55859 0.17969-0.18849-0.052523-0.37433-0.11344-0.55859-0.17969zm0.75586 0.23047c0.17137 0.042615 0.34392 0.081857 0.51953 0.11328-0.1743-0.031708-0.34783-0.070112-0.51953-0.11328zm0.84375 0.16211c0.14048 0.019266 0.28107 0.038852 0.42383 0.050781-0.1422-0.012166-0.28272-0.031057-0.42383-0.050781zm0.85156 0.072265c0.084408 0.00261 0.16689 0.011719 0.25195 0.011719v-0.007812c-0.084073-4e-6 -0.16806-0.001251-0.25195-0.003907z"/>
+  <path transform="translate(0 292.77)" d="m8.2051-0.0039062c-0.067876-0.0018334-0.13533 0.0040042-0.20312 0.0039062 0.36876 8.8644e-5 0.73088 0.02619 1.0859 0.074219-0.29424-0.041037-0.58844-0.070174-0.88281-0.078125zm-0.21289 0.0039062c-0.26615-5.8021e-5 -0.53129 0.014666-0.79492 0.041016 0.26143-0.025824 0.52654-0.040759 0.79492-0.041016zm-0.85156 0.046875c-0.23605 0.025293-0.47073 0.061354-0.70312 0.10742 0.23076-0.045338 0.46557-0.082259 0.70312-0.10742zm1.9727 0.03125c0.29658 0.042337 0.59114 0.10493 0.88477 0.18164-0.28938-0.074218-0.58339-0.13988-0.88477-0.18164zm-2.8145 0.10547c-0.20793 0.045059-0.41353 0.096739-0.61719 0.1582 0.20238-0.060783 0.4083-0.11329 0.61719-0.1582zm4.0117 0.16406c0.17588 0.052879 0.34712 0.11527 0.51758 0.17969-0.17171-0.065602-0.3437-0.12659-0.51758-0.17969zm-4.7949 0.048828c-0.18254 0.059478-0.363 0.12276-0.54102 0.19531 0.17733-0.072143 0.35752-0.13576 0.54102-0.19531zm-0.75195 0.28711c-0.16297 0.071956-0.32421 0.14754-0.48242 0.23047 0.15724-0.082363 0.31917-0.15847 0.48242-0.23047zm6.4824 0.0078125c0.11114 0.049754 0.22028 0.11078 0.33008 0.16602-0.11024-0.055265-0.21697-0.11578-0.33008-0.16602zm-7.1875 0.3457c-0.15224 0.086105-0.30238 0.17512-0.44922 0.27148 0.14627-0.09592 0.29643-0.18512 0.44922-0.27148zm8.332 0.29102c0.12847 0.084776 0.25775 0.1679 0.38086 0.25977-0.12261-0.090957-0.2518-0.17494-0.38086-0.25977zm-8.9746 0.11328c-0.14122 0.098764-0.2788 0.20216-0.41406 0.31055 0.13477-0.10781 0.27232-0.21151 0.41406-0.31055zm9.6836 0.4082c0.14161 0.11775 0.281 0.2381 0.41406 0.36523-0.13289-0.12624-0.27123-0.24721-0.41406-0.36523zm-10.328 0.095703c-0.10925 0.094548-0.21767 0.18998-0.32227 0.29102 0.10418-0.10034 0.21274-0.19643 0.32227-0.29102zm11.002 0.52539c0.18123 0.18967 0.35359 0.38691 0.51562 0.59375-0.16146-0.20541-0.33262-0.40324-0.51562-0.59375zm-11.592 0.039062c-0.087652 0.093206-0.17413 0.18711-0.25781 0.28516 0.083362-0.097301 0.16992-0.19202 0.25781-0.28516zm-0.5332 0.62891c-0.066279 0.086893-0.13213 0.17344-0.19531 0.26367 0.062985-0.089711 0.12878-0.17674 0.19531-0.26367zm12.717 0.015625c0.19435 0.25492 0.36841 0.52294 0.5293 0.79688-0.16178-0.27581-0.3368-0.54357-0.5293-0.79688zm-13.176 0.6543c-0.040114 0.065194-0.086473 0.12468-0.125 0.19141l0.0058594 0.0039062c0.038163-0.06626 0.07915-0.13028 0.11914-0.19531zm6.8105 0.19141c2.216 0 4 1.784 4 4 0 0.73147-0.2087 1.4074-0.54883 1.9961l0.005859 0.0039062-0.13867 0.24023-3.3184 5.75v0.009766c2.7599-0.001023 5.4372-1.4285 6.9219-4 1.4856-2.5731 1.3819-5.6088 0-8h-6.9219z" opacity=".55"/>
+  <path transform="translate(0 292.77)" d="m7.9922 0c-0.26839 2e-4 -0.53349 0.015216-0.79492 0.041016 0.26363-0.0263 0.52877-0.041076 0.79492-0.041016zm-0.85156 0.046875c-0.23755 0.02512-0.47236 0.062122-0.70312 0.10742 0.2324-0.04602 0.46708-0.082122 0.70312-0.10742zm-0.8418 0.13672c-0.20888 0.04491-0.41481 0.097403-0.61719 0.1582 0.20366-0.0615 0.40926-0.1131 0.61719-0.1582zm4.0117 0.16406c0.17388 0.0531 0.34587 0.11409 0.51758 0.17969-0.17045-0.06442-0.3417-0.12679-0.51758-0.17969zm-4.7949 0.048828c-0.18349 0.05955-0.36369 0.12321-0.54102 0.19531 0.17802-0.07256 0.35848-0.13581 0.54102-0.19531zm-0.75195 0.28711c-0.16325 0.07199-0.32518 0.14807-0.48242 0.23047 0.15821-0.08294 0.31945-0.15847 0.48242-0.23047zm-0.70508 0.35352c-0.15279 0.08637-0.30295 0.17558-0.44922 0.27148 0.14684-0.09637 0.29698-0.18538 0.44922-0.27148zm8.332 0.29102c0.12906 0.08482 0.25825 0.16877 0.38086 0.25977-0.12311-0.09186-0.25239-0.17497-0.38086-0.25977zm-8.9746 0.11328c-0.14174 0.09904-0.2793 0.20274-0.41406 0.31055 0.13527-0.10839 0.27284-0.21175 0.41406-0.31055zm9.6836 0.4082c0.14284 0.11803 0.28117 0.23899 0.41406 0.36523-0.13307-0.12714-0.27246-0.24748-0.41406-0.36523zm-10.328 0.095703c-0.10952 0.09459-0.21808 0.19069-0.32227 0.29102 0.1046-0.10103 0.21302-0.19652 0.32227-0.29102zm11.002 0.52539c0.18301 0.1905 0.35417 0.38834 0.51562 0.59375-0.16203-0.20684-0.3344-0.40409-0.51562-0.59375zm-11.592 0.039062c-0.08789 0.09314-0.17445 0.18786-0.25781 0.28516 0.083679-0.09804 0.17016-0.19196 0.25781-0.28516zm-0.5332 0.62891c-0.066533 0.08694-0.13233 0.17397-0.19531 0.26367 0.063183-0.09023 0.12903-0.17677 0.19531-0.26367zm13.283 0.85352-0.013672 0.0078125h0.003906c1.0361 1.7929 1.3524 3.9472 0.82031 5.998 0.51081-1.9573 0.28609-4.1064-0.81055-6.0059zm-13.855 0.0019531c-0.0019132 0.0032892-0.0039597 0.0064654-0.0058594 0.0097656-1.3768 2.3898-1.4778 5.4185 0.0058594 7.9883 1.4849 2.572 4.1633 3.9999 6.9238 4v-0.001954l3.3184-5.75c-0.71742 1.0637-1.9334 1.7598-3.3184 1.7598-1.4877 0-2.7659-0.81274-3.4551-2.0117l-0.0058594 0.0039063-3.4629-5.998zm10.242 6.2461 0.13867-0.24023-0.005859-0.0039062c-0.046283 0.080108-0.081254 0.1677-0.13281 0.24414zm4.4238-0.23828c-0.17464 0.67175-0.44309 1.3319-0.80469 1.9648 0.3561-0.6189 0.62541-1.2792 0.80469-1.9648zm-0.80469 1.9648c-0.008878 0.01543-0.016406 0.031498-0.025391 0.046875 0.002853-0.004915 0.006923-0.008748 0.009766-0.013672 0.006215-0.010765 0.009465-0.022422 0.015625-0.033203zm-0.025391 0.046875c-0.16138 0.27807-0.34026 0.53954-0.5293 0.78906 0.19208-0.25377 0.37016-0.51671 0.5293-0.78906zm-0.5293 0.78906c-0.034882 0.046087-0.07147 0.09131-0.10742 0.13672 0.036023-0.045459 0.072258-0.090304 0.10742-0.13672zm-0.10742 0.13672c-0.19263 0.24309-0.39299 0.47669-0.60742 0.69336 0.21926-0.21926 0.4175-0.45347 0.60742-0.69336zm-0.75977 0.84375c-0.16802 0.16083-0.34574 0.30905-0.52539 0.45312 0.18255-0.14513 0.35845-0.29493 0.52539-0.45312zm-0.79492 0.66992c-0.19636 0.14387-0.40011 0.27399-0.60742 0.39844 0.20953-0.12546 0.41362-0.25756 0.60742-0.39844zm-1.1328 0.68164c-0.13759 0.069106-0.27496 0.1383-0.41602 0.19922 0.14014-0.060811 0.27798-0.12975 0.41602-0.19922zm-0.8125 0.35547c-0.17664 0.065328-0.35449 0.127-0.53516 0.17969 0.17969-0.052782 0.3577-0.11362 0.53516-0.17969zm-0.86914 0.27148c-0.23843 0.058475-0.47953 0.1042-0.72266 0.14062 0.2417-0.036415 0.48287-0.081371 0.72266-0.14062zm-0.90625 0.17383c-0.30489 0.038433-0.61309 0.055452-0.92188 0.058594 0.30718-0.003008 0.61446-0.019611 0.92188-0.058594z" opacity=".7"/>
+  <rect x="5" y="297.77" width="6" height="6" ry="3" opacity=".85"/>
+ </g>
+</svg>

highway-0.12.2.tar.gz Added

master_preferences Added

Build Results
RPM Lint

Refresh

Comments for request 5453 1

Kieltux wrote about 3 years ago

Changelog info is a little bit short, I know. - Did a link to project="openSUSE.org:network:chromium" package="chromium" - Dropped chromium.spec and chromium.changes - Added chromium.spec again as chromium-ffmpeg-extra.spec and changed the build process to only build libffmpeg.

Request History

Kieltux created request about 3 years ago

- Update to 93.0.4577.82
Branch of https://build.opensuse.org/project/show/network:chromium
- Drop conditional build for libffmpeg, we want it here definitely

awissu accepted request about 3 years ago

I added you to the maintainers