chromium: update to 114.0.5735.106.
This commit is contained in:
Duncaen
parent
46dd270c3d
commit
79485f6d08
6 changed files with 133 additions and 92 deletions
|
|
@ -1,29 +0,0 @@
|
|||
Patch-Source: https://github.com/archlinux/svntogit-packages/blob/79b774aedeaecd4d31b2adb84e3e4b901dc980aa/trunk/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
|
||||
--
|
||||
From 2e14a3ac178ee87aa9154e5a15dcd986af1b6059 Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Hartmann <stha09@googlemail.com>
|
||||
Date: Tue, 28 Mar 2023 14:34:55 +0000
|
||||
Subject: [PATCH] IWYU: add cstring for std::strlen in web_view_impl.cc
|
||||
|
||||
Bug: 957519
|
||||
Change-Id: I15ad1e905eda3d96bbf164f5df8f3cf8e02bc370
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4376772
|
||||
Reviewed-by: Alex Ilin <alexilin@chromium.org>
|
||||
Commit-Queue: Alex Ilin <alexilin@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#1123011}
|
||||
---
|
||||
chrome/test/chromedriver/chrome/web_view_impl.cc | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/chrome/test/chromedriver/chrome/web_view_impl.cc b/chrome/test/chromedriver/chrome/web_view_impl.cc
|
||||
index f726627e88d..d96d481d0bc 100644
|
||||
--- a/chrome/test/chromedriver/chrome/web_view_impl.cc
|
||||
+++ b/chrome/test/chromedriver/chrome/web_view_impl.cc
|
||||
@@ -6,6 +6,7 @@
|
||||
|
||||
#include <stddef.h>
|
||||
#include <algorithm>
|
||||
+#include <cstring>
|
||||
#include <memory>
|
||||
#include <queue>
|
||||
#include <utility>
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
From 2914039316d4ed3f53c3393dc2ba48f637807689 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Kasting <pkasting@chromium.org>
|
||||
Date: Fri, 12 May 2023 16:40:53 +0000
|
||||
Subject: [PATCH] Add some "typename"s that are required in C++17.
|
||||
|
||||
Bug: 1444563
|
||||
Change-Id: I7801f5e82a40305c357eeda219678dda558f5752
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4526465
|
||||
Commit-Queue: Alan Screen <awscreen@chromium.org>
|
||||
Reviewed-by: Alan Screen <awscreen@chromium.org>
|
||||
Auto-Submit: Peter Kasting <pkasting@chromium.org>
|
||||
Commit-Queue: Peter Kasting <pkasting@chromium.org>
|
||||
Code-Coverage: Findit <findit-for-me@appspot.gserviceaccount.com>
|
||||
Cr-Commit-Position: refs/heads/main@{#1143319}
|
||||
---
|
||||
chrome/browser/printing/print_backend_service_manager.cc | 2 +-
|
||||
chrome/browser/printing/print_backend_service_manager.h | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/chrome/browser/printing/print_backend_service_manager.cc b/chrome/browser/printing/print_backend_service_manager.cc
|
||||
index b5a4b525a2d..224369cd58c 100644
|
||||
--- a/chrome/browser/printing/print_backend_service_manager.cc
|
||||
+++ b/chrome/browser/printing/print_backend_service_manager.cc
|
||||
@@ -1477,7 +1477,7 @@ template <class... T>
|
||||
void PrintBackendServiceManager::RunSavedCallbacks(
|
||||
RemoteSavedCallbacks<T...>& saved_callbacks,
|
||||
const RemoteId& remote_id,
|
||||
- std::remove_reference<T>::type... result) {
|
||||
+ typename std::remove_reference<T>::type... result) {
|
||||
auto found_callbacks_map = saved_callbacks.find(remote_id);
|
||||
if (found_callbacks_map == saved_callbacks.end())
|
||||
return; // No callbacks to run.
|
||||
diff --git a/chrome/browser/printing/print_backend_service_manager.h b/chrome/browser/printing/print_backend_service_manager.h
|
||||
index 41788f42a95..6aa7479c1fd 100644
|
||||
--- a/chrome/browser/printing/print_backend_service_manager.h
|
||||
+++ b/chrome/browser/printing/print_backend_service_manager.h
|
||||
@@ -588,7 +588,7 @@ class PrintBackendServiceManager {
|
||||
template <class... T>
|
||||
void RunSavedCallbacks(RemoteSavedCallbacks<T...>& saved_callbacks,
|
||||
const RemoteId& remote_id,
|
||||
- std::remove_reference<T>::type... result);
|
||||
+ typename std::remove_reference<T>::type... result);
|
||||
|
||||
// Test support for client ID management.
|
||||
static void SetClientsForTesting(
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
Source: https://src.fedoraproject.org/rpms/chromium/blob/439349f5608f8ecb21aec532e8f9ba6a5b4920f7/f/chromium-113-workaround_clang_bug-structured_binding.patch
|
||||
workaround llvm15 compiler bug
|
||||
diff -up chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
|
||||
--- chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me 2023-05-03 16:30:34.244612573 +0200
|
||||
+++ chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-05-03 16:37:36.732278590 +0200
|
||||
@@ -516,8 +516,11 @@ wtf_size_t NGGridLayoutAlgorithm::BuildG
|
||||
row_auto_repetitions);
|
||||
|
||||
bool has_nested_subgrid = false;
|
||||
- auto& [grid_items, layout_data, subtree_size] =
|
||||
- sizing_tree->CreateSizingData();
|
||||
+
|
||||
+ auto& workaround_clang_bug = sizing_tree->CreateSizingData();
|
||||
+ auto& grid_items = workaround_clang_bug.grid_items;
|
||||
+ auto& layout_data = workaround_clang_bug.layout_data;
|
||||
+ auto& subtree_size = workaround_clang_bug.subtree_size;
|
||||
|
||||
if (!must_ignore_children) {
|
||||
// Construct grid items that are not subgridded.
|
||||
@@ -1540,8 +1543,10 @@ void NGGridLayoutAlgorithm::InitializeTr
|
||||
NGGridSizingTree* sizing_tree) const {
|
||||
DCHECK(sizing_tree && current_grid_index < sizing_tree->Size());
|
||||
|
||||
- auto& [grid_items, layout_data, subtree_size] =
|
||||
- sizing_tree->At(current_grid_index);
|
||||
+ auto& workaround_clang_bug = sizing_tree->At(current_grid_index);
|
||||
+ auto& grid_items = workaround_clang_bug.grid_items;
|
||||
+ auto& layout_data = workaround_clang_bug.layout_data;
|
||||
+ auto& subtree_size = workaround_clang_bug.subtree_size;
|
||||
|
||||
auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) {
|
||||
InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data);
|
||||
|
|
@ -0,0 +1,81 @@
|
|||
diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
|
||||
--- chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding 2023-05-11 03:36:27.000000000 +0200
|
||||
+++ chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-05-14 11:49:42.558129164 +0200
|
||||
@@ -238,7 +238,10 @@ const NGLayoutResult* NGGridLayoutAlgori
|
||||
: BuildGridSizingTree(&oof_children);
|
||||
|
||||
LayoutUnit intrinsic_block_size;
|
||||
- auto& [grid_items, layout_data, tree_size] = grid_sizing_tree.TreeRootData();
|
||||
+ auto& [g_i, l_d, t_s] = grid_sizing_tree.TreeRootData();
|
||||
+ auto& grid_items = g_i;
|
||||
+ auto& layout_data = l_d;
|
||||
+ auto& tree_size = t_s;
|
||||
|
||||
if (IsBreakInside(BreakToken())) {
|
||||
// TODO(layout-dev): When we support variable inline-size fragments we'll
|
||||
@@ -520,8 +523,10 @@ wtf_size_t NGGridLayoutAlgorithm::BuildG
|
||||
row_auto_repetitions);
|
||||
|
||||
bool has_nested_subgrid = false;
|
||||
- auto& [grid_items, layout_data, subtree_size] =
|
||||
- sizing_tree->CreateSizingData(opt_subgrid_data);
|
||||
+ auto& [g_i, l_d, s_s] = sizing_tree->CreateSizingData(opt_subgrid_data);
|
||||
+ auto& grid_items = g_i;
|
||||
+ auto& layout_data = l_d;
|
||||
+ auto& subtree_size = s_s;
|
||||
|
||||
if (!must_ignore_children) {
|
||||
// Construct grid items that are not subgridded.
|
||||
@@ -650,8 +655,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
|
||||
NGGridSizingTree sizing_tree;
|
||||
|
||||
if (const auto* layout_subtree = ConstraintSpace().GridLayoutSubtree()) {
|
||||
- auto& [grid_items, layout_data, subtree_size] =
|
||||
- sizing_tree.CreateSizingData();
|
||||
+ auto& [g_i, l_d, s_s] = sizing_tree.CreateSizingData();
|
||||
+ auto& grid_items = g_i;
|
||||
+ auto& layout_data = l_d;
|
||||
+ auto& subtree_size = s_s;
|
||||
|
||||
const auto& node = Node();
|
||||
grid_items =
|
||||
@@ -1640,8 +1647,10 @@ void NGGridLayoutAlgorithm::InitializeTr
|
||||
const absl::optional<GridTrackSizingDirection>& opt_track_direction) const {
|
||||
DCHECK(sizing_subtree);
|
||||
|
||||
- auto& [grid_items, layout_data, subtree_size] =
|
||||
- sizing_subtree.SubtreeRootData();
|
||||
+ auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
|
||||
+ auto& grid_items = g_i;
|
||||
+ auto& layout_data = l_d;
|
||||
+ auto& subtree_size = s_s;
|
||||
|
||||
auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) {
|
||||
InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data);
|
||||
@@ -1825,8 +1834,10 @@ void NGGridLayoutAlgorithm::CompleteTrac
|
||||
bool* opt_needs_additional_pass) const {
|
||||
DCHECK(sizing_subtree);
|
||||
|
||||
- auto& [grid_items, layout_data, subtree_size] =
|
||||
- sizing_subtree.SubtreeRootData();
|
||||
+ auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
|
||||
+ auto& grid_items = g_i;
|
||||
+ auto& layout_data = l_d;
|
||||
+ auto& subtree_size = s_s;
|
||||
|
||||
const bool is_for_columns = track_direction == kForColumns;
|
||||
const bool has_non_definite_track =
|
||||
diff -up chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc
|
||||
--- chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me 2023-05-14 17:35:00.446844465 +0200
|
||||
+++ chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc 2023-05-14 17:39:22.991733926 +0200
|
||||
@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui
|
||||
void CdmPromiseAdapter::Clear(ClearReason reason) {
|
||||
// Reject all outstanding promises.
|
||||
DCHECK(thread_checker_.CalledOnValidThread());
|
||||
- for (auto& [promise_id, promise] : promises_) {
|
||||
+ for (auto& [p_i, p_e] : promises_) {
|
||||
+ auto& promise_id = p_i;
|
||||
+ auto& promise = p_e;
|
||||
TRACE_EVENT_NESTABLE_ASYNC_END1(
|
||||
"media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
|
||||
"status", "cleared");
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
--- a/base/files/scoped_file_linux.cc.orig
|
||||
+++ b/base/files/scoped_file_linux.cc
|
||||
@@ -77,15 +77,3 @@
|
||||
}
|
||||
|
||||
} // namespace base
|
||||
-
|
||||
-extern "C" {
|
||||
-
|
||||
-int __close(int);
|
||||
-
|
||||
-__attribute__((visibility("default"), noinline)) int close(int fd) {
|
||||
- if (base::IsFDOwned(fd) && g_is_ownership_enforced)
|
||||
- CrashOnFdOwnershipViolation();
|
||||
- return __close(fd);
|
||||
-}
|
||||
-
|
||||
-} // extern "C"
|
||||
|
|
@ -1,12 +1,11 @@
|
|||
# Template file for 'chromium'
|
||||
pkgname=chromium
|
||||
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
|
||||
version=113.0.5672.92
|
||||
version=114.0.5735.106
|
||||
revision=1
|
||||
archs="i686* x86_64* aarch64* armv7l*"
|
||||
hostmakedepends="
|
||||
$(vopt_if clang "clang lld llvm15")
|
||||
$(vopt_if js_optimize openjdk)
|
||||
bison git gperf hwids ninja nodejs perl pkg-config python3
|
||||
libatomic-devel libepoxy-devel libevent-devel libglib-devel"
|
||||
makedepends="
|
||||
|
|
@ -17,8 +16,8 @@ makedepends="
|
|||
libexif-devel libflac-devel libgcrypt-devel libjpeg-turbo-devel libmtp-devel
|
||||
libpng-devel libva-devel libwebp-devel libxml2-devel libxshmfence-devel
|
||||
libxslt-devel woff2-devel minizip-devel mit-krb5-devel nss-devel opus-devel
|
||||
pciutils-devel re2-devel snappy-devel speech-dispatcher-devel speex-devel
|
||||
xcb-proto zlib-devel libaom-devel libffi-devel
|
||||
pciutils-devel snappy-devel speech-dispatcher-devel speex-devel
|
||||
xcb-proto zlib-devel libaom-devel libffi-devel libevdev-devel
|
||||
$(vopt_if pipewire pipewire-devel)
|
||||
$(vopt_if pulseaudio pulseaudio-devel)
|
||||
$(vopt_if sndio sndio-devel)"
|
||||
|
|
@ -28,15 +27,14 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
|
|||
license="BSD-3-Clause"
|
||||
homepage="https://www.chromium.org/"
|
||||
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
|
||||
checksum=a4520b53c824d75bcbc80bcf5da0c3d6f213038c8e31904b8a3bfbe415893ba5
|
||||
checksum=df18b0b28bf52b1c099acde54e568fbfa2c9225150108bce9d53d8b31f71304a
|
||||
|
||||
lib32disabled=yes
|
||||
|
||||
build_options="clang debug js_optimize vaapi pulseaudio sndio pipewire"
|
||||
build_options="clang debug vaapi pulseaudio sndio pipewire"
|
||||
build_options_default="clang vaapi pulseaudio pipewire"
|
||||
desc_option_clang="Use clang to build"
|
||||
desc_option_debug="Build with debug symbols"
|
||||
desc_option_js_optimize="Optimize the JS used for Chromium's UI"
|
||||
desc_option_pipewire="Enable support for screen sharing for WebRTC via PipeWire"
|
||||
|
||||
if [ "$XBPS_LIBC" = musl ]; then
|
||||
|
|
@ -52,8 +50,8 @@ if [ "$CROSS_BUILD" ]; then
|
|||
libjpeg-turbo-devel libXi-devel nss-devel libpng-devel libwebp-devel
|
||||
libxml2-devel $(vopt_if pulseaudio pulseaudio-devel) libxslt-devel libxkbcommon-devel
|
||||
$(vopt_if pipewire pipewire-devel) ffmpeg-devel opus-devel pango-devel libva-devel
|
||||
libcurl-devel snappy-devel re2-devel libXrandr-devel libXcomposite-devel cups-devel
|
||||
mit-krb5-devel alsa-lib-devel libXdamage-devel libepoxy-devel
|
||||
libcurl-devel snappy-devel libXrandr-devel libXcomposite-devel cups-devel
|
||||
mit-krb5-devel alsa-lib-devel libXdamage-devel libepoxy-devel libevdev-devel
|
||||
libavif-devel libaom-devel jsoncpp-devel woff2-devel libdav1d-devel libflac-devel"
|
||||
fi
|
||||
|
||||
|
|
@ -158,7 +156,6 @@ do_configure() {
|
|||
libxml
|
||||
libxslt
|
||||
opus
|
||||
re2
|
||||
snappy
|
||||
"
|
||||
|
||||
|
|
@ -219,9 +216,6 @@ do_configure() {
|
|||
# deprecated
|
||||
'use_gnome_keyring=false'
|
||||
|
||||
# https://chromium.googlesource.com/chromium/src/+/master/docs/closure_compilation.md
|
||||
"enable_js_type_check=$(vopt_if js_optimize true false)"
|
||||
|
||||
"use_pulseaudio=$(vopt_if pulseaudio true false)"
|
||||
"link_pulseaudio=$(vopt_if pulseaudio true false)"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue