Date: Sunday, January 30, 2022 @ 11:45:44 Author: arojas Revision: 1120227
archrelease: copy trunk to community-staging-x86_64 Added: electron15/repos/community-staging-x86_64/ electron15/repos/community-staging-x86_64/PKGBUILD (from rev 1120226, electron15/trunk/PKGBUILD) electron15/repos/community-staging-x86_64/add-a-TODO-about-a-missing-pnacl-flag.patch (from rev 1120226, electron15/trunk/add-a-TODO-about-a-missing-pnacl-flag.patch) electron15/repos/community-staging-x86_64/chromium-93-ffmpeg-4.4.patch (from rev 1120226, electron15/trunk/chromium-93-ffmpeg-4.4.patch) electron15/repos/community-staging-x86_64/chromium-94-ffmpeg-roll.patch (from rev 1120226, electron15/trunk/chromium-94-ffmpeg-roll.patch) electron15/repos/community-staging-x86_64/default_app-icon.patch (from rev 1120226, electron15/trunk/default_app-icon.patch) electron15/repos/community-staging-x86_64/electron-launcher.sh (from rev 1120226, electron15/trunk/electron-launcher.sh) electron15/repos/community-staging-x86_64/electron.desktop (from rev 1120226, electron15/trunk/electron.desktop) electron15/repos/community-staging-x86_64/gn-visibility-gmock.patch (from rev 1120226, electron15/trunk/gn-visibility-gmock.patch) electron15/repos/community-staging-x86_64/gn-visibility-mojo.patch (from rev 1120226, electron15/trunk/gn-visibility-mojo.patch) electron15/repos/community-staging-x86_64/gn-visibility-webrtc.patch (from rev 1120226, electron15/trunk/gn-visibility-webrtc.patch) electron15/repos/community-staging-x86_64/jinja-python-3.10.patch (from rev 1120226, electron15/trunk/jinja-python-3.10.patch) electron15/repos/community-staging-x86_64/replace-blacklist-with-ignorelist.patch (from rev 1120226, electron15/trunk/replace-blacklist-with-ignorelist.patch) electron15/repos/community-staging-x86_64/sql-make-VirtualCursor-standard-layout-type.patch (from rev 1120226, electron15/trunk/sql-make-VirtualCursor-standard-layout-type.patch) electron15/repos/community-staging-x86_64/unbundle-fix-visibility-of-build-config-freetype.patch (from rev 1120226, electron15/trunk/unbundle-fix-visibility-of-build-config-freetype.patch) electron15/repos/community-staging-x86_64/unexpire-accelerated-video-decode-flag.patch (from rev 1120226, electron15/trunk/unexpire-accelerated-video-decode-flag.patch) electron15/repos/community-staging-x86_64/use-ffile-compilation-dir.patch (from rev 1120226, electron15/trunk/use-ffile-compilation-dir.patch) electron15/repos/community-staging-x86_64/use-system-libraries-in-node.patch (from rev 1120226, electron15/trunk/use-system-libraries-in-node.patch) --------------------------------------------------------+ PKGBUILD | 290 +++++++++++++++ add-a-TODO-about-a-missing-pnacl-flag.patch | 28 + chromium-93-ffmpeg-4.4.patch | 36 + chromium-94-ffmpeg-roll.patch | 49 ++ default_app-icon.patch | 21 + electron-launcher.sh | 20 + electron.desktop | 7 gn-visibility-gmock.patch | 43 ++ gn-visibility-mojo.patch | 36 + gn-visibility-webrtc.patch | 45 ++ jinja-python-3.10.patch | 33 + replace-blacklist-with-ignorelist.patch | 196 ++++++++++ sql-make-VirtualCursor-standard-layout-type.patch | 238 ++++++++++++ unbundle-fix-visibility-of-build-config-freetype.patch | 31 + unexpire-accelerated-video-decode-flag.patch | 11 use-ffile-compilation-dir.patch | 65 +++ use-system-libraries-in-node.patch | 52 ++ 17 files changed, 1201 insertions(+) Copied: electron15/repos/community-staging-x86_64/PKGBUILD (from rev 1120226, electron15/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2022-01-30 11:45:44 UTC (rev 1120227) @@ -0,0 +1,290 @@ +# Maintainer: Nicola Squartini <tens...@gmail.com> + +_use_suffix=1 +pkgver=15.3.6 +_commit=a636ab7c6169f90c2b5d9db48795655f8b7fdefe +_chromiumver=94.0.4606.81 +_gcc_patchset=3 +# shellcheck disable=SC2034 +pkgrel=2 + +_major_ver=${pkgver%%.*} +if [[ ${_use_suffix} != 0 ]]; then + pkgname="electron${_major_ver}" +else + pkgname=electron +fi +# shellcheck disable=SC2034 +pkgdesc='Build cross platform desktop apps with web technologies' +# shellcheck disable=SC2034 +arch=('x86_64') +# shellcheck disable=SC2034 +url='https://electronjs.org/' +# shellcheck disable=SC2034 +license=('MIT' 'custom') +# shellcheck disable=SC2034 +depends=('c-ares' 'ffmpeg' 'gtk3' 'libevent' 'libxslt' 'minizip' 'nss' 're2' + 'snappy') +# shellcheck disable=SC2034 +makedepends=('clang' 'git' 'gn' 'gperf' 'harfbuzz-icu' 'http-parser' + 'java-runtime-headless' 'jsoncpp' 'libnotify' 'lld' 'llvm' 'ninja' + 'npm' 'pciutils' 'pipewire' 'python' 'wget' 'yarn') +# shellcheck disable=SC2034 +optdepends=('kde-cli-tools: file deletion support (kioclient5)' + 'libappindicator-gtk3: StatusNotifierItem support' + 'pipewire: WebRTC desktop sharing under Wayland' + 'trash-cli: file deletion support (trash-put)' + "xdg-utils: open URLs with desktop's default (xdg-email, xdg-open)") +if [[ ${_use_suffix} == 0 ]]; then + # shellcheck disable=SC2034 + conflicts=("electron${_major_ver}") + # shellcheck disable=SC2034 + provides=("electron${_major_ver}") +fi +# shellcheck disable=SC2034 +options=('!lto') # Electron adds its own flags for ThinLTO +# shellcheck disable=SC2034 +source=('git+https://github.com/electron/electron.git' + 'git+https://chromium.googlesource.com/chromium/tools/depot_tools.git#branch=main' + "https://github.com/stha09/chromium-patches/releases/download/chromium-${_chromiumver%%.*}-patchset-${_gcc_patchset}/chromium-${_chromiumver%%.*}-patchset-${_gcc_patchset}.tar.xz" + "electron-launcher.sh" + "electron.desktop" + 'default_app-icon.patch' + 'jinja-python-3.10.patch' + 'use-system-libraries-in-node.patch' + 'replace-blacklist-with-ignorelist.patch' + 'sql-make-VirtualCursor-standard-layout-type.patch' + 'unbundle-fix-visibility-of-build-config-freetype.patch' + 'gn-visibility-gmock.patch' + 'gn-visibility-mojo.patch' + 'gn-visibility-webrtc.patch' + 'add-a-TODO-about-a-missing-pnacl-flag.patch' + 'chromium-93-ffmpeg-4.4.patch' + 'chromium-94-ffmpeg-roll.patch' + 'unexpire-accelerated-video-decode-flag.patch' + 'use-ffile-compilation-dir.patch' + ) +# shellcheck disable=SC2034 +sha256sums=('SKIP' + 'SKIP' + '22692bddaf2761c6ddf9ff0bc4722972bca4d4c5b2fd3e5dbdac7eb60d914320' + '3953f532a3ea5fce19ee33600c6ead89dcd066df6a01d3c3ab4c24f96e46fca2' + '4484200d90b76830b69eea3a471c103999a3ce86bb2c29e6c14c945bf4102bae' + '75bac9c4ad32ff9329399b8587f9772e208c009fd822cdfce61b2bd1ee9ac828' + '09de0ebb4002be7fb4ede63d3977e4f1235637750169c9e71bfdbd75bf750f7a' + '7cb11fb44aaf4d15f36caca3c0d1b082a723c30d43cd44db147248db5683a2a9' + 'd3344ba39b8c6ed202334ba7f441c70d81ddf8cdb15af1aa8c16e9a3a75fbb35' + 'dd317f85e5abfdcfc89c6f23f4c8edbcdebdd5e083dcec770e5da49ee647d150' + 'd0b17162211dd49e3a58c16d1697e7d8c322dcfd3b7890f0c2f920b711f52293' + 'b9934e01d8f39beafc8b63784fb86e6befe25ca83e9c43224c8374e5a025d8ef' + 'cca2d224cf2e9d7cfb4f5729ca76b5b8a7100b1ca39892b41fb296adaced1bf7' + '574785a21168c3e9b7aa82630713ceb6ced12f699133db66b10fc84b7bb2c631' + 'd53da216538f2e741a6e048ed103964a91a98e9a3c10c27fdfa34d4692fdc455' + '1a9e074f417f8ffd78bcd6874d8e2e74a239905bf662f76a7755fa40dc476b57' + '56acb6e743d2ab1ed9f3eb01700ade02521769978d03ac43226dec94659b3ace' + '2a97b26c3d6821b15ef4ef1369905c6fa3e9c8da4877eb9af4361452a425290b' + '921010cd8fab5f30be76c68b68c9b39fac9e21f4c4133bb709879592bbdf606e' + ) + +_system_libs=('ffmpeg' + 'flac' + 'fontconfig' + 'freetype' + 'harfbuzz-ng' + 'icu' + 'libdrm' + 'libevent' + 'libjpeg' + 'libpng' +# 'libvpx' + 'libwebp' + 'libxml' + 'libxslt' +# 'openh264' + 'opus' + 're2' + 'snappy' + 'zlib' + ) + +prepare() { + sed -i "s|@ELECTRON@|${pkgname}|" electron-launcher.sh + sed -i "s|@ELECTRON@|${pkgname}|" electron.desktop + if [[ ${_use_suffix} != 0 ]]; then + sed -i "s|@ELECTRON_NAME@|Electron ${_major_ver}|" electron.desktop + else + sed -i "s|@ELECTRON_NAME@|Electron|" electron.desktop + fi + + export PATH="${PATH}:${srcdir:?}/depot_tools" + + echo "Fetching chromium..." + git clone --branch=${_chromiumver} --depth=1 \ + https://chromium.googlesource.com/chromium/src.git + + echo "solutions = [ + { + \"name\": \"src/electron\", + \"url\": \"file://${srcdir}/electron@${_commit}\", + \"deps_file\": \"DEPS\", + \"managed\": False, + \"custom_deps\": { + \"src\": None, + }, + \"custom_vars\": {}, + }, +]" > .gclient + + python "${srcdir}/depot_tools/gclient.py" sync \ + --with_branch_heads \ + --with_tags \ + --nohooks + + echo "Running hooks..." + # python "${srcdir}/depot_tools/gclient.py" runhooks + src/build/landmines.py + src/build/util/lastchange.py -o src/build/util/LASTCHANGE + src/build/util/lastchange.py -m GPU_LISTS_VERSION \ + --revision-id-only --header src/gpu/config/gpu_lists_version.h + src/build/util/lastchange.py -m SKIA_COMMIT_HASH \ + -s src/third_party/skia --header src/skia/ext/skia_commit_hash.h + # Create sysmlink to system clang-format + ln -s /usr/bin/clang-format src/buildtools/linux64 + # Create sysmlink to system Node.js + mkdir -p src/third_party/node/linux/node-linux-x64/bin + ln -sf /usr/bin/node src/third_party/node/linux/node-linux-x64/bin + src/third_party/depot_tools/download_from_google_storage.py \ + --no_resume --extract --no_auth --bucket chromium-nodejs \ + -s src/third_party/node/node_modules.tar.gz.sha1 + vpython src/tools/download_optimization_profile.py \ + --newest_state=src/chrome/android/profiles/newest.txt \ + --local_state=src/chrome/android/profiles/local.txt \ + --output_name=src/chrome/android/profiles/afdo.prof \ + --gs_url_base=chromeos-prebuilt/afdo-job/llvm + #vpython src/tools/update_pgo_profiles.py \ + # --target=linux \ + # update \ + # --gs-url-base=chromium-optimization-profiles/pgo_profiles + src/electron/script/apply_all_patches.py \ + src/electron/patches/config.json + cd src/electron || exit + yarn install --frozen-lockfile + cd .. + + echo "Applying local patches..." + # Fixes for building with libstdc++ instead of libc++ + patch -Np1 -i ../patches/chromium-90-ruy-include.patch + patch -Np1 -i ../patches/chromium-94-CustomSpaces-include.patch + + # Patches to build with ffmpeg 4.4; remove when ffmpeg 5.0 moves to stable + if ! pkg-config --atleast-version 59 libavformat; then + patch -Np1 -i ../chromium-93-ffmpeg-4.4.patch + patch -Rp1 -i ../chromium-94-ffmpeg-roll.patch + fi + + patch -Np1 -i ../unbundle-fix-visibility-of-build-config-freetype.patch + patch -Np1 -i ../gn-visibility-gmock.patch + patch -Np1 -i ../gn-visibility-mojo.patch + patch -Np1 -i ../gn-visibility-webrtc.patch + patch -Rp1 -i ../add-a-TODO-about-a-missing-pnacl-flag.patch + patch -d third_party/jinja2 -Np1 -i ../../../jinja-python-3.10.patch + patch -Rp1 -i ../replace-blacklist-with-ignorelist.patch + patch -Np1 -i ../sql-make-VirtualCursor-standard-layout-type.patch + patch -Np0 -i ../unexpire-accelerated-video-decode-flag.patch + patch -Rp1 -i ../use-ffile-compilation-dir.patch + patch -d third_party/electron_node/tools/inspector_protocol/jinja2 \ + -Np1 -i ../../../../../../jinja-python-3.10.patch + patch -Np1 -i ../use-system-libraries-in-node.patch + patch -Np1 -i ../default_app-icon.patch # Icon from .desktop file + + echo "Patching Chromium for using system libraries..." + sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ + tools/generate_shim_headers/generate_shim_headers.py + for lib in $(printf "%s\n" "${_system_libs[@]}" | sed 's/^libjpeg$/&_turbo/'); do + third_party_dir="third_party/${lib}" + if [ ! -d "${third_party_dir}" ]; then + third_party_dir="base/${third_party_dir}" + fi + find "${third_party_dir}" -type f \ + \! -path "${third_party_dir}/chromium/*" \ + \! -path "${third_party_dir}/google/*" \ + \! -path 'third_party/harfbuzz-ng/utils/hb_scoped.h' \ + \! -regex '.*\.\(gn\|gni\|isolate\)' \ + -delete + done + build/linux/unbundle/replace_gn_files.py \ + --system-libraries \ + "${_system_libs[@]}" +} + +build() { + export CC=clang + export CXX=clang++ + export AR=ar + export NM=nm + + CFLAGS="${CFLAGS/-fexceptions/}" + CXXFLAGS="${CXXFLAGS/-fexceptions/}" + + # This appears to cause random segfaults when combined with ThinLTO + # https://bugs.archlinux.org/task/73518 + CFLAGS=${CFLAGS/-fstack-clash-protection} + CXXFLAGS=${CXXFLAGS/-fstack-clash-protection} + + # Do not warn about unknown warning options + CFLAGS+=' -Wno-unknown-warning-option' + CXXFLAGS+=' -Wno-unknown-warning-option' + + cd src || exit + export CHROMIUM_BUILDTOOLS_PATH="${PWD}/buildtools" + GN_EXTRA_ARGS=' + blink_symbol_level = 0 + chrome_pgo_phase = 0 + clang_use_chrome_plugins = false + custom_toolchain = "//build/toolchain/linux/unbundle:default" + host_toolchain = "//build/toolchain/linux/unbundle:default" + icu_use_data_file = false + is_component_ffmpeg = false + link_pulseaudio = true + rtc_use_pipewire = true + treat_warnings_as_errors = false + use_custom_libcxx = false + use_gnome_keyring = false + use_sysroot = false + ' + gn gen out/Release \ + --args="import(\"//electron/build/args/release.gn\") ${GN_EXTRA_ARGS}" + ninja -C out/Release electron + # Strip before zip to avoid + # zipfile.LargeZipFile: Filesize would require ZIP64 extensions + strip -s out/Release/electron + ninja -C out/Release electron_dist_zip + # ninja -C out/Release third_party/electron_node:headers +} + +package() { + install -dm755 "${pkgdir:?}/usr/lib/${pkgname}" + bsdtar -xf src/out/Release/dist.zip -C "${pkgdir}/usr/lib/${pkgname}" + + chmod u+s "${pkgdir}/usr/lib/${pkgname}/chrome-sandbox" + + install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}" + for l in "${pkgdir}/usr/lib/${pkgname}"/{LICENSE,LICENSES.chromium.html}; do + ln -s \ + "$(realpath --relative-to="${pkgdir}/usr/share/licenses/${pkgname}" "${l}")" \ + "${pkgdir}/usr/share/licenses/${pkgname}" + done + + install -Dm755 "${srcdir}/electron-launcher.sh" \ + "${pkgdir}/usr/bin/${pkgname}" + if [[ "${_use_suffix}" == 0 ]]; then + ln "${pkgdir}/usr/bin/${pkgname}" \ + "${pkgdir}/usr/bin/${pkgname}${_major_ver}" + fi + + # Install .desktop and icon file (see default_app-icon.patch) + install -Dm644 electron.desktop \ + "${pkgdir}/usr/share/applications/${pkgname}.desktop" + install -Dm644 src/electron/default_app/icon.png \ + "${pkgdir}/usr/share/pixmaps/${pkgname}.png" # hicolor has no 1024x1024 +} Copied: electron15/repos/community-staging-x86_64/add-a-TODO-about-a-missing-pnacl-flag.patch (from rev 1120226, electron15/trunk/add-a-TODO-about-a-missing-pnacl-flag.patch) =================================================================== --- community-staging-x86_64/add-a-TODO-about-a-missing-pnacl-flag.patch (rev 0) +++ community-staging-x86_64/add-a-TODO-about-a-missing-pnacl-flag.patch 2022-01-30 11:45:44 UTC (rev 1120227) @@ -0,0 +1,28 @@ +From 7a23987acb698c2934958cb42a5e7b1cd73fe142 Mon Sep 17 00:00:00 2001 +From: Nico Weber <tha...@chromium.org> +Date: Tue, 20 Jul 2021 21:54:09 +0000 +Subject: [PATCH] build: Add a TODO about a missing pnacl flag + +Change-Id: I1700d185a23afe4120e14c755782450b1bf89289 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041785 +Commit-Queue: Nico Weber <tha...@chromium.org> +Commit-Queue: Hans Wennborg <h...@chromium.org> +Auto-Submit: Nico Weber <tha...@chromium.org> +Reviewed-by: Hans Wennborg <h...@chromium.org> +Cr-Commit-Position: refs/heads/master@{#903659} +--- + build/config/compiler/BUILD.gn | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn +index b6e095b705..ef6d1dfc12 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -1217,6 +1217,7 @@ config("compiler_deterministic") { + # we build same files with same compile flag. + # Other paths are already given in relative, no need to normalize them. + if (is_nacl) { ++ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. + cflags += [ + "-Xclang", + "-fdebug-compilation-dir", Copied: electron15/repos/community-staging-x86_64/chromium-93-ffmpeg-4.4.patch (from rev 1120226, electron15/trunk/chromium-93-ffmpeg-4.4.patch) =================================================================== --- community-staging-x86_64/chromium-93-ffmpeg-4.4.patch (rev 0) +++ community-staging-x86_64/chromium-93-ffmpeg-4.4.patch 2022-01-30 11:45:44 UTC (rev 1120227) @@ -0,0 +1,36 @@ +diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc +index ac4713b07268..492a9a37d096 100644 +--- a/media/filters/ffmpeg_demuxer.cc ++++ b/media/filters/ffmpeg_demuxer.cc +@@ -427,11 +427,11 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) { + scoped_refptr<DecoderBuffer> buffer; + + if (type() == DemuxerStream::TEXT) { +- size_t id_size = 0; ++ int id_size = 0; + uint8_t* id_data = av_packet_get_side_data( + packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size); + +- size_t settings_size = 0; ++ int settings_size = 0; + uint8_t* settings_data = av_packet_get_side_data( + packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size); + +@@ -443,7 +443,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) { + buffer = DecoderBuffer::CopyFrom(packet->data, packet->size, + side_data.data(), side_data.size()); + } else { +- size_t side_data_size = 0; ++ int side_data_size = 0; + uint8_t* side_data = av_packet_get_side_data( + packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size); + +@@ -504,7 +504,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) { + packet->size - data_offset); + } + +- size_t skip_samples_size = 0; ++ int skip_samples_size = 0; + 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)); Copied: electron15/repos/community-staging-x86_64/chromium-94-ffmpeg-roll.patch (from rev 1120226, electron15/trunk/chromium-94-ffmpeg-roll.patch) =================================================================== --- community-staging-x86_64/chromium-94-ffmpeg-roll.patch (rev 0) +++ community-staging-x86_64/chromium-94-ffmpeg-roll.patch 2022-01-30 11:45:44 UTC (rev 1120227) @@ -0,0 +1,49 @@ +From b94755e4633045be96ab5e0bdde0db7e16a804bd Mon Sep 17 00:00:00 2001 +From: "liber...@chromium.org" <liber...@chromium.org> +Date: Fri, 6 Aug 2021 04:25:31 +0000 +Subject: [PATCH] FFmpeg M94 roll. + +Contains DEPS update + chromium-side fixes. + +Bug: 1227259 +Change-Id: I61c5eaa789ea12c17d0cbcbf837435b9cf32479b +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3011889 +Reviewed-by: Thomas Guilbert <tguilb...@chromium.org> +Commit-Queue: Frank Liberato <liber...@chromium.org> +Cr-Commit-Position: refs/heads/master@{#909174} +--- + media/ffmpeg/ffmpeg_common.h | 1 + + media/filters/ffmpeg_demuxer.cc | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h +index cede8ac5a7..97d6307e28 100644 +--- a/media/ffmpeg/ffmpeg_common.h ++++ b/media/ffmpeg/ffmpeg_common.h +@@ -29,6 +29,7 @@ extern "C" { + #include <libavformat/avformat.h> + #include <libavformat/avio.h> + #include <libavutil/avutil.h> ++#include <libavutil/channel_layout.h> + #include <libavutil/imgutils.h> + #include <libavutil/log.h> + #include <libavutil/mastering_display_metadata.h> +diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc +index ac4713b072..605001d935 100644 +--- a/media/filters/ffmpeg_demuxer.cc ++++ b/media/filters/ffmpeg_demuxer.cc +@@ -106,12 +106,12 @@ static base::TimeDelta ExtractStartTime(AVStream* stream) { + + // Next try to use the first DTS value, for codecs where we know PTS == DTS + // (excludes all H26x codecs). The start time must be returned in PTS. +- if (stream->first_dts != kNoFFmpegTimestamp && ++ if (av_stream_get_first_dts(stream) != kNoFFmpegTimestamp && + stream->codecpar->codec_id != AV_CODEC_ID_HEVC && + stream->codecpar->codec_id != AV_CODEC_ID_H264 && + stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) { + const base::TimeDelta first_pts = +- ConvertFromTimeBase(stream->time_base, stream->first_dts); ++ ConvertFromTimeBase(stream->time_base, av_stream_get_first_dts(stream)); + if (first_pts < start_time) + start_time = first_pts; + } Copied: electron15/repos/community-staging-x86_64/default_app-icon.patch (from rev 1120226, electron15/trunk/default_app-icon.patch) =================================================================== --- community-staging-x86_64/default_app-icon.patch (rev 0) +++ community-staging-x86_64/default_app-icon.patch 2022-01-30 11:45:44 UTC (rev 1120227) @@ -0,0 +1,21 @@ +--- a/electron/default_app/default_app.ts ++++ b/electron/default_app/default_app.ts +@@ -59,7 +59,7 @@ + }; + + if (process.platform === 'linux') { +- options.icon = path.join(__dirname, 'icon.png'); ++ options.icon = '/usr/share/pixmaps/electron.png'; + } + + mainWindow = new BrowserWindow(options); +--- a/electron/filenames.gni ++++ b/electron/filenames.gni +@@ -6,7 +6,6 @@ + ] + + default_app_static_sources = [ +- "default_app/icon.png", + "default_app/index.html", + "default_app/package.json", + "default_app/styles.css", Copied: electron15/repos/community-staging-x86_64/electron-launcher.sh (from rev 1120226, electron15/trunk/electron-launcher.sh) =================================================================== --- community-staging-x86_64/electron-launcher.sh (rev 0) +++ community-staging-x86_64/electron-launcher.sh 2022-01-30 11:45:44 UTC (rev 1120227) @@ -0,0 +1,20 @@ +#!/usr/bin/bash + +set -euo pipefail + +name=@ELECTRON@ +flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/${name}-flags.conf" + +declare -a flags + +if [[ -f "${flags_file}" ]]; then + mapfile -t < "${flags_file}" +fi + +for line in "${MAPFILE[@]}"; do + if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then + flags+=("${line}") + fi +done + +exec /usr/lib/${name}/electron "$@" "${flags[@]}" Copied: electron15/repos/community-staging-x86_64/electron.desktop (from rev 1120226, electron15/trunk/electron.desktop) =================================================================== --- community-staging-x86_64/electron.desktop (rev 0) +++ community-staging-x86_64/electron.desktop 2022-01-30 11:45:44 UTC (rev 1120227) @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +Name=@ELECTRON_NAME@ +Icon=@ELECTRON@ +Exec=@ELECTRON@ %u +Categories=Development;GTK; +StartupNotify=true Copied: electron15/repos/community-staging-x86_64/gn-visibility-gmock.patch (from rev 1120226, electron15/trunk/gn-visibility-gmock.patch) =================================================================== --- community-staging-x86_64/gn-visibility-gmock.patch (rev 0) +++ community-staging-x86_64/gn-visibility-gmock.patch 2022-01-30 11:45:44 UTC (rev 1120227) @@ -0,0 +1,43 @@ +From fc3c737210873e9bee311391e9f6b48130e84983 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tomasz=20=C5=9Aniatowski?= <tsniatow...@vewd.com> +Date: Sat, 4 Sep 2021 07:13:49 +0000 +Subject: [PATCH] Fix config visibility violation in //testing/gmock +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +//third_party/googletest:gtest_config has restricted visibility, current +code works by accident because gn only enforces visibility on 'configs'. +Fix by not referencing the configs at all as it should be unnecessary: +//testing/gmock gets them via a public dependency chain anyway. + +This is one of a few fixes needed to roll gn past the upcoming +enforcement change, landing in small parts because removing config +usages feels a bit subtle. + +Bug: gn:252 +Change-Id: Ie1438862831ecee49162d9f8f7872a568d69c2fb +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3139927 +Reviewed-by: Dirk Pranke <dpra...@google.com> +Commit-Queue: Tomasz Śniatowski <tsniatow...@vewd.com> +Cr-Commit-Position: refs/heads/main@{#918357} +--- + testing/gmock/BUILD.gn | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/testing/gmock/BUILD.gn b/testing/gmock/BUILD.gn +index 0248d146d7397..e285fb84e471a 100644 +--- a/testing/gmock/BUILD.gn ++++ b/testing/gmock/BUILD.gn +@@ -14,11 +14,6 @@ source_set("gmock") { + "include/gmock/gmock.h", + ] + public_deps = [ "//third_party/googletest:gmock" ] +- +- public_configs = [ +- "//third_party/googletest:gmock_config", +- "//third_party/googletest:gtest_config", +- ] + } + + # The file/directory layout of Google Test is not yet considered stable. Until Copied: electron15/repos/community-staging-x86_64/gn-visibility-mojo.patch (from rev 1120226, electron15/trunk/gn-visibility-mojo.patch) =================================================================== --- community-staging-x86_64/gn-visibility-mojo.patch (rev 0) +++ community-staging-x86_64/gn-visibility-mojo.patch 2022-01-30 11:45:44 UTC (rev 1120227) @@ -0,0 +1,36 @@ +From 40f10bf0e683f6b499b5c3c7555111193db03abf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tomasz=20=C5=9Aniatowski?= <tsniatow...@vewd.com> +Date: Tue, 7 Sep 2021 20:13:53 +0000 +Subject: [PATCH] Fix config visibility violation in //mojo/public/cpp/bindings + +//third_party/blink/renderer:config has restricted visibility, current +code works by accident because gn only enforces visibility on 'configs'. +Fix by removing the direct config usage as it looks historical and not +actually needed. + +This is one of a few fixes needed to roll gn past the upcoming +enforcement change, landing in small parts because removing config +usages feels a bit subtle. + +Bug: gn:252 +Change-Id: I2e0d2e314ef3714dd19b11b7ae29bdcf5074cfda +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3140593 +Commit-Queue: Ken Rockot <roc...@google.com> +Reviewed-by: Ken Rockot <roc...@google.com> +Cr-Commit-Position: refs/heads/main@{#918914} +--- + mojo/public/cpp/bindings/BUILD.gn | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/mojo/public/cpp/bindings/BUILD.gn b/mojo/public/cpp/bindings/BUILD.gn +index 13ad53b3ed305..d90318de106e4 100644 +--- a/mojo/public/cpp/bindings/BUILD.gn ++++ b/mojo/public/cpp/bindings/BUILD.gn +@@ -281,7 +281,5 @@ if (!is_ios) { + "//third_party/blink/renderer/platform:platform_export", + "//third_party/blink/renderer/platform/wtf", + ] +- +- public_configs = [ "//third_party/blink/renderer:config" ] + } + } Copied: electron15/repos/community-staging-x86_64/gn-visibility-webrtc.patch (from rev 1120226, electron15/trunk/gn-visibility-webrtc.patch) =================================================================== --- community-staging-x86_64/gn-visibility-webrtc.patch (rev 0) +++ community-staging-x86_64/gn-visibility-webrtc.patch 2022-01-30 11:45:44 UTC (rev 1120227) @@ -0,0 +1,45 @@ +From 72c4d9fc95c336f61d7a8417b78f947a400ce792 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tomasz=20=C5=9Aniatowski?= <tsniatow...@vewd.com> +Date: Tue, 14 Sep 2021 10:33:37 +0000 +Subject: [PATCH] Relax googletest gn config visibility for webrtc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +An upcoming gn roll will start enforcing config visibility on +public_configs and all_dependent_configs. Normally, configs with +limited visibility have corresponding helper targets that push the +configs using public_configs and are propagated with public_deps. +However, webrtc prefers to avoid public_deps, and pushes the gtest +config using all_dependent_configs. This requires direct visibility, +so tweak gtest BUILD.gn to make things work. + +Bug: gn:252, 1249254 +Change-Id: Ic7be22f7bf129255fb0ac51f437cd6dd3989e3a3 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3158065 +Commit-Queue: Tomasz Śniatowski <tsniatow...@vewd.com> +Reviewed-by: Victor Costan <pwn...@chromium.org> +Cr-Commit-Position: refs/heads/main@{#921126} +--- + third_party/googletest/BUILD.gn | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/third_party/googletest/BUILD.gn b/third_party/googletest/BUILD.gn +index fe240ebe954b6..d2bde47d75eab 100644 +--- a/third_party/googletest/BUILD.gn ++++ b/third_party/googletest/BUILD.gn +@@ -5,7 +5,13 @@ + import("//build_overrides/build.gni") + + config("gtest_config") { +- visibility = [ ":*" ] # gmock also shares this config. ++ # webrtc wants to push this config without a public_dep chain ++ # TODO(crbug.com/1249254): figure out what to do with this ++ visibility = [ ++ ":*", # gmock also shares this config. ++ "//test:*", # webrts standalone setup ++ "//third_party/webrtc/test:*", ++ ] + + defines = [ + # Chromium always links googletest statically, so no API qualifier is Copied: electron15/repos/community-staging-x86_64/jinja-python-3.10.patch (from rev 1120226, electron15/trunk/jinja-python-3.10.patch) =================================================================== --- community-staging-x86_64/jinja-python-3.10.patch (rev 0) +++ community-staging-x86_64/jinja-python-3.10.patch 2022-01-30 11:45:44 UTC (rev 1120227) @@ -0,0 +1,33 @@ +--- a/runtime.py ++++ b/runtime.py +@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta + + # register the context as mapping if possible + try: +- from collections import Mapping ++ from collections.abc import Mapping + Mapping.register(Context) + except ImportError: + pass +--- a/sandbox.py ++++ b/sandbox.py +@@ -14,7 +14,7 @@ + """ + import types + import operator +-from collections import Mapping ++from collections.abc import Mapping + from jinja2.environment import Environment + from jinja2.exceptions import SecurityError + from jinja2._compat import string_types, PY2 +--- a/tests.py ++++ b/tests.py +@@ -10,7 +10,7 @@ + """ + import operator + import re +-from collections import Mapping ++from collections.abc import Mapping + from jinja2.runtime import Undefined + from jinja2._compat import text_type, string_types, integer_types + import decimal Copied: electron15/repos/community-staging-x86_64/replace-blacklist-with-ignorelist.patch (from rev 1120226, electron15/trunk/replace-blacklist-with-ignorelist.patch) =================================================================== --- community-staging-x86_64/replace-blacklist-with-ignorelist.patch (rev 0) +++ community-staging-x86_64/replace-blacklist-with-ignorelist.patch 2022-01-30 11:45:44 UTC (rev 1120227) @@ -0,0 +1,196 @@ +From 9d080c0934b848ee4a05013c78641e612fcc1e03 Mon Sep 17 00:00:00 2001 +From: Dylan Cutler <dylancut...@google.com> +Date: Wed, 26 May 2021 16:39:52 +0000 +Subject: [PATCH] Reland "Replace 'blacklist' with 'ignorelist' in + ./tools/msan/." + +This is a reland of 3b6263f2eece1264b052dfdcbc03b851d5abfb48 + +Relanding now that https://chromium-review.googlesource.com/c/chromiumos/overlays/chromiumos-overlay/+/2897974 is merged + +Original change's description: +> Replace 'blacklist' with 'ignorelist' in ./tools/msan/. +> +> Bug: 1097272, 1097268 +> Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297 +> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730 +> Commit-Queue: Dylan Cutler <dylancut...@google.com> +> Reviewed-by: Nico Weber <tha...@chromium.org> +> Reviewed-by: Jonathan Metzman <metz...@chromium.org> +> Cr-Commit-Position: refs/heads/master@{#883035} + +Bug: 1097272 +Bug: 1097268 +Change-Id: I11a5bc8972680c95fb1dab95ed3b707ed76f4667 +Cq-Include-Trybots: luci.chromium.try:chromeos-amd64-generic-cfi-thin-lto-rel +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2911096 +Commit-Queue: Dylan Cutler <dylancut...@google.com> +Reviewed-by: Nico Weber <tha...@chromium.org> +Cr-Commit-Position: refs/heads/master@{#886773} +--- + build/config/sanitizers/BUILD.gn | 44 ++++++++++---------- + build_overrides/build.gni | 14 +++---- + tools/msan/{blacklist.txt => ignorelist.txt} | 0 + 3 files changed, 29 insertions(+), 29 deletions(-) + rename tools/msan/{blacklist.txt => ignorelist.txt} (100%) + +diff --git a/build/config/sanitizers/BUILD.gn b/build/config/sanitizers/BUILD.gn +index aaaad023474d..55b388a43743 100644 +--- a/build/config/sanitizers/BUILD.gn ++++ b/build/config/sanitizers/BUILD.gn +@@ -272,11 +272,11 @@ config("asan_flags") { + if (is_asan) { + cflags += [ "-fsanitize=address" ] + if (is_win) { +- if (!defined(asan_win_blacklist_path)) { +- asan_win_blacklist_path = ++ if (!defined(asan_win_blocklist_path)) { ++ asan_win_blocklist_path = + rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir) + } +- cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ] ++ cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ] + } + } + } +@@ -306,13 +306,13 @@ config("link_shared_library") { + config("cfi_flags") { + cflags = [] + if (is_cfi && current_toolchain == default_toolchain) { +- if (!defined(cfi_blacklist_path)) { +- cfi_blacklist_path = ++ if (!defined(cfi_ignorelist_path)) { ++ cfi_ignorelist_path = + rebase_path("//tools/cfi/ignores.txt", root_build_dir) + } + cflags += [ + "-fsanitize=cfi-vcall", +- "-fsanitize-blacklist=$cfi_blacklist_path", ++ "-fsanitize-ignorelist=$cfi_ignorelist_path", + ] + + if (use_cfi_cast) { +@@ -409,14 +409,14 @@ config("msan_flags") { + if (is_msan) { + assert(is_linux || is_chromeos, + "msan only supported on linux x86_64/ChromeOS") +- if (!defined(msan_blacklist_path)) { +- msan_blacklist_path = +- rebase_path("//tools/msan/blacklist.txt", root_build_dir) ++ if (!defined(msan_ignorelist_path)) { ++ msan_ignorelist_path = ++ rebase_path("//tools/msan/ignorelist.txt", root_build_dir) + } + cflags = [ + "-fsanitize=memory", + "-fsanitize-memory-track-origins=$msan_track_origins", +- "-fsanitize-blacklist=$msan_blacklist_path", ++ "-fsanitize-ignorelist=$msan_ignorelist_path", + ] + } + } +@@ -424,13 +424,13 @@ config("msan_flags") { + config("tsan_flags") { + if (is_tsan) { + assert(is_linux || is_chromeos, "tsan only supported on linux x86_64") +- if (!defined(tsan_blacklist_path)) { +- tsan_blacklist_path = ++ if (!defined(tsan_ignorelist_path)) { ++ tsan_ignorelist_path = + rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir) + } + cflags = [ + "-fsanitize=thread", +- "-fsanitize-blacklist=$tsan_blacklist_path", ++ "-fsanitize-ignorelist=$tsan_ignorelist_path", + ] + } + } +@@ -438,8 +438,8 @@ config("tsan_flags") { + config("ubsan_flags") { + cflags = [] + if (is_ubsan) { +- if (!defined(ubsan_blacklist_path)) { +- ubsan_blacklist_path = ++ if (!defined(ubsan_ignorelist_path)) { ++ ubsan_ignorelist_path = + rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir) + } + cflags += [ +@@ -456,7 +456,7 @@ config("ubsan_flags") { + "-fsanitize=signed-integer-overflow", + "-fsanitize=unreachable", + "-fsanitize=vla-bound", +- "-fsanitize-blacklist=$ubsan_blacklist_path", ++ "-fsanitize-ignorelist=$ubsan_ignorelist_path", + ] + + # Chromecast ubsan builds fail to compile with these +@@ -486,8 +486,8 @@ config("ubsan_no_recover") { + + config("ubsan_security_flags") { + if (is_ubsan_security) { +- if (!defined(ubsan_security_blacklist_path)) { +- ubsan_security_blacklist_path = ++ if (!defined(ubsan_security_ignorelist_path)) { ++ ubsan_security_ignorelist_path = + rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir) + } + cflags = [ +@@ -495,7 +495,7 @@ config("ubsan_security_flags") { + "-fsanitize=shift", + "-fsanitize=signed-integer-overflow", + "-fsanitize=vla-bound", +- "-fsanitize-blacklist=$ubsan_security_blacklist_path", ++ "-fsanitize-ignorelist=$ubsan_security_ignorelist_path", + ] + } + } +@@ -508,13 +508,13 @@ config("ubsan_null_flags") { + + config("ubsan_vptr_flags") { + if (is_ubsan_vptr) { +- if (!defined(ubsan_vptr_blacklist_path)) { +- ubsan_vptr_blacklist_path = ++ if (!defined(ubsan_vptr_ignorelist_path)) { ++ ubsan_vptr_ignorelist_path = + rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir) + } + cflags = [ + "-fsanitize=vptr", +- "-fsanitize-blacklist=$ubsan_vptr_blacklist_path", ++ "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path", + ] + } + } +diff --git a/build_overrides/build.gni b/build_overrides/build.gni +index 82627b03653f..f3e563ab701b 100644 +--- a/build_overrides/build.gni ++++ b/build_overrides/build.gni +@@ -42,15 +42,15 @@ declare_args() { + # Allows different projects to specify their own suppression/ignore lists for + # sanitizer tools. + # asan_suppressions_file = "path/to/asan_suppressions.cc" +-# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt" ++# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt" + # lsan_suppressions_file = "path/to/lsan_suppressions.cc" + # tsan_suppressions_file = "path/to/tsan_suppressions.cc" +-# tsan_blacklist_path = "path/to/tsan/ignores.txt" +-# msan_blacklist_path = "path/to/msan/blacklist.txt" +-# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt" +-# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt" +-# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt" +-# cfi_blacklist_path = "path/to/cfi/ignores.txt" ++# tsan_ignorelist_path = "path/to/tsan/ignores.txt" ++# msan_ignorelist_path = "path/to/msan/ignorelist.txt" ++# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt" ++# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt" ++# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt" ++# cfi_ignorelist_path = "path/to/cfi/ignores.txt" + + declare_args() { + # Android 32-bit non-component, non-clang builds cannot have symbol_level=2 +diff --git a/tools/msan/blacklist.txt b/tools/msan/ignorelist.txt +similarity index 100% +rename from tools/msan/blacklist.txt +rename to tools/msan/ignorelist.txt Copied: electron15/repos/community-staging-x86_64/sql-make-VirtualCursor-standard-layout-type.patch (from rev 1120226, electron15/trunk/sql-make-VirtualCursor-standard-layout-type.patch) =================================================================== --- community-staging-x86_64/sql-make-VirtualCursor-standard-layout-type.patch (rev 0) +++ community-staging-x86_64/sql-make-VirtualCursor-standard-layout-type.patch 2022-01-30 11:45:44 UTC (rev 1120227) @@ -0,0 +1,238 @@ +From 80368f8ba7a8bab13440463a254888311efe3986 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <sth...@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_; Copied: electron15/repos/community-staging-x86_64/unbundle-fix-visibility-of-build-config-freetype.patch (from rev 1120226, electron15/trunk/unbundle-fix-visibility-of-build-config-freetype.patch) =================================================================== --- community-staging-x86_64/unbundle-fix-visibility-of-build-config-freetype.patch (rev 0) +++ community-staging-x86_64/unbundle-fix-visibility-of-build-config-freetype.patch 2022-01-30 11:45:44 UTC (rev 1120227) @@ -0,0 +1,31 @@ +From 271e45339b7b969e98ccef7837cb1b15480b07fc Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <sth...@googlemail.com> +Date: Thu, 4 Nov 2021 18:58:34 +0000 +Subject: [PATCH] unbundle: fix visibility of //build/config/freetype + +For system freetype //build/linux:freetype_from_pkgconfig is restricted +to //third_party:freetype_harfbuzz and //third_party/harfbuzz-ng:harfbuzz_source. +However //build/config/freetype:freetype is accessing it too. + +Bug: None +Change-Id: Ic4a37b01e4ae221372a9220cbad04c598b844c21 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3259304 +Commit-Queue: Thomas Anderson <thomasander...@chromium.org> +Reviewed-by: Thomas Anderson <thomasander...@chromium.org> +Cr-Commit-Position: refs/heads/main@{#938388} +--- + build/linux/BUILD.gn | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/build/linux/BUILD.gn b/build/linux/BUILD.gn +index 54314c7687..cd49e3d524 100644 +--- a/build/linux/BUILD.gn ++++ b/build/linux/BUILD.gn +@@ -23,6 +23,7 @@ if (use_system_freetype) { + # the system, use with caution,for details see build/config/freetype/BUILD.gn. + pkg_config("freetype_from_pkgconfig") { + visibility = [ ++ "//build/config/freetype:freetype", + "//third_party:freetype_harfbuzz", + "//third_party/harfbuzz-ng:harfbuzz_source", + ] Copied: electron15/repos/community-staging-x86_64/unexpire-accelerated-video-decode-flag.patch (from rev 1120226, electron15/trunk/unexpire-accelerated-video-decode-flag.patch) =================================================================== --- community-staging-x86_64/unexpire-accelerated-video-decode-flag.patch (rev 0) +++ community-staging-x86_64/unexpire-accelerated-video-decode-flag.patch 2022-01-30 11:45:44 UTC (rev 1120227) @@ -0,0 +1,11 @@ +--- chrome/browser/flag-metadata.json.orig 2021-09-21 18:34:38.740426608 +0000 ++++ chrome/browser/flag-metadata.json 2021-09-21 18:35:09.392000797 +0000 +@@ -1285,7 +1285,7 @@ + { + "name": "enable-accelerated-video-decode", + "owners": [ "media-...@chromium.org" ], +- "expiry_milestone": 93 ++ "expiry_milestone": 99 + }, + { + "name": "enable-accessibility-live-caption", Copied: electron15/repos/community-staging-x86_64/use-ffile-compilation-dir.patch (from rev 1120226, electron15/trunk/use-ffile-compilation-dir.patch) =================================================================== --- community-staging-x86_64/use-ffile-compilation-dir.patch (rev 0) +++ community-staging-x86_64/use-ffile-compilation-dir.patch 2022-01-30 11:45:44 UTC (rev 1120227) @@ -0,0 +1,65 @@ +From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001 +From: Zequan Wu <zequa...@google.com> +Date: Tue, 20 Jul 2021 14:13:50 +0000 +Subject: [PATCH] Use -ffile-compilation-dir= instead of + -fdebug-compilation-dir= + +Bug: 1010267 +Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738 +Auto-Submit: Zequan Wu <zequa...@google.com> +Commit-Queue: Nico Weber <tha...@chromium.org> +Reviewed-by: Nico Weber <tha...@chromium.org> +Cr-Commit-Position: refs/heads/master@{#903456} +--- + build/config/compiler/BUILD.gn | 18 ++++++++++++------ + build/config/compiler/compiler.gni | 7 ++----- + 2 files changed, 14 insertions(+), 11 deletions(-) + +diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn +index ede07d111c..6db16c1cdd 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -1216,12 +1216,18 @@ config("compiler_deterministic") { + # different build directory like "out/feature_a" and "out/feature_b" if + # we build same files with same compile flag. + # Other paths are already given in relative, no need to normalize them. +- cflags += [ +- "-Xclang", +- "-fdebug-compilation-dir", +- "-Xclang", +- ".", +- ] ++ if (is_nacl) { ++ cflags += [ ++ "-Xclang", ++ "-fdebug-compilation-dir", ++ "-Xclang", ++ ".", ++ ] ++ } else { ++ # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir= ++ # and -fcoverage-compilation-dir=. ++ cflags += [ "-ffile-compilation-dir=." ] ++ } + if (!is_win) { + # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) + asmflags = [ "-Wa,-fdebug-compilation-dir,." ] +diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni +index 8c259c360a..642319b4f4 100644 +--- a/build/config/compiler/compiler.gni ++++ b/build/config/compiler/compiler.gni +@@ -225,11 +225,8 @@ declare_args() { + # deterministic builds to reduce compile times, so this is less relevant for + # official builders. + strip_absolute_paths_from_debug_symbols_default = +- # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has +- # dependency to absolute path of source files. +- !use_clang_coverage && +- (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux || +- is_chromeos || (is_apple && !enable_dsyms)) ++ is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux || ++ is_chromeos || (is_apple && !enable_dsyms) + + # If the platform uses stripped absolute paths by default, then we don't expose + # it as a configuration option. If this is causing problems, please file a bug. Copied: electron15/repos/community-staging-x86_64/use-system-libraries-in-node.patch (from rev 1120226, electron15/trunk/use-system-libraries-in-node.patch) =================================================================== --- community-staging-x86_64/use-system-libraries-in-node.patch (rev 0) +++ community-staging-x86_64/use-system-libraries-in-node.patch 2022-01-30 11:45:44 UTC (rev 1120227) @@ -0,0 +1,52 @@ +--- a/third_party/electron_node/BUILD.gn ++++ b/third_party/electron_node/BUILD.gn +@@ -42,6 +42,18 @@ + node_module_version = "" + } + ++if (is_linux) { ++ import("//build/config/linux/pkg_config.gni") ++ ++ pkg_config("cares") { ++ packages = [ "libcares" ] ++ } ++ ++ pkg_config("nghttp2") { ++ packages = [ "libnghttp2" ] ++ } ++} ++ + assert(!node_use_dtrace, "node_use_dtrace not supported in GN") + assert(!node_use_etw, "node_use_etw not supported in GN") + +@@ -182,10 +194,8 @@ + component("node_lib") { + deps = [ + ":node_js2c", +- "deps/cares", + "deps/histogram", + "deps/llhttp", +- "deps/nghttp2", + "deps/uvwasi", + "//third_party/zlib", + "//third_party/brotli:dec", +@@ -201,6 +211,19 @@ + public_configs = [ ":node_lib_config" ] + include_dirs = [ "src" ] + libs = [] ++ if (is_linux) { ++ configs += [ ++ ":cares", ++ ":nghttp2", ++ ] ++ libs += [ "http_parser" ] ++ } else { ++ deps += [ ++ "deps/cares", ++ "deps/http_parser", ++ "deps/nghttp2", ++ ] ++ } + frameworks = [] + cflags_cc = [ + "-Wno-deprecated-declarations",