Packman Build Service PMBS

chromium-ffmpeg-extra.changes Changed

@@ -1,4 +1,132 @@
 -------------------------------------------------------------------
+Wed Dec 15 10:54:35 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
+
+- Revert to gcc10 on TW: gcc11 is entirely broken
+- No auto thread LTO: linker crash on ARM
+
+-------------------------------------------------------------------
+Tue Dec 14 15:24:47 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- Chromium 96.0.4664.110 (boo#1193713):
+  * CVE-2021-4098: Insufficient data validation in Mojo
+  * CVE-2021-4099: Use after free in Swiftshader
+  * CVE-2021-4100: Object lifecycle issue in ANGLE
+  * CVE-2021-4101: Heap buffer overflow in Swiftshader
+  * CVE-2021-4102: Use after free in V8
+
+-------------------------------------------------------------------
+Thu Dec  9 09:49:23 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
+
+- Lord of the Browsers: The Two Compilers:
+  * Go back to GCC
+  * GCC: LTO removes needed assembly symbols
+  * Clang: issues with libstdc++
+- Chromium 96.0.4664.93 (boo#1193519):
+  * CVE-2021-4052: Use after free in web apps
+  * CVE-2021-4053: Use after free in UI
+  * CVE-2021-4079: Out of bounds write in WebRTC
+  * CVE-2021-4054: Incorrect security UI in autofill
+  * CVE-2021-4078: Type confusion in V8
+  * CVE-2021-4055: Heap buffer overflow in extensions
+  * CVE-2021-4056: Type Confusion in loader
+  * CVE-2021-4057: Use after free in file API
+  * CVE-2021-4058: Heap buffer overflow in ANGLE
+  * CVE-2021-4059: Insufficient data validation in loader
+  * CVE-2021-4061: Type Confusion in V8
+  * CVE-2021-4062: Heap buffer overflow in BFCache
+  * CVE-2021-4063: Use after free in developer tools
+  * CVE-2021-4064: Use after free in screen capture
+  * CVE-2021-4065: Use after free in autofill
+  * CVE-2021-4066: Integer underflow in ANGLE
+  * CVE-2021-4067: Use after free in window manager
+  * CVE-2021-4068: Insufficient validation of untrusted input in new tab page
+- Chromium 96.0.4664.45 (boo#1192734):
+  * CVE-2021-38007: Type Confusion in V8
+  * CVE-2021-38008: Use after free in media
+  * CVE-2021-38009: Inappropriate implementation in cache
+  * CVE-2021-38006: Use after free in storage foundation
+  * CVE-2021-38005: Use after free in loader
+  * CVE-2021-38010: Inappropriate implementation in service workers
+  * CVE-2021-38011: Use after free in storage foundation
+  * CVE-2021-38012: Type Confusion in V8
+  * CVE-2021-38013: Heap buffer overflow in fingerprint recognition
+  * CVE-2021-38014: Out of bounds write in Swiftshader
+  * CVE-2021-38015: Inappropriate implementation in input
+  * CVE-2021-38016: Insufficient policy enforcement in background fetch
+  * CVE-2021-38017: Insufficient policy enforcement in iframe sandbox
+  * CVE-2021-38018: Inappropriate implementation in navigation
+  * CVE-2021-38019: Insufficient policy enforcement in CORS
+  * CVE-2021-38020: Insufficient policy enforcement in contacts picker
+  * CVE-2021-38021: Inappropriate implementation in referrer
+  * CVE-2021-38022: Inappropriate implementation in WebAuthentication
+- Removed old patches:
+  * chromium-95-compiler.patch
+  * chromium-95-BitstreamReader-namespace.patch
+  * chromium-95-system-zlib.patch
+  * chromium-older-harfbuzz.patch
+  * pipewire-do-not-typecheck-the-portal-session_handle.patch
+- Removed build breaking patches:
+  * chromium-93-EnumTable-crash.patch
+- Added patches:
+  * chromium-96-compiler.patch
+  * chromium-96-CommandLine-include.patch
+  * chromium-96-RestrictedCookieManager-tuple.patch
+  * chromium-96-DrmRenderNodePathFinder-include.patch
+  * chromium-96-CouponDB-include.patch
+- Changed patches:
+  * gcc-enable-lto.patch: see above
+
+-------------------------------------------------------------------
+Fri Nov 19 09:32:39 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
+
+- Ensure newer libs and LLVM is used on Leap (boo#1192310)
+
+-------------------------------------------------------------------
+Wed Nov 17 10:08:55 UTC 2021 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Explicitly BuildRequire python3-six.
+
+-------------------------------------------------------------------
+Wed Nov 10 20:03:53 UTC 2021 - Carsten Ziepke <kieltux@gmail.com>
+
+- Chromium 95.0.4638.69 (boo#1192184):
+  * CVE-2021-37997: Use after free in Sign-In
+  * CVE-2021-37998: Use after free in Garbage Collection
+  * CVE-2021-37999: Insufficient data validation in New Tab Page
+  * CVE-2021-38000: Insufficient validation of untrusted input in Intents
+  * CVE-2021-38001: Type Confusion in V8
+  * CVE-2021-38002: Use after free in Web Transport
+  * CVE-2021-38003: Inappropriate implementation in V8
+- Chromium 95.0.4638.54 (boo#1191844):
+  * CVE-2021-37981: Heap buffer overflow in Skia
+  * CVE-2021-37982: Use after free in Incognito
+  * CVE-2021-37983: Use after free in Dev Tools
+  * CVE-2021-37984: Heap buffer overflow in PDFium
+  * CVE-2021-37985: Use after free in V8
+  * CVE-2021-37986: Heap buffer overflow in Settings
+  * CVE-2021-37987: Use after free in Network APIs
+  * CVE-2021-37988: Use after free in Profiles
+  * CVE-2021-37989: Inappropriate implementation in Blink
+  * CVE-2021-37990: Inappropriate implementation in WebView
+  * CVE-2021-37991: Race in V8
+  * CVE-2021-37992: Out of bounds read in WebAudio
+  * CVE-2021-37993: Use after free in PDF Accessibility
+  * CVE-2021-37996: Insufficient validation of untrusted input in Downloads
+  * CVE-2021-37994: Inappropriate implementation in iFrame Sandbox
+  * CVE-2021-37995: Inappropriate implementation in WebApp Installer
+- Added patches:
+  * chromium-95-BitstreamReader-namespace.patch
+  * chromium-95-compiler.patch
+  * chromium-95-libyuv-aarch64.patch
+  * chromium-95-quiche-include.patch
+  * chromium-95-system-zlib.patch
+- Removed patches:
+  * chromium-94-compiler.patch
+  * chromium-91-libyuv-aarch64.patch
+  * chromium-90-ruy-include.patch
+  * chromium-94-CustomSpaces-include.patch
+
+-------------------------------------------------------------------
 Sat Oct  9 05:32:48 UTC 2021 - Carsten Ziepke <kieltux@gmail.com>
 
 - Removed patches:
@@ -57,8 +185,16 @@
   * chromium-93-InkDropHost-crash.patch
   * chromium-91-compiler.patch
   * chromium-glibc-2.33.patch
-  * chromium-shim_headers.patch
-  
+  * chromium-shim_headers.patch 
+
+-------------------------------------------------------------------
+Fri Sep 24 17:16:41 UTC 2021 - Carsten Ziepke <kieltux@gmail.com>
+
+- Add patch to fix Leap 15.2 build:
+  * chromium-ffmpeg-lp152.patch
+- Change system-libdrm.patch: add to unbundle instead of changing
+  header path
+
 -------------------------------------------------------------------
 Sun Sep 19 19:41:03 UTC 2021 - Carsten Ziepke <kieltux@gmail.com>

chromium-ffmpeg-extra.spec Changed

@@ -17,42 +17,47 @@
 
 
 %define rname chromium
+%define outputdir ${TMPOUT}
 # bsc#1108175
 %define __provides_exclude ^lib.*\\.so.*$
-%if 0%{?suse_version} > 1500
+%if 0%{?suse_version} >= 1550
 %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
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
 %bcond_without pipewire
 %else
-%bcond_with system_harfbuzz
 %bcond_with pipewire
 %endif
+%bcond_without system_zlib
+%bcond_with system_freetype
 %ifarch %{arm} aarch64
 %bcond_with swiftshader
 %else
 %bcond_without swiftshader
 %endif
-%bcond_with lto
-%bcond_without clang
+%if 0%{?suse_version} >= 1550
+%bcond_without system_harfbuzz
+%else
+%bcond_with system_harfbuzz
+%endif
+%bcond_without lto
+%bcond_with clang
 Name:           chromium-ffmpeg-extra
-Version:        94.0.4606.81
+Version:        96.0.4664.110
 Release:        0
-Summary:        Extra ffmpeg codecs for browsers based on Chromium
+Summary:        Google's open source browser project
 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
+# https://source.chromium.org/chromium/chromium/src/+/refs/tags/%%{version}:chrome/installer/linux/common/installer.include
 Source105:      INSTALL.sh
 #
 Patch0:         chromium-libusb_interrupt_event_handler.patch
@@ -75,27 +80,28 @@
 # gentoo/fedora/arch patchset
 Patch12:        chromium-78-protobuf-RepeatedPtrField-export.patch
 Patch13:        chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch
-Patch15:        chromium-94-compiler.patch
+Patch15:        chromium-96-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
 Patch25:        chromium-90-fseal.patch
-Patch29:        chromium-93-EnumTable-crash.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
+Patch44:        chromium-95-libyuv-aarch64.patch
 Patch46:        chromium-91-sql-standard-layout-type.patch
 Patch50:        chromium-clang-nomerge.patch
 Patch51:        chromium-glibc-2.34.patch
 Patch62:        chromium-93-ffmpeg-4.4.patch
 Patch63:        chromium-ffmpeg-lp152.patch
-Patch64:        chromium-94-CustomSpaces-include.patch
 Patch65:        chromium-94-sql-no-assert.patch
-Patch67:        chromium-older-harfbuzz.patch
 Patch69:        chromium-93-InkDropHost-crash.patch
+Patch72:        chromium-95-quiche-include.patch
+Patch73:        chromium-96-CommandLine-include.patch
+Patch74:        chromium-96-RestrictedCookieManager-tuple.patch
+Patch75:        chromium-96-DrmRenderNodePathFinder-include.patch
+Patch76:        chromium-96-CouponDB-include.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
@@ -130,9 +136,9 @@
 BuildRequires:  nodejs >= 8.0
 BuildRequires:  pam-devel
 BuildRequires:  pkgconfig
-BuildRequires:  python
 BuildRequires:  python3
 BuildRequires:  python3-setuptools
+BuildRequires:  python3-six
 BuildRequires:  snappy-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  util-linux
@@ -146,7 +152,6 @@
 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)
@@ -212,7 +217,6 @@
 BuildRequires:  pkgconfig(xshmfence)
 BuildRequires:  pkgconfig(xt)
 BuildRequires:  pkgconfig(xtst)
-BuildRequires:  pkgconfig(zlib)
 Requires:       xdg-utils
 Requires(pre):  permissions
 
@@ -234,19 +238,34 @@
 %if %{with system_vpx}
 BuildRequires:  pkgconfig(vpx) >= 1.8.2
 %endif
+%if %{with system_freetype}
+BuildRequires:  pkgconfig(freetype2)
+%endif
+%if %{with system_zlib}
+BuildRequires:  pkgconfig(zlib)
+%endif
 %if %{with clang}
+%if %{?suse_version} < 1550
+BuildRequires:  clang12
+BuildRequires:  gcc10
+BuildRequires:  libstdc++6-devel-gcc10
+BuildRequires:  lld12
+BuildRequires:  llvm12
+%else
 BuildRequires:  clang
 BuildRequires:  lld
 BuildRequires:  llvm
-%else
+%endif
+%endif
+%if %{without clang}
 BuildRequires:  binutils-gold
-%if %{?suse_version} > 1500
-BuildRequires:  gcc >= 10
-BuildRequires:  gcc-c++ >= 10
-%else
+#%if %{?suse_version} >= 1550
+#BuildRequires:  gcc
+#BuildRequires:  gcc-c++
+#%else
 BuildRequires:  gcc10
 BuildRequires:  gcc10-c++
-%endif
+#%endif
 %endif
 
 %description
@@ -254,17 +273,12 @@
 (audio and video tags).
 
 %prep
-%ifarch aarch64
-%setup -q -T -D -b2 -n highway-0.12.2
-%endif
 %setup -q -n %{rname}-%{version}
 %autopatch -p1
 
 %build
-%ifarch aarch64
-rm -rf third_party/highway/src/*
-mv ../highway-0.12.2/* third_party/highway/src
-%endif
+mktemp -d -t chromium-XXXXXXXXXX > temp.txt
+export TMPOUT=`cat temp.txt`
 # 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
@@ -362,6 +376,7 @@
     third_party/devtools-frontend/src/front_end/third_party/wasmparser
     third_party/devtools-frontend/src/third_party
     third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
+    third_party/distributed_point_functions
     third_party/dom_distiller_js
     third_party/eigen3
     third_party/emoji-segmenter
@@ -413,6 +428,8 @@
     third_party/lss
     third_party/lzma_sdk
     third_party/mako
+    third_party/maldoca
+    third_party/maldoca/src/third_party
     third_party/markupsafe
     third_party/mesa
     third_party/metrics_proto
@@ -473,7 +490,6 @@
     third_party/tflite

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

@@ -1,6 +1,7 @@
-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
+Index: chromium-96.0.4664.45/third_party/webrtc/audio/utility/channel_mixer.cc
+===================================================================
+--- chromium-96.0.4664.45.orig/third_party/webrtc/audio/utility/channel_mixer.cc
++++ chromium-96.0.4664.45/third_party/webrtc/audio/utility/channel_mixer.cc
 @@ -8,6 +8,8 @@
   *  be found in the AUTHORS file in the root of the source tree.
   */
@@ -10,20 +11,22 @@
  #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>
+Index: chromium-96.0.4664.45/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
+===================================================================
+--- chromium-96.0.4664.45.orig/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
++++ chromium-96.0.4664.45/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
+@@ -19,6 +19,7 @@
  #include <sys/syscall.h>
+ #include <unistd.h>
  
 +#include <cstring>
  #include <memory>
+ #include <string>
  #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
+Index: chromium-96.0.4664.45/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc
+===================================================================
+--- chromium-96.0.4664.45.orig/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc
++++ chromium-96.0.4664.45/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc
 @@ -10,6 +10,7 @@
  
  #include "modules/video_coding/utility/ivf_file_reader.h"

chromium-90-ruy-include.patch Deleted

chromium-93-EnumTable-crash.patch Deleted

@@ -1,79 +0,0 @@
-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-94-CustomSpaces-include.patch Deleted

@@ -1,24 +0,0 @@
-From 4eeacdaa57b29a079fe09315eb22557c06aa522e Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Fri, 13 Aug 2021 12:57:42 +0000
-Subject: [PATCH] IWYU: add memory for std::unique_ptr in blink::CustomSpaces
-
----
- .../blink/renderer/platform/heap/v8_wrapper/custom_spaces.h      | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h b/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
-index df0465a..640cb33 100644
---- a/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
-+++ b/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
-@@ -5,6 +5,7 @@
- #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_V8_WRAPPER_CUSTOM_SPACES_H_
- #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_V8_WRAPPER_CUSTOM_SPACES_H_
- 
-+#include <memory>
- #include <vector>
- 
- #include "third_party/blink/renderer/platform/platform_export.h"
--- 
-2.31.1
-

chromium-94-compiler.patch Deleted

@@ -1,218 +0,0 @@
-From f4d0b0eb899005b4b8b6388e1d8bb82cc0018fc8 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 8 Aug 2021 08:50:00 +0000
-Subject: [PATCH] Disable various compiler configs
-
----
- build/config/compiler/BUILD.gn | 105 ++++++---------------------------
- 1 file changed, 17 insertions(+), 88 deletions(-)
-
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 0bb155a..e95c023 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -291,8 +291,6 @@ config("compiler") {
- 
-   configs += [
-     # See the definitions below.
--    ":clang_revision",
--    ":compiler_cpu_abi",
-     ":compiler_codegen",
-     ":compiler_deterministic",
-   ]
-@@ -530,31 +528,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" ]
--      }
--    }
--
--    # TODO(crbug.com/1235145): Investigate why/if this should be needed.
--    if (is_win) {
--      cflags += [ "/clang:-ffp-contract=off" ]
--    } else {
--      cflags += [ "-ffp-contract=off" ]
--    }
--  }
--
-   # C11/C++11 compiler flags setup.
-   # ---------------------------
-   if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) ||
-@@ -1216,45 +1189,6 @@ config("compiler_deterministic") {
-     }
-   }
- 
--  # Makes builds independent of absolute file path.
--  if (is_clang && strip_absolute_paths_from_debug_symbols) {
--    # If debug option is given, clang includes $cwd in debug info by default.
--    # For such build, this flag generates reproducible obj files even we use
--    # 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.
--    if (is_nacl) {
--      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
--      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,." ]
--    }
--
--    if (is_win && use_lld) {
--      if (symbol_level == 2 || (is_clang && using_sanitizer)) {
--        # Absolutize source file paths for PDB. Pass the real build directory
--        # if the pdb contains source-level debug information and if linker
--        # reproducibility is not critical.
--        ldflags += [ "/PDBSourcePath:" + rebase_path(root_build_dir) ]
--      } else {
--        # Use a fake fixed base directory for paths in the pdb to make the pdb
--        # output fully deterministic and independent of the build directory.
--        ldflags += [ "/PDBSourcePath:o:\fake\prefix" ]
--      }
--    }
--  }
--
-   # Tells the compiler not to use absolute paths when passing the default
-   # paths to the tools it invokes. We don't want this because we don't
-   # really need it and it can mess up the goma cache entries.
-@@ -1658,7 +1592,7 @@ config("chromium_code") {
-       defines = [ "_HAS_NODISCARD" ]
-     }
-   } else {
--    cflags = [ "-Wall" ]
-+    cflags = []
-     if (treat_warnings_as_errors) {
-       cflags += [ "-Werror" ]
- 
-@@ -1667,10 +1601,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.
-@@ -1679,15 +1609,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" ]
-@@ -2077,7 +1998,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.
-@@ -2112,7 +2034,8 @@ config("optimize") {
- }
- 
- # Turn off optimizations.
--config("no_optimize") {
-+config("no_optimize") { }
-+config("xno_optimize") {
-   if (is_win) {
-     cflags = [
-       "/Od",  # Disable optimization.
-@@ -2152,7 +2075,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:
-@@ -2184,7 +2108,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:
-@@ -2209,7 +2134,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" ]
-@@ -2328,7 +2254,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.
-@@ -2431,7 +2358,8 @@ config("symbols") {
- # Minimal symbols.
- # This config guarantees to hold symbol for stack trace which are shown to user

chromium-94-ffmpeg-roll.patch Added

@@ -0,0 +1,49 @@
+From b94755e4633045be96ab5e0bdde0db7e16a804bd Mon Sep 17 00:00:00 2001
+From: "liberato@chromium.org" <liberato@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 <tguilbert@chromium.org>
+Commit-Queue: Frank Liberato <liberato@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,7 +29,6 @@ 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;
+   }

chromium-91-libyuv-aarch64.patch -> chromium-95-libyuv-aarch64.patch Changed

@@ -28,64 +28,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-95-quiche-include.patch Added

chromium-96-CommandLine-include.patch Added

chromium-96-CouponDB-include.patch Added

chromium-96-DrmRenderNodePathFinder-include.patch Added

chromium-96-RestrictedCookieManager-tuple.patch Added

@@ -0,0 +1,31 @@
+From 86b1886673c3e75d3a7b8c802b3e9fa6ea945a1e Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Fri, 08 Oct 2021 06:32:55 +0000
+Subject: [PATCH] libstdc++: no implicit conversion from tuple created with std::tie to an std::pair in restricted cookie manager.
+
+Fix compilation error:
+    ../../services/network/restricted_cookie_manager.cc:164:30: error: no match for ‘operator[]’ (operand types are ‘network::CookieAccessesByURLAndSite’ {aka ‘std::map<std::pair<GURL, net::SiteForCookies>, std::unique_ptr<std::set<net::CookieWithAccessResult, network::CookieWithAccessResultComparer> > >’} and ‘std::tuple<const GURL&, const net::SiteForCookies&>’)
+
+There is no conversion from tuple to pair.
+
+Bug: 957519
+Change-Id: Idf29c7b21895ae28f45b35d6193ab4ac555945c8
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3211752
+Reviewed-by: Robbie McElrath <rmcelrath@chromium.org>
+Commit-Queue: José Dapena Paz <jdapena@igalia.com>
+Cr-Commit-Position: refs/heads/main@{#929597}
+---
+
+diff --git a/services/network/restricted_cookie_manager.cc b/services/network/restricted_cookie_manager.cc
+index 425426f..c8c10c6 100644
+--- a/services/network/restricted_cookie_manager.cc
++++ b/services/network/restricted_cookie_manager.cc
+@@ -161,7 +161,7 @@
+     const GURL& url,
+     const net::SiteForCookies& site_for_cookies) {
+   std::unique_ptr<CookieAccesses>& entry =
+-      recent_cookie_accesses_[std::tie(url, site_for_cookies)];
++      recent_cookie_accesses_[std::make_pair(url, site_for_cookies)];
+   if (!entry) {
+     entry = std::make_unique<CookieAccesses>();
+   }

chromium-96-compiler.patch Added

@@ -0,0 +1,212 @@
+From f4d0b0eb899005b4b8b6388e1d8bb82cc0018fc8 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Fri, 1 Oct 2021 12:17:48 +0000
+Subject: [PATCH] Disable various compiler configs
+
+---
+ build/config/compiler/BUILD.gn | 98 ++++++----------------------------
+ 1 file changed, 17 insertions(+), 81 deletions(-)
+
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 673716f..3ff820e 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -292,8 +292,6 @@ config("compiler") {
+ 
+   configs += [
+     # See the definitions below.
+-    ":clang_revision",
+-    ":compiler_cpu_abi",
+     ":compiler_codegen",
+     ":compiler_deterministic",
+   ]
+@@ -532,24 +530,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) ||
+@@ -1240,45 +1220,6 @@ config("compiler_deterministic") {
+     }
+   }
+ 
+-  # Makes builds independent of absolute file path.
+-  if (is_clang && strip_absolute_paths_from_debug_symbols) {
+-    # If debug option is given, clang includes $cwd in debug info by default.
+-    # For such build, this flag generates reproducible obj files even we use
+-    # 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.
+-    if (is_nacl) {
+-      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
+-      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,." ]
+-    }
+-
+-    if (is_win && use_lld) {
+-      if (symbol_level == 2 || (is_clang && using_sanitizer)) {
+-        # Absolutize source file paths for PDB. Pass the real build directory
+-        # if the pdb contains source-level debug information and if linker
+-        # reproducibility is not critical.
+-        ldflags += [ "/PDBSourcePath:" + rebase_path(root_build_dir) ]
+-      } else {
+-        # Use a fake fixed base directory for paths in the pdb to make the pdb
+-        # output fully deterministic and independent of the build directory.
+-        ldflags += [ "/PDBSourcePath:o:\fake\prefix" ]
+-      }
+-    }
+-  }
+-
+   # Tells the compiler not to use absolute paths when passing the default
+   # paths to the tools it invokes. We don't want this because we don't
+   # really need it and it can mess up the goma cache entries.
+@@ -1698,7 +1639,7 @@ config("chromium_code") {
+       defines = [ "_HAS_NODISCARD" ]
+     }
+   } else {
+-    cflags = [ "-Wall" ]
++    cflags = []
+     if (treat_warnings_as_errors) {
+       cflags += [ "-Werror" ]
+ 
+@@ -1707,10 +1648,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.
+@@ -1719,15 +1656,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" ]
+@@ -2095,7 +2023,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.
+@@ -2135,7 +2064,8 @@ config("optimize") {
+ }
+ 
+ # Turn off optimizations.
+-config("no_optimize") {
++config("no_optimize") { }
++config("xno_optimize") {
+   if (is_win) {
+     cflags = [
+       "/Od",  # Disable optimization.
+@@ -2175,7 +2105,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:
+@@ -2208,7 +2139,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:
+@@ -2234,7 +2166,8 @@ config("optimize_speed") {
+   }
+ }
+ 
+-config("optimize_fuzzing") {
++config("optimize_fuzzing") { }
++config("xoptimize_fuzzing") {
+   cflags = [ "-O1" ] + common_optimize_on_cflags
+   rustflags = [ "-Copt-level=1" ]
+   ldflags = common_optimize_on_ldflags
+@@ -2354,7 +2287,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.
+@@ -2468,7 +2402,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 = []

chromium-glibc-2.34.patch Changed

chromium-norar.patch Changed

@@ -38,8 +38,8 @@
 -    public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ]
 -  }
 -
-   if (is_mac) {
-     source_set("disk_image_type_sniffer_mac") {
+   if (is_linux || is_win) {
+     source_set("document_analyzer") {
        sources = [
 @@ -149,7 +116,6 @@ source_set("safe_browsing") {
        ":archive_analyzer_results",
@@ -53,8 +53,8 @@
 --- 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/maldoca",
    "+third_party/protobuf",
 -  "+third_party/unrar",
    "+third_party/zlib",
@@ -68,8 +68,8 @@
        "//chrome/common/safe_browsing:archive_analyzer_results",
 -      "//chrome/common/safe_browsing:rar_analyzer",
      ]
-   }
  
+     if (is_linux || is_win) {
 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

chromium-older-harfbuzz.patch Deleted

@@ -1,26 +0,0 @@
-From: Fabian Vogt <fvogt@suse.com>
-Subject: Fix build with harfbuzz < 2.9.0
-
-Index: qtwebengine-everywhere-src-5.15.6/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc
-===================================================================
---- a/components/paint_preview/common/subset_font.cc
-+++ b/components/paint_preview/common/subset_font.cc
-@@ -71,11 +71,18 @@ sk_sp<SkData> SubsetFont(SkTypeface* typ
-   hb_set_t* glyphs =
-       hb_subset_input_glyph_set(input.get());  // Owned by |input|.
-   usage.ForEach(base::BindRepeating(&AddGlyphs, base::Unretained(glyphs)));
-+#if HB_VERSION_ATLEAST(2,9,0)
-   hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS);
- 
-   HbScoped<hb_face_t> subset_face(hb_subset_or_fail(face.get(), input.get()));
-   if (!subset_face)
-     return nullptr;
-+#else
-+  hb_subset_input_set_retain_gids(input.get(), true);
-+
-+  HbScoped<hb_face_t> subset_face(hb_subset(face.get(), input.get()));
-+#endif
-+
-   HbScoped<hb_blob_t> subset_blob(hb_face_reference_blob(subset_face.get()));
-   if (!subset_blob)
-     return nullptr;

gcc-enable-lto.patch Changed

INSTALL.sh Changed

chromium-94.0.4606.81.tar.xz -> chromium-96.0.4664.110.tar.xz Changed

highway-0.12.2.tar.gz Deleted

Changes of Revision 20