mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-18 22:54:00 +00:00
extra/chromium to 113.0.5672.63-1
This commit is contained in:
Kevin Mihelich
parent
38eeb3d2af
commit
32023e659c
8 changed files with 106 additions and 67 deletions
|
|
@ -1,4 +1,4 @@
|
|||
From b412032d8f94674c59056d69087f28ad7e597a22 Mon Sep 17 00:00:00 2001
|
||||
From 22cb54262f596d6ebb601562f5d1dafdc6dbd8a3 Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||
Date: Thu, 18 Feb 2021 19:35:58 -0700
|
||||
Subject: [PATCH 1/3] widevine support for arm
|
||||
|
|
@ -8,7 +8,7 @@ Subject: [PATCH 1/3] widevine support for arm
|
|||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/third_party/widevine/cdm/widevine.gni b/third_party/widevine/cdm/widevine.gni
|
||||
index 45e984205885f..3cf8c290728fd 100644
|
||||
index 60e433700a804..61d2495c75f65 100644
|
||||
--- a/third_party/widevine/cdm/widevine.gni
|
||||
+++ b/third_party/widevine/cdm/widevine.gni
|
||||
@@ -26,7 +26,7 @@ if (is_chromeos && !is_chromeos_device) {
|
||||
|
|
@ -21,5 +21,5 @@ index 45e984205885f..3cf8c290728fd 100644
|
|||
(target_os == "win" &&
|
||||
(target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64"))
|
||||
--
|
||||
2.39.1
|
||||
2.40.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 2f0db65730ea473ca9d0797c912d713a1240e1d8 Mon Sep 17 00:00:00 2001
|
||||
From bd106c1a222e15c2822248d05833631c95849b88 Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||
Date: Tue, 2 Feb 2021 13:58:59 -0700
|
||||
Subject: [PATCH 2/3] Run blink bindings generation single threaded
|
||||
|
|
@ -9,10 +9,10 @@ When not single threaded this process will eat all the RAM.
|
|||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/third_party/blink/renderer/bindings/BUILD.gn b/third_party/blink/renderer/bindings/BUILD.gn
|
||||
index 488b2ddf8462d..4d3b9f7f54373 100644
|
||||
index f2995b404fd5f..a5748062c1f70 100644
|
||||
--- a/third_party/blink/renderer/bindings/BUILD.gn
|
||||
+++ b/third_party/blink/renderer/bindings/BUILD.gn
|
||||
@@ -148,6 +148,7 @@ template("generate_bindings") {
|
||||
@@ -149,6 +149,7 @@ template("generate_bindings") {
|
||||
outputs = invoker.outputs
|
||||
|
||||
args = [
|
||||
|
|
@ -21,5 +21,5 @@ index 488b2ddf8462d..4d3b9f7f54373 100644
|
|||
rebase_path(web_idl_database, root_build_dir),
|
||||
"--root_src_dir",
|
||||
--
|
||||
2.39.1
|
||||
2.40.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From fcadf57766b1d75ef9e0ed0a6e255ebd9c097dc6 Mon Sep 17 00:00:00 2001
|
||||
From 17c6f5d2491f7b0b01cc5301b95482f7e154734c Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||
Date: Wed, 21 Jul 2021 21:37:31 -0600
|
||||
Subject: [PATCH 3/3] Fix eu-strip build for newer GCC
|
||||
|
|
@ -693,5 +693,5 @@ index 86f2b67f6bbd1..c073e9a15827a 100755
|
|||
cd build
|
||||
../configure --enable-maintainer-mode
|
||||
--
|
||||
2.39.1
|
||||
2.40.0
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
highmem=1
|
||||
|
||||
pkgname=chromium
|
||||
pkgver=112.0.5615.165
|
||||
pkgver=113.0.5672.63
|
||||
pkgrel=1
|
||||
_launcher_ver=8
|
||||
_manual_clone=0
|
||||
|
|
@ -36,20 +36,24 @@ optdepends=('pipewire: WebRTC desktop sharing under Wayland'
|
|||
options=('!lto') # Chromium adds its own flags for ThinLTO
|
||||
source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz
|
||||
https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver/chromium-launcher-$_launcher_ver.tar.gz
|
||||
sql-relax-constraints-on-VirtualCursor-layout.patch
|
||||
add-cstring-for-std-strlen-in-web_view_impl.cc.patch
|
||||
download-bubble-typename.patch
|
||||
webauthn-variant.patch
|
||||
disable-GlobalMediaControlsCastStartStop.patch
|
||||
use-oauth2-client-switches-as-default.patch
|
||||
0001-widevine-support-for-arm.patch
|
||||
0002-Run-blink-bindings-generation-single-threaded.patch
|
||||
0003-Fix-eu-strip-build-for-newer-GCC.patch)
|
||||
sha256sums=('168c62fea9f428f99fbf967f36a75ee5da160429e3a5b86bf02188c5fe7c79fd'
|
||||
sha256sums=('76cec11dc13abe6703305b0300e1fe24c8f547c1ff313f7be09db0e23d12ee1e'
|
||||
'213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
|
||||
'e66be069d932fe18811e789c57b96249b7250257ff91a3d82d15e2a7283891b7'
|
||||
'5f868cba9e4d387499711738adc6fd87ab9f1ef61f464016bc682660ae59206a'
|
||||
'd464eed4be4e9bf6187b4c40a759c523b7befefa25ba34ad6401b2a07649ca2a'
|
||||
'590fabbb26270947cb477378b53a9dcd17855739076b4af9983e1e54dfcab6d7'
|
||||
'7f3b1b22d6a271431c1f9fc92b6eb49c6d80b8b3f868bdee07a6a1a16630a302'
|
||||
'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711'
|
||||
'12cf566d11e2388fc2b1d629ac71aa2fd80d2dd133001d6612a1e325aea6bbb8'
|
||||
'a832a0cafb5ca2c5aa6dbf55c05f3aae2680cbf5418e5816cab5498ed9e3ae30'
|
||||
'c5377b9bb75b9de90893042825239545d8d871ee8699d81e9ec95fdff62b4bf1')
|
||||
'50fe9b0acf2cc2febed740fcc7ace2ee3be4db9d43bbae9feb21596c2360815b'
|
||||
'b0427db49cee8d4a165b1bbb11eb922af597cd27147babecbdee19881328f7fe'
|
||||
'5ff58b34eca7b5e22319c619aaad10907a34d7da73efd12fa4b417fd34542ede')
|
||||
|
||||
if (( _manual_clone )); then
|
||||
source[0]=fetch-chromium-release
|
||||
|
|
@ -68,7 +72,7 @@ declare -gA _system_libs=(
|
|||
[harfbuzz-ng]=harfbuzz
|
||||
[icu]=icu
|
||||
[jsoncpp]=jsoncpp
|
||||
[libaom]=aom
|
||||
#[libaom]=aom # https://aomedia.googlesource.com/aom/+/706ee36dcc82
|
||||
#[libavif]=libavif # https://github.com/AOMediaCodec/libavif/commit/4d2776a3
|
||||
[libdrm]=
|
||||
[libjpeg]=libjpeg
|
||||
|
|
@ -81,7 +85,7 @@ declare -gA _system_libs=(
|
|||
[re2]=re2
|
||||
[snappy]=snappy
|
||||
[woff2]=woff2
|
||||
[zlib]=minizip
|
||||
#[zlib]=minizip # broken include from chrome/common/safe_browsing/zip_analyzer.h
|
||||
)
|
||||
_unwanted_bundled_libs=(
|
||||
$(printf "%s\n" ${!_system_libs[@]} | sed 's/^libjpeg$/&_turbo/')
|
||||
|
|
@ -133,12 +137,16 @@ prepare() {
|
|||
patch -Np1 -i ../use-oauth2-client-switches-as-default.patch
|
||||
|
||||
# Upstream fixes
|
||||
patch -Np1 -i ../sql-relax-constraints-on-VirtualCursor-layout.patch
|
||||
patch -Np1 -i ../add-cstring-for-std-strlen-in-web_view_impl.cc.patch
|
||||
|
||||
# Disable kGlobalMediaControlsCastStartStop by default
|
||||
# https://crbug.com/1314342
|
||||
patch -Np1 -i ../disable-GlobalMediaControlsCastStartStop.patch
|
||||
|
||||
# Build fixes
|
||||
patch -Np1 -i ../download-bubble-typename.patch
|
||||
patch -Np1 -i ../webauthn-variant.patch
|
||||
|
||||
# Link to system tools required by the build
|
||||
mkdir -p third_party/node/linux/node-linux-x64/bin
|
||||
ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
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>
|
||||
40
extra/chromium/download-bubble-typename.patch
Normal file
40
extra/chromium/download-bubble-typename.patch
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
diff --git a/chrome/browser/download/bubble/download_bubble_update_service.cc b/chrome/browser/download/bubble/download_bubble_update_service.cc
|
||||
index 13460309d0e..a18d2f8a272 100644
|
||||
--- a/chrome/browser/download/bubble/download_bubble_update_service.cc
|
||||
+++ b/chrome/browser/download/bubble/download_bubble_update_service.cc
|
||||
@@ -87,7 +87,7 @@ ItemSortKey GetSortKey(const Item& item) {
|
||||
// Helper to get an iterator to the last element in the cache. The cache
|
||||
// must not be empty.
|
||||
template <typename Item>
|
||||
-SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) {
|
||||
+typename SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) {
|
||||
CHECK(!cache.empty());
|
||||
auto it = cache.end();
|
||||
return std::prev(it);
|
||||
@@ -656,9 +656,9 @@ bool DownloadBubbleUpdateService::RemoveItemFromCacheImpl(
|
||||
}
|
||||
|
||||
template <typename Id, typename Item>
|
||||
-SortedItems<Item>::iterator
|
||||
+typename SortedItems<Item>::iterator
|
||||
DownloadBubbleUpdateService::RemoveItemFromCacheByIter(
|
||||
- SortedItems<Item>::iterator iter,
|
||||
+ typename SortedItems<Item>::iterator iter,
|
||||
SortedItems<Item>& cache,
|
||||
IterMap<Id, Item>& iter_map) {
|
||||
CHECK(iter != cache.end());
|
||||
diff --git a/chrome/browser/download/bubble/download_bubble_update_service.h b/chrome/browser/download/bubble/download_bubble_update_service.h
|
||||
index 4c3c0bc1193..38048873aa9 100644
|
||||
--- a/chrome/browser/download/bubble/download_bubble_update_service.h
|
||||
+++ b/chrome/browser/download/bubble/download_bubble_update_service.h
|
||||
@@ -179,8 +179,8 @@ class DownloadBubbleUpdateService
|
||||
|
||||
// Removes item if we already have the iterator to it. Returns next iterator.
|
||||
template <typename Id, typename Item>
|
||||
- SortedItems<Item>::iterator RemoveItemFromCacheByIter(
|
||||
- SortedItems<Item>::iterator iter,
|
||||
+ typename SortedItems<Item>::iterator RemoveItemFromCacheByIter(
|
||||
+ typename SortedItems<Item>::iterator iter,
|
||||
SortedItems<Item>& cache,
|
||||
IterMap<Id, Item>& iter_map);
|
||||
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
From 7d1394bd639e3bcf68082ac3fc33eeed6a00d2e6 Mon Sep 17 00:00:00 2001
|
||||
From: Elly Fong-Jones <ellyjones@chromium.org>
|
||||
Date: Thu, 2 Mar 2023 00:15:11 +0000
|
||||
Subject: [PATCH] sql: relax constraints on VirtualCursor layout
|
||||
|
||||
VirtualCursor::FromSqliteCursor required that VirtualCursor had a
|
||||
standard layout, but in fact VirtualCursor shouldn't have a standard
|
||||
layout, and the fact that it does with libc++ is a deviation from the
|
||||
C++ standard. This change:
|
||||
|
||||
1. Relaxes the requirement that VirtualCursor has a standard layout, and
|
||||
2. Relaxes the requirement that the sqlite_cursor_ field has to be at
|
||||
offset 0
|
||||
|
||||
by use of offsetof() and pointer subtraction. This change both improves
|
||||
standards compliance and makes this code build with libstdc++.
|
||||
|
||||
Bug: 1380656
|
||||
Change-Id: I9c47abd9197b187da0360ca5619ccf7dadab4f33
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4292313
|
||||
Reviewed-by: Austin Sullivan <asully@chromium.org>
|
||||
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#1111925}
|
||||
---
|
||||
sql/recover_module/cursor.h | 10 ++++------
|
||||
1 file changed, 4 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/sql/recover_module/cursor.h b/sql/recover_module/cursor.h
|
||||
index 1970bdca8c6..4cb06557009 100644
|
||||
--- a/sql/recover_module/cursor.h
|
||||
+++ b/sql/recover_module/cursor.h
|
||||
@@ -63,12 +63,10 @@ class VirtualCursor {
|
||||
// |sqlite_cursor| must have been returned by VirtualTable::SqliteCursor().
|
||||
static inline VirtualCursor* FromSqliteCursor(
|
||||
sqlite3_vtab_cursor* sqlite_cursor) {
|
||||
- static_assert(std::is_standard_layout<VirtualCursor>::value,
|
||||
- "needed for the reinterpret_cast below");
|
||||
- static_assert(offsetof(VirtualCursor, sqlite_cursor_) == 0,
|
||||
- "sqlite_cursor_ must be the first member of the class");
|
||||
- VirtualCursor* result = reinterpret_cast<VirtualCursor*>(sqlite_cursor);
|
||||
- DCHECK_EQ(sqlite_cursor, &result->sqlite_cursor_);
|
||||
+ VirtualCursor* result = reinterpret_cast<VirtualCursor*>(
|
||||
+ (reinterpret_cast<char*>(sqlite_cursor) -
|
||||
+ offsetof(VirtualCursor, sqlite_cursor_)));
|
||||
+ CHECK_EQ(sqlite_cursor, &result->sqlite_cursor_);
|
||||
return result;
|
||||
}
|
||||
|
||||
12
extra/chromium/webauthn-variant.patch
Normal file
12
extra/chromium/webauthn-variant.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/chrome/browser/webauthn/authenticator_request_dialog_model.h b/chrome/browser/webauthn/authenticator_request_dialog_model.h
|
||||
index f4992a74bd6..45cabe39974 100644
|
||||
--- a/chrome/browser/webauthn/authenticator_request_dialog_model.h
|
||||
+++ b/chrome/browser/webauthn/authenticator_request_dialog_model.h
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
+#include <variant>
|
||||
#include <vector>
|
||||
|
||||
#include "base/containers/span.h"
|
||||
Loading…
Reference in a new issue