extra/chromium to 118.0.5993.54-1

This commit is contained in:
Kevin Mihelich 2023-10-07 03:03:55 +00:00
parent df352aec44
commit 43e1dd0d64
8 changed files with 30 additions and 152 deletions

View file

@ -1,7 +1,7 @@
pkgbase = chromium
pkgdesc = A web browser built for speed, simplicity, and security
pkgver = 117.0.5938.149
pkgrel = 2
pkgver = 118.0.5993.54
pkgrel = 1
url = https://www.chromium.org/Home
arch = x86_64
license = BSD
@ -57,23 +57,17 @@ pkgbase = chromium
optdepends = org.freedesktop.secrets: password storage backend on GNOME / Xfce
optdepends = kwallet: support for storing passwords in KWallet on Plasma
options = !lto
source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-117.0.5938.149.tar.xz
source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-118.0.5993.54.tar.xz
source = https://github.com/foutrelis/chromium-launcher/archive/v8/chromium-launcher-8.tar.gz
source = https://github.com/stha09/chromium-patches/releases/download/chromium-116-patchset-2/chromium-116-patchset-2.tar.xz
source = add-memory-for-std-unique_ptr-in-third_party-ip.patch
source = roll-src-third_party-libavif-src-b33d9ebfc.676aded35.patch
source = https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/118/chromium-patches-118.tar.bz2
source = free-the-X11-pixmap-in-the-NativePixmapEGLX11Bind.patch
source = REVERT-disable-autoupgrading-debug-info.patch
source = material-color-utilities-cmath.patch
source = use-oauth2-client-switches-as-default.patch
sha256sums = ddd7c852bd191c0917ab800655da341e7583c2377ca220ae077fc5de7fc7d9df
sha256sums = 856880ad99428fa5eba6a6b53384f3795e9cb65042cae8835a69ef537c44b99e
sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
sha256sums = 25ad7c1a5e0b7332f80ed15ccf07d7e871d8ffb4af64df7c8fef325a527859b0
sha256sums = 7b9708f0dbfd697be7043d3cfe52da991185aa0ee29a3b8263506cd3ae4d41a9
sha256sums = 30841fbe0785f8df584eeaa86584fe75f89da26e71df80cf536887557ddef0b6
sha256sums = 0d1eb054965711a2d4ed6b4cb7f06cbda5b374a48e1b99c8c38ebf6375a781a9
sha256sums = ab1eb107ec1c915065dc59cf4832da27e17d60eb29038e2aec633daeb946cc6a
sha256sums = 1b782b0f6d4f645e4e0daa8a4852d63f0c972aa0473319216ff04613a0592a69
sha256sums = 55e6097d347be40cffebf3ce13ba84ea92d940f60865f1bd7c9af1ef2a2ef8e1
sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711
pkgname = chromium

View file

@ -1,4 +1,4 @@
From b988d0c4ac932731db95cc825aa5f96240a2b0f1 Mon Sep 17 00:00:00 2001
From a867bd7bd3821d32f83609246092a0d9fc48b338 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 60e433700a804..61d2495c75f65 100644
index 28baebbacfd4e..423148280900f 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 60e433700a804..61d2495c75f65 100644
(target_os == "win" &&
(target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64"))
--
2.40.0
2.42.0

View file

@ -1,4 +1,4 @@
From 89074da50d9f8334ab9bb250e68b0eeed4387791 Mon Sep 17 00:00:00 2001
From b185386207fa6001837af2d342543d705836b185 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 01d5bdc58ddc5..559186c9985cc 100644
index 98ab27b33cd85..ec507e1f25206 100644
--- a/third_party/blink/renderer/bindings/BUILD.gn
+++ b/third_party/blink/renderer/bindings/BUILD.gn
@@ -149,6 +149,7 @@ template("generate_bindings") {
@@ -148,6 +148,7 @@ template("generate_bindings") {
outputs = invoker.outputs
args = [
@ -21,5 +21,5 @@ index 01d5bdc58ddc5..559186c9985cc 100644
rebase_path(web_idl_database, root_build_dir),
"--root_src_dir",
--
2.40.0
2.42.0

View file

@ -1,4 +1,4 @@
From 31c350003dd150bed9dd897389a885dd6b7145cf Mon Sep 17 00:00:00 2001
From 0d24694def8957359588abd68422697a79b11f81 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.40.0
2.42.0

View file

@ -15,10 +15,9 @@
highmem=1
pkgname=chromium
pkgver=117.0.5938.149
pkgrel=2
pkgver=118.0.5993.54
pkgrel=1
_launcher_ver=8
_gcc_patchset=116-patchset-2
_manual_clone=0
pkgdesc="A web browser built for speed, simplicity, and security"
arch=('x86_64')
@ -37,28 +36,22 @@ 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
https://github.com/stha09/chromium-patches/releases/download/chromium-$_gcc_patchset/chromium-$_gcc_patchset.tar.xz
add-memory-for-std-unique_ptr-in-third_party-ip.patch
roll-src-third_party-libavif-src-b33d9ebfc.676aded35.patch
https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${pkgver%%.*}/chromium-patches-${pkgver%%.*}.tar.bz2
free-the-X11-pixmap-in-the-NativePixmapEGLX11Bind.patch
REVERT-disable-autoupgrading-debug-info.patch
material-color-utilities-cmath.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=('ddd7c852bd191c0917ab800655da341e7583c2377ca220ae077fc5de7fc7d9df'
sha256sums=('856880ad99428fa5eba6a6b53384f3795e9cb65042cae8835a69ef537c44b99e'
'213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
'25ad7c1a5e0b7332f80ed15ccf07d7e871d8ffb4af64df7c8fef325a527859b0'
'7b9708f0dbfd697be7043d3cfe52da991185aa0ee29a3b8263506cd3ae4d41a9'
'30841fbe0785f8df584eeaa86584fe75f89da26e71df80cf536887557ddef0b6'
'0d1eb054965711a2d4ed6b4cb7f06cbda5b374a48e1b99c8c38ebf6375a781a9'
'ab1eb107ec1c915065dc59cf4832da27e17d60eb29038e2aec633daeb946cc6a'
'1b782b0f6d4f645e4e0daa8a4852d63f0c972aa0473319216ff04613a0592a69'
'55e6097d347be40cffebf3ce13ba84ea92d940f60865f1bd7c9af1ef2a2ef8e1'
'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711'
'2fd6bc8aa729a0c156a397fefc4b11408824e6291470b77c44c21b2f926182f7'
'7cc7bb03f74ef28c9bba4047df85fa72965a6b2e394be3455503c034896b0cf5'
'92d40f87244f96808976d601af4a141e864e6c3d719b34815c0fecdda1512f57')
'b5bb3d0e2cd06aa92bb0ea62d6915dac1635cee79e9e1405cf17fe471baa393e'
'01c8742f987e158245959561db7f7529254a81491954174be2ef8a4f226cbf42'
'4b543a4f12b8f00765d3a2812c5452a60c5c07babc00fe2036edd6467462ecfe')
if (( _manual_clone )); then
source[0]=fetch-chromium-release
@ -142,20 +135,19 @@ prepare() {
patch -Np1 -i ../use-oauth2-client-switches-as-default.patch
# Upstream fixes
patch -Np1 -i ../add-memory-for-std-unique_ptr-in-third_party-ip.patch
patch -Np1 -i ../roll-src-third_party-libavif-src-b33d9ebfc.676aded35.patch
patch -Np1 -i ../free-the-X11-pixmap-in-the-NativePixmapEGLX11Bind.patch
# Revert addition of compiler flag that needs newer clang
patch -Rp1 -i ../REVERT-disable-autoupgrading-debug-info.patch
# Build fixes
patch -Np0 -i ../material-color-utilities-cmath.patch
# Fixes for building with libstdc++ instead of libc++
patch -Np1 -i ../patches/chromium-114-maldoca-include.patch
patch -Np1 -i ../patches/chromium-114-ruy-include.patch
patch -Np1 -i ../patches/chromium-114-vk_mem_alloc-include.patch
patch -Np1 -i ../chromium-patches-*/chromium-114-maldoca-include.patch
patch -Np1 -i ../chromium-patches-*/chromium-114-ruy-include.patch
patch -Np1 -i ../chromium-patches-*/chromium-114-vk_mem_alloc-include.patch
patch -Np1 -i ../chromium-patches-*/chromium-117-material-color-include.patch
patch -Np1 -i ../chromium-patches-*/chromium-118-SensorReadingField-include.patch
patch -Np1 -i ../chromium-patches-*/chromium-118-LightweightDetector-include.patch
patch -Np1 -i ../chromium-patches-*/chromium-118-system-freetype.patch
# Link to system tools required by the build
mkdir -p third_party/node/linux/node-linux-x64/bin

View file

@ -1,27 +0,0 @@
From 5a8dfcaf84b5af5aeb738702651e98bfc43d6d45 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <stha09@googlemail.com>
Date: Wed, 9 Aug 2023 15:36:26 +0000
Subject: [PATCH] IWYU: add memory for std::unique_ptr in //third_party/ipcz
Bug: 957519
Change-Id: I600f415a59206da283046b638a4f68eda0892ac7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4754274
Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1181503}
---
third_party/ipcz/src/ipcz/router_link.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/third_party/ipcz/src/ipcz/router_link.h b/third_party/ipcz/src/ipcz/router_link.h
index 09bc5626d99..619638cc7f1 100644
--- a/third_party/ipcz/src/ipcz/router_link.h
+++ b/third_party/ipcz/src/ipcz/router_link.h
@@ -7,6 +7,7 @@
#include <cstddef>
#include <functional>
+#include <memory>
#include <string>
#include <utility>

View file

@ -1,11 +0,0 @@
--- third_party/material_color_utilities/src/cpp/palettes/tones.cc.orig 2023-08-30 22:58:42.101555407 +0000
+++ third_party/material_color_utilities/src/cpp/palettes/tones.cc 2023-08-30 22:58:54.082340977 +0000
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#include <cmath>
+
#include "cpp/palettes/tones.h"
#include "cpp/cam/cam.h"

View file

@ -1,70 +0,0 @@
From 21d7cf44b1cd83bb0d847515e28ca550404b0033 Mon Sep 17 00:00:00 2001
From: Wan-Teh Chang <wtc@google.com>
Date: Tue, 22 Aug 2023 19:39:04 +0000
Subject: [PATCH] Roll src/third_party/libavif/src/ b33d9ebfc..676aded35 (3
commits)
https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git/+log/b33d9ebfc961..676aded3501f
$ git log b33d9ebfc..676aded35 --date=short --no-merges --format='%ad %ae %s'
2023-08-22 wtc Change imir.mode back to imir.axis
2023-08-22 wtc Don't use Identity matrix coefficients with 4:0:0
2023-08-21 yguyon Increase test values in avifstreamtest
Created with:
roll-dep src/third_party/libavif/src
R=dalecurtis@chromium.org,jzern@google.com
Note that imir.mode is renamed imir.axis.
Change-Id: Ie13972640969f123b7e4580f36d6d6bab913c0f8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4803347
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Commit-Queue: Wan-Teh Chang <wtc@google.com>
Cr-Commit-Position: refs/heads/main@{#1186746}
---
.../image-decoders/avif/avif_image_decoder.cc | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/third_party/blink/renderer/platform/image-decoders/avif/avif_image_decoder.cc b/third_party/blink/renderer/platform/image-decoders/avif/avif_image_decoder.cc
index deb3e66d66f..c9f1b185417 100644
--- a/third_party/blink/renderer/platform/image-decoders/avif/avif_image_decoder.cc
+++ b/third_party/blink/renderer/platform/image-decoders/avif/avif_image_decoder.cc
@@ -1005,22 +1005,22 @@ bool AVIFImageDecoder::UpdateDemuxer() {
angle = container->irot.angle;
CHECK_LT(angle, 4);
}
- // |mode| specifies how the mirroring is performed.
+ // |axis| specifies how the mirroring is performed.
// -1: No mirroring.
// 0: The top and bottom parts of the image are exchanged.
// 1: The left and right parts of the image are exchanged.
- int mode = -1;
+ int axis = -1;
if (container->transformFlags & AVIF_TRANSFORM_IMIR) {
- mode = container->imir.mode;
- CHECK_LT(mode, 2);
+ axis = container->imir.axis;
+ CHECK_LT(axis, 2);
}
// MIAF Section 7.3.6.7 (Clean aperture, rotation and mirror) says:
// These properties, if used, shall be indicated to be applied in the
// following order: clean aperture first, then rotation, then mirror.
//
- // In the kModeAngleToOrientation array, the first dimension is mode (with an
+ // In the kAxisAngleToOrientation array, the first dimension is axis (with an
// offset of 1). The second dimension is angle.
- constexpr ImageOrientationEnum kModeAngleToOrientation[3][4] = {
+ constexpr ImageOrientationEnum kAxisAngleToOrientation[3][4] = {
// No mirroring.
{ImageOrientationEnum::kOriginTopLeft,
ImageOrientationEnum::kOriginLeftBottom,
@@ -1037,7 +1037,7 @@ bool AVIFImageDecoder::UpdateDemuxer() {
ImageOrientationEnum::kOriginBottomLeft,
ImageOrientationEnum::kOriginLeftTop},
};
- orientation_ = kModeAngleToOrientation[mode + 1][angle];
+ orientation_ = kAxisAngleToOrientation[axis + 1][angle];
// Determine whether the image can be decoded to YUV.
// * Alpha channel is not supported.