Browse Source

Update to 96.0.4664.45

master 96.0.4664.45-1
wchen342 1 year ago
parent
commit
90ce37dff9
Signed by: wchen342 GPG Key ID: 9C19365D69B04CEC
  1. 8
      README.md
  2. 13
      chromium-87.0.4280.66-el7-no-sys-random.patch
  3. 13
      chromium-91.0.4472.77-disable-fontconfig-cache-magic.patch
  4. 17
      chromium-92.0.4515.107-py3-fixes.patch
  5. 74
      chromium-92.0.4515.131-centos-no-partition-malloc.patch
  6. 11
      chromium-93.0.4577.63-vector-fix.patch
  7. 15
      chromium-94.0.4606.71-PartitionFree-nullptr-fix.patch
  8. 24
      chromium-96-DrmRenderNodePathFinder-include.patch
  9. 31
      chromium-96-RestrictedCookieManager-tuple.patch
  10. 58
      chromium-96.0.4664.45-EnumTable-crash.patch
  11. 11
      chromium-base-include-memory.patch
  12. 11
      chromium-commerce-coupons-coupon_db-vector.patch
  13. 10
      chromium-quiche-size_t.patch
  14. 1
      clean_ffmpeg.sh
  15. 4
      sources
  16. 59
      ungoogled-chromium.spec

8
README.md

@ -14,14 +14,14 @@ Pre-built binary rpm files can be found on OBS:
- [OBS Development Project](https://build.opensuse.org/project/show/home:ungoogled_chromium:testing)
* RPM repository
- OBS (Fedora 34)
- OBS (Fedora 35)
```sh
# dnf config-manager --add-repo https://download.opensuse.org/repositories/home:/ungoogled_chromium/Fedora_34/home:ungoogled_chromium.repo
# dnf config-manager --add-repo https://download.opensuse.org/repositories/home:/ungoogled_chromium/Fedora_35/home:ungoogled_chromium.repo
# dnf install ungoogled-chromium
```
- OBS (Fedora 33)
- OBS (Fedora 34)
```sh
# dnf config-manager --add-repo https://download.opensuse.org/repositories/home:/ungoogled_chromium/Fedora_33/home:ungoogled_chromium.repo
# dnf config-manager --add-repo https://download.opensuse.org/repositories/home:/ungoogled_chromium/Fedora_34/home:ungoogled_chromium.repo
# dnf install ungoogled-chromium
```

13
chromium-87.0.4280.66-el7-no-sys-random.patch

@ -1,13 +0,0 @@
diff -up chromium-87.0.4280.66/base/rand_util_posix.cc.el7 chromium-87.0.4280.66/base/rand_util_posix.cc
--- chromium-87.0.4280.66/base/rand_util_posix.cc.el7 2020-11-20 11:11:22.169119495 -0500
+++ chromium-87.0.4280.66/base/rand_util_posix.cc 2020-11-20 11:13:30.375614387 -0500
@@ -21,7 +21,8 @@
#include "third_party/lss/linux_syscall_support.h"
#endif
-#if !defined(OS_IOS) && !defined(OS_NACL)
+//EL-7 is too old to have this header
+#if 0
// TODO(crbug.com/995996): Waiting for this header to appear in the iOS SDK.
// (See below.)
#include <sys/random.h>

13
chromium-91.0.4472.77-disable-fontconfig-cache-magic.patch

@ -1,13 +0,0 @@
diff -up chromium-91.0.4472.77/base/test/BUILD.gn.nofontconfigcache chromium-91.0.4472.77/base/test/BUILD.gn
--- chromium-91.0.4472.77/base/test/BUILD.gn.nofontconfigcache 2021-06-01 16:41:40.094756454 -0400
+++ chromium-91.0.4472.77/base/test/BUILD.gn 2021-06-01 16:42:47.736100516 -0400
@@ -198,9 +198,6 @@ static_library("test_support") {
sources += [ "test_file_util_linux.cc" ]
public_deps += [ ":fontconfig_util_linux" ]
data_deps += [ "//third_party/test_fonts" ]
- if (current_toolchain == host_toolchain) {
- data_deps += [ ":do_generate_fontconfig_caches" ]
- }
}
if (is_mac) {

17
chromium-92.0.4515.107-py3-fixes.patch

@ -1,17 +0,0 @@
diff -up chromium-92.0.4515.107/third_party/jinja2/tests.py.py3 chromium-92.0.4515.107/third_party/jinja2/tests.py
--- chromium-92.0.4515.107/third_party/jinja2/tests.py.py3 2021-07-28 15:53:45.670961029 -0400
+++ chromium-92.0.4515.107/third_party/jinja2/tests.py 2021-07-28 15:55:56.637013096 -0400
@@ -10,7 +10,12 @@
"""
import operator
import re
-from collections import Mapping
+import sys
+if sys.version_info[:2] >= (3, 8): # pragma: no cover
+ from collections.abc import Mapping
+else: # pragma: no cover
+ from collections import Mapping
+
from jinja2.runtime import Undefined
from jinja2._compat import text_type, string_types, integer_types
import decimal

74
chromium-92.0.4515.131-centos-no-partition-malloc.patch

@ -1,74 +0,0 @@
diff --git a/third_party/blink/renderer/platform/exported/platform.cc b/third_party/blink/renderer/platform/exported/platform.cc
index 5e808a73..69d6947f 100644
--- a/third_party/blink/renderer/platform/exported/platform.cc
+++ b/third_party/blink/renderer/platform/exported/platform.cc
@@ -33,6 +33,7 @@
#include <memory>
#include "base/allocator/partition_allocator/memory_reclaimer.h"
+#include "base/partition_alloc_buildflags.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_checker.h"
#include "base/threading/thread_task_runner_handle.h"
@@ -55,7 +56,9 @@
#include "third_party/blink/renderer/platform/instrumentation/canvas_memory_dump_provider.h"
#include "third_party/blink/renderer/platform/instrumentation/instance_counters_memory_dump_provider.h"
#include "third_party/blink/renderer/platform/instrumentation/memory_pressure_listener.h"
+#if BUILDFLAG(USE_PARTITION_ALLOC)
#include "third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.h"
+#endif
#include "third_party/blink/renderer/platform/instrumentation/tracing/memory_cache_dump_provider.h"
#include "third_party/blink/renderer/platform/language.h"
#include "third_party/blink/renderer/platform/scheduler/common/simple_thread_scheduler.h"
@@ -230,9 +233,11 @@ void Platform::InitializeMainThreadCommon(Platform* platform,
DCHECK(!g_gc_task_runner);
g_gc_task_runner = new GCTaskRunner(Thread::MainThread());
+#if BUILDFLAG(USE_PARTITION_ALLOC)
base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
PartitionAllocMemoryDumpProvider::Instance(), "PartitionAlloc",
base::ThreadTaskRunnerHandle::Get());
+#endif
base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
FontCacheMemoryDumpProvider::Instance(), "FontCaches",
base::ThreadTaskRunnerHandle::Get());
diff --git a/third_party/blink/renderer/platform/instrumentation/BUILD.gn b/third_party/blink/renderer/platform/instrumentation/BUILD.gn
index 814c58d2..b2bcc1bb 100644
--- a/third_party/blink/renderer/platform/instrumentation/BUILD.gn
+++ b/third_party/blink/renderer/platform/instrumentation/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//base/allocator/allocator.gni")
import("//third_party/blink/renderer/platform/platform.gni")
blink_platform_sources("instrumentation") {
@@ -18,8 +19,6 @@ blink_platform_sources("instrumentation") {
"instance_counters_memory_dump_provider.h",
"memory_pressure_listener.cc",
"memory_pressure_listener.h",
- "partition_alloc_memory_dump_provider.cc",
- "partition_alloc_memory_dump_provider.h",
"resource_coordinator/document_resource_coordinator.cc",
"resource_coordinator/document_resource_coordinator.h",
"resource_coordinator/renderer_resource_coordinator.cc",
@@ -37,7 +36,17 @@ blink_platform_sources("instrumentation") {
"use_counter.h",
]
- deps = [ "//services/service_manager/public/cpp" ]
+ if (use_allocator == "partition") {
+ sources += [
+ "partition_alloc_memory_dump_provider.cc",
+ "partition_alloc_memory_dump_provider.h",
+ ]
+ }
+
+ deps = [
+ "//base/allocator:buildflags",
+ "//services/service_manager/public/cpp",
+ ]
public_deps = [
"//components/performance_manager/public/mojom:mojom_blink",
"//third_party/blink/renderer/platform/heap:heap",

11
chromium-93.0.4577.63-vector-fix.patch

@ -1,11 +0,0 @@
diff -up chromium-93.0.4577.63/components/cast_channel/enum_table.h.vector-fix chromium-93.0.4577.63/components/cast_channel/enum_table.h
--- chromium-93.0.4577.63/components/cast_channel/enum_table.h.vector-fix 2021-09-03 12:23:37.974714814 +0000
+++ chromium-93.0.4577.63/components/cast_channel/enum_table.h 2021-09-03 12:23:51.330223540 +0000
@@ -8,6 +8,7 @@
#include <cstdint>
#include <cstring>
#include <ostream>
+#include <vector>
#include "base/check_op.h"
#include "base/macros.h"

15
chromium-94.0.4606.71-PartitionFree-nullptr-fix.patch

@ -1,15 +0,0 @@
diff -up chromium-94.0.4606.71/base/allocator/allocator_shim_default_dispatch_to_partition_alloc.cc.nullptr-fix chromium-94.0.4606.71/base/allocator/allocator_shim_default_dispatch_to_partition_alloc.cc
--- chromium-94.0.4606.71/base/allocator/allocator_shim_default_dispatch_to_partition_alloc.cc.nullptr-fix 2021-10-06 15:23:11.590602162 -0400
+++ chromium-94.0.4606.71/base/allocator/allocator_shim_default_dispatch_to_partition_alloc.cc 2021-10-06 15:29:21.508762249 -0400
@@ -380,7 +380,10 @@ void PartitionFree(const AllocatorDispat
size_t PartitionGetSizeEstimate(const AllocatorDispatch*,
void* address,
void* context) {
- PA_DCHECK(address);
+ // This is used to implement malloc_usable_size(3). Per its man page, "if ptr
+ // is NULL, 0 is returned".
+ if (!address)
+ return 0;
#if defined(OS_APPLE)
if (!base::IsManagedByPartitionAlloc(address)) {

24
chromium-96-DrmRenderNodePathFinder-include.patch

@ -0,0 +1,24 @@
From 9e36b3c28935fb50d43ccef443be786a8e3f8a5f Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <[email protected]>
Date: Sat, 9 Oct 2021 16:17:34 +0000
Subject: [PATCH] IWYU: add string.h for memcmp in ui:: DrmRenderNodePathFinder
---
ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc | 1 +
1 file changed, 1 insertion(+)
diff --git a/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc b/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc
index 06776a7..d5b7b71 100644
--- a/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc
+++ b/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc
@@ -5,6 +5,7 @@
#include "ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.h"
#include <fcntl.h>
+#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
--
2.32.0

31
chromium-96-RestrictedCookieManager-tuple.patch

@ -0,0 +1,31 @@
From 86b1886673c3e75d3a7b8c802b3e9fa6ea945a1e Mon Sep 17 00:00:00 2001
From: Jose Dapena Paz <[email protected]>
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 <[email protected]>
Commit-Queue: José Dapena Paz <[email protected]>
Cr-Commit-Position: refs/heads/[email protected]{#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>();
}

58
chromium-92.0.4515.107-EnumTable-crash.patch → chromium-96.0.4664.45-EnumTable-crash.patch

@ -1,26 +1,32 @@
diff -up chromium-92.0.4515.107/components/cast_channel/enum_table.h.EnumTable-crash chromium-92.0.4515.107/components/cast_channel/enum_table.h
--- chromium-92.0.4515.107/components/cast_channel/enum_table.h.EnumTable-crash 2021-07-19 14:45:12.000000000 -0400
+++ chromium-92.0.4515.107/components/cast_channel/enum_table.h 2021-07-26 17:41:21.987375385 -0400
@@ -212,7 +212,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
@@ -250,8 +250,7 @@ class EnumTable {
// Constructor for regular entries.
diff --git a/components/cast_channel/enum_table.h b/components/cast_channel/enum_table.h
index aad9e08..2f3fcad 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"
@@ -188,7 +189,6 @@ class
inline constexpr GenericEnumTableEntry(int32_t value);
inline constexpr GenericEnumTableEntry(int32_t value, base::StringPiece str);
- GenericEnumTableEntry(const GenericEnumTableEntry&) = delete;
GenericEnumTableEntry& operator=(const GenericEnumTableEntry&) = delete;
private:
@@ -254,7 +254,6 @@ class EnumTable {
constexpr Entry(E value, base::StringPiece str)
: GenericEnumTableEntry(static_cast<int32_t>(value), str) {}
-
- DISALLOW_COPY_AND_ASSIGN(Entry);
+ DISALLOW_ASSIGN(Entry);
- Entry(const Entry&) = delete;
Entry& operator=(const Entry&) = delete;
};
static_assert(sizeof(E) <= sizeof(int32_t),
@@ -306,15 +305,14 @@ class EnumTable {
@@ -313,15 +312,14 @@ class EnumTable {
if (is_sorted_) {
const std::size_t index = static_cast<std::size_t>(value);
if (ANALYZER_ASSUME_TRUE(index < data_.size())) {
@ -36,9 +42,9 @@ diff -up chromium-92.0.4515.107/components/cast_channel/enum_table.h.EnumTable-c
- 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
@@ -342,8 +340,7 @@ class EnumTable {
@@ -349,8 +347,7 @@ class EnumTable {
// enum value directly.
absl::optional<E> GetEnum(base::StringPiece str) const {
auto* entry = GenericEnumTableEntry::FindByString(
@ -47,17 +53,17 @@ diff -up chromium-92.0.4515.107/components/cast_channel/enum_table.h.EnumTable-c
+ &data_[0], data_.size(), str);
return entry ? static_cast<E>(entry->value) : absl::optional<E>();
}
@@ -358,7 +355,7 @@ class EnumTable {
@@ -365,7 +362,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)
@@ -370,8 +367,8 @@ class EnumTable {
@@ -377,8 +374,8 @@ class EnumTable {
for (std::size_t i = 0; i < data.size(); i++) {
for (std::size_t j = i + 1; j < data.size(); j++) {

11
chromium-base-include-memory.patch

@ -0,0 +1,11 @@
diff --git a/base/command_line.h b/base/command_line.h
--- a/base/command_line.h
+++ b/base/command_line.h
@@ -21,6 +21,7 @@
#include <map>
#include <string>
#include <vector>
+#include <memory>
#include "base/base_export.h"
#include "base/strings/string_piece.h"

11
chromium-commerce-coupons-coupon_db-vector.patch

@ -0,0 +1,11 @@
diff --git a/chrome/browser/commerce/coupons/coupon_db.h b/chrome/browser/commerce/coupons/coupon_db.h
--- a/chrome/browser/commerce/coupons/coupon_db.h
+++ b/chrome/browser/commerce/coupons/coupon_db.h
@@ -5,6 +5,7 @@
#ifndef CHROME_BROWSER_COMMERCE_COUPONS_COUPON_DB_H_
#define CHROME_BROWSER_COMMERCE_COUPONS_COUPON_DB_H_
+#include <vector>
#include "base/callback_helpers.h"
#include "base/memory/weak_ptr.h"
#include "url/gurl.h"

10
chromium-quiche-size_t.patch

@ -1,10 +0,0 @@
diff --git a/net/third_party/quiche/src/http2/adapter/window_manager.h b/net/third_party/quiche/src/http2/adapter/window_manager.h
--- a/net/third_party/quiche/src/http2/adapter/window_manager.h
+++ b/net/third_party/quiche/src/http2/adapter/window_manager.h
@@ -2,6 +2,7 @@
#define QUICHE_HTTP2_ADAPTER_WINDOW_MANAGER_H_
#include <functional>
+#include <stddef.h>
#include "common/platform/api/quiche_export.h"

1
clean_ffmpeg.sh

@ -238,6 +238,7 @@ manual_files=" libavcodec/aarch64/fft_neon.S \
libavcodec/mdct15.c \
libavcodec/mdct_template.c \
libavcodec/options.c \
libavcodec/pcm.c \
libavcodec/pel_template.c \
libavcodec/utils.c \
libavcodec/videodsp.c \

4
sources

@ -3,5 +3,5 @@ SHA256 (MuktiNarrow-0.94.tar.bz2) = bb8af9b9437f1d13ff8cdc8784188ebf0c2ee8b97e32
SHA256 (Ahem.ttf) = b719ecb31c5b21fc573c03f6421c74ac63c271a5a3ff841e34f9705fb94b8448
SHA256 (NotoSansTibetan-Regular.ttf) = 5a45f430812ef981952553ef6dd6fa04c7849e97880cdfecc7bf572a58efed93
SHA256 (xcb-proto-1.14.tar.xz) = 186a3ceb26f9b4a015f5a44dcc814c93033a5fc39684f36f1ecc79834416a605
SHA256 (chromium-95.0.4638.69.tar.xz) = 38a37d737c6c9a7198402ca614746b2dbb7abbb793bb2cb02dc796b62a22efe7
SHA256 (ungoogled-chromium-95.0.4638.69-1.tar.gz) = 35debe7f407a4749d4454fc78f52c18955f1d8400750fdc20b179f528106c658
SHA256 (chromium-96.0.4664.45.tar.xz) = 488c6ad983ebf7781cb4d704f70496e8aa2165611b46656d7aa62f269c760407
SHA256 (ungoogled-chromium-96.0.4664.45-1.tar.gz) = 8f74125ac735b727c557b2473f650cf540810dbe19944331fefc8020d98ad5dd

59
ungoogled-chromium.spec

@ -142,18 +142,18 @@ BuildRequires: libicu-devel >= 5.4
#Build with debugging symbols
%global debug_pkg 0
%global majorversion 95
%global majorversion 96
%global revision 1
# Depot tools revision
%global depot_tools_revision 78f91964318b870d274009a77b345920b5b93043
%global depot_tools_revision dc86a4b9044f9243886ca0da0c1753820ac51f45
%if %{freeworld}
Name: ungoogled-chromium%{nsuffix}
%else
Name: ungoogled-chromium
%endif
Version: %{majorversion}.0.4638.69
Version: %{majorversion}.0.4664.45
Release: 1%{?dist}.%{revision}
%if %{?freeworld}
# chromium-freeworld
@ -173,13 +173,10 @@ Patch2: chromium-67.0.3396.62-gn-system.patch
Patch3: chromium-60.0.3112.78-no-libpng-prefix.patch
# Do not mangle zlib
Patch5: chromium-77.0.3865.75-no-zlib-mangle.patch
# Disable fontconfig cache magic that breaks remoting
Patch8: chromium-91.0.4472.77-disable-fontconfig-cache-magic.patch
# Try to load widevine from other places
Patch10: chromium-92.0.4515.107-widevine-other-locations.patch
# Tell bootstrap.py to always use the version of Python we specify
Patch11: chromium-93.0.4577.63-py3-bootstrap.patch
# https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-unbundle-zlib.patch
Patch52: chromium-81.0.4044.92-unbundle-zlib.patch
# Fix issue where closure_compiler thinks java is only allowed in android builds
@ -194,28 +191,17 @@ Patch76: chromium-92.0.4515.107-rawhide-gcc-std-max-fix.patch
Patch79: chromium-93.0.4577.63-widevine-no-download.patch
# Fix crashes with components/cast_*
# Thanks to Gentoo
Patch80: chromium-92.0.4515.107-EnumTable-crash.patch
# Fixes for python3
Patch83: chromium-92.0.4515.107-py3-fixes.patch
Patch80: chromium-96.0.4664.45-EnumTable-crash.patch
# Clean up clang-format for python3
# thanks to Jon Nettleton
Patch86: chromium-93.0.4577.63-clang-format.patch
# In file included from ../../components/cast_channel/enum_table.cc:5:
# ../../components/cast_channel/enum_table.h:359:18: error: 'vector' in namespace 'std' does not name a template type
# 359 | const std::vector<Entry> data_;
# | ^~~~~~
# ../../components/cast_channel/enum_table.h:18:1: note: 'std::vector' is defined in header '<vector>'; did you forget to '#include <vector>'?
Patch93: chromium-93.0.4577.63-vector-fix.patch
# include full UrlResponseHead header
Patch95: chromium-93.0.4577.63-mojo-header-fix.patch
# Fix multiple defines issue in webrtc/BUILD.gn
Patch96: chromium-94.0.4606.54-webrtc-BUILD.gn-fix-multiple-defines.patch
# From gentoo
Patch98: chromium-94.0.4606.71-InkDropHost-crash.patch
# From upstream
# https://chromium.googlesource.com/chromium/src/+/403393b908cefaed09592a4f25fe2cbd46317a68%5E%21/#F0
Patch99: chromium-94.0.4606.71-PartitionFree-nullptr-fix.patch
# VAAPI
@ -230,7 +216,14 @@ Patch300: chromium-92.0.4515.107-rhel8-force-disable-use_gnome_keyring.patch
# Fixes from Gentoo
Patch400: chromium-glibc-2.34.patch
Patch401: chromium-VirtualCursor-standard-layout.patch
Patch402: chromium-quiche-size_t.patch
Patch405: chromium-base-include-memory.patch
Patch407: chromium-96-DrmRenderNodePathFinder-include.patch
Patch408: chromium-commerce-coupons-coupon_db-vector.patch
# Thanks void linux
Patch406: chromium-96-RestrictedCookieManager-tuple.patch
# Clang 12 cflags
Patch403: chromium-clang-12-cflags.patch
Patch404: chromium-clang-sanitizer-cflags.patch
@ -281,7 +274,7 @@ Source20: https://www.x.org/releases/individual/proto/xcb-proto-1.14.tar.xz
Source22: ungoogled-chromium.appdata.xml
# ungoogled-chromium source
%global ungoogled_chromium_revision 95.0.4638.69-1
%global ungoogled_chromium_revision 96.0.4664.45-1
Source300: https://github.com/Eloston/ungoogled-chromium/archive/%{ungoogled_chromium_revision}/ungoogled-chromium-%{ungoogled_chromium_revision}.tar.gz
BuildRequires: llvm
@ -385,9 +378,14 @@ BuildRequires: libudev-devel
%if %{bundlelibusbx}
# Do nothing
%else
%if 0%{?fedora} >= 35
Requires: libusb1 >= 1.0.24-4
BuildRequires: libusb1-devel >= 1.0.24-4
%else
Requires: libusbx >= 1.0.21-0.1.git448584a
BuildRequires: libusbx-devel >= 1.0.21-0.1.git448584a
%endif
%endif
BuildRequires: libva-devel
# We don't use libvpx anymore because Chromium loves to
# use bleeding edge revisions here that break other things
@ -565,7 +563,6 @@ ln -s depot_tools-%{depot_tools_revision} ../depot_tools
%patch2 -p1 -b .gnsystem
%patch3 -p1 -b .nolibpngprefix
%patch5 -p1 -b .nozlibmangle
%patch8 -p1 -b .nofontconfigcache
%patch10 -p1 -b .widevine-other-locations
%if 0%{?build_with_python3}
%patch11 -p1 -b .py3
@ -582,13 +579,10 @@ ln -s depot_tools-%{depot_tools_revision} ../depot_tools
%endif
%patch79 -p1 -b .widevine-no-download
%patch80 -p1 -b .EnumTable-crash
%patch83 -p1 -b .py3fixes
%patch86 -p1 -b .clang-format-py3
%patch93 -p1 -b .vector-fix
%patch95 -p1 -b .mojo-header-fix
%patch96 -p1 -b .webrtc-BUILD.gn-fix-multiple-defines
%patch98 -p1 -b .InkDropHost-crash
%patch99 -p1 -b .PartitionFree-nullptr-fix
# Feature specific patches
%if %{use_vaapi}
@ -605,7 +599,12 @@ ln -s depot_tools-%{depot_tools_revision} ../depot_tools
# glibc fix
%patch400 -p1 -b .glibc-2.34
%patch401 -p1 -b .virtualcursor
%patch402 -p1 -b .quiche-size_t
%patch405 -p1 -b .base-include-memory
%patch406 -p1 -b .restrictedcookiemanager-tuple
%patch407 -p1 -b .drmrendernodepathfinder
%patch408 -p1 -b .commerce-coupons-coupon_db-vector
# cflags
%if 0%{?fedora} < 35
%patch403 -p1 -b .clang-12-cflags
%endif
@ -808,6 +807,8 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/devtools-frontend/src/front_end/third_party/puppeteer' \
'third_party/devtools-frontend/src/front_end/third_party/wasmparser' \
'third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n' \
'third_party/devtools-frontend/src/third_party' \
'third_party/distributed_point_functions' \
'third_party/dom_distiller_js' \
'third_party/eigen3' \
'third_party/emoji-segmenter' \
@ -876,6 +877,9 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/lss' \
'third_party/lzma_sdk' \
'third_party/mako' \
'third_party/maldoca' \
'third_party/maldoca/src/third_party/tensorflow_protos' \
'third_party/maldoca/src/third_party/zlibwrapper' \
'third_party/markupsafe' \
'third_party/mesa' \
'third_party/metrics_proto' \
@ -950,7 +954,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/tflite' \
'third_party/tflite/src/third_party/eigen3' \
'third_party/tflite/src/third_party/fft2d' \
'third_party/tflite-support' \
'third_party/tflite_support' \
'third_party/ukey2' \
'third_party/usb_ids' \
'third_party/usrsctp' \
@ -1328,6 +1332,9 @@ fi
%{chromium_path}/chromedriver
%changelog
* Thu Nov 18 2021 wchen342 <[email protected]> - 96.0.4664.45-1
- update Chromium to 96.0.4664.45
* Thu Nov 11 2021 wchen342 <[email protected]> - 95.0.4638.69-1
- update Chromium to 95.0.4638.69
- Use clang instead of gcc

Loading…
Cancel
Save