extra/chromium to 132.0.6834.83-1

This commit is contained in:
Kevin Mihelich 2025-01-12 22:08:33 +00:00
parent cb4b717be3
commit c3bfa5dafc
8 changed files with 15 additions and 126 deletions

View file

@ -1,6 +1,6 @@
pkgbase = chromium
pkgdesc = A web browser built for speed, simplicity, and security
pkgver = 131.0.6778.264
pkgver = 132.0.6834.83
pkgrel = 1
url = https://www.chromium.org/Home
arch = x86_64
@ -55,19 +55,13 @@ pkgbase = chromium
optdepends = kwallet: support for storing passwords in KWallet on Plasma
optdepends = upower: Battery Status API support
options = !lto
source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-131.0.6778.264.tar.xz
source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-132.0.6834.83.tar.xz
source = https://github.com/foutrelis/chromium-launcher/archive/v8/chromium-launcher-8.tar.gz
source = unbundle-add-enable_freetype.patch
source = unbundle-icu-target.patch
source = const-atomicstring-conversion.patch
source = compiler-rt-adjust-paths.patch
source = increase-fortify-level.patch
source = use-oauth2-client-switches-as-default.patch
sha256sums = 7e02c65865a3095180d60838d2d7a912873d8d4f582c27c2afb9ef876152f2a5
sha256sums = f98315eacbf3be106feca37f8243d8c4092d4fd832c918aa36dc229eb6ab39e0
sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
sha256sums = f6e05adc80bd2f22b766d41a91739276c62201e47272c561f18a099c4a809e37
sha256sums = 67de7744b92cbfa6fcbf43a71ba531eb5a7b00381d96703d8dc3dfdadaebf67d
sha256sums = ac0c9e366ca6afe0839f9ecb6bc42614747349da0c3dc46408e5053dcb7ada76
sha256sums = b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961
sha256sums = d634d2ce1fc63da7ac41f432b1e84c59b7cceabf19d510848a7cff40c8025342
sha256sums = 6de648d449159dd579e42db304aca0a36243f2ac1538f8d030473afbbc8ff475

View file

@ -1,4 +1,4 @@
From 51bf74f717d74ab647b674a1a48595a122d4d787 Mon Sep 17 00:00:00 2001
From 4dc7f49d1b05440dba29739c8d7f3b44da9fb2fd 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
@ -21,5 +21,5 @@ index 8b97b7a57419e..7b96b49df1f8d 100644
(target_os == "win" &&
(target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64"))
--
2.45.2
2.47.1

View file

@ -1,4 +1,4 @@
From 9caf7e9ecac8b8a457e81c4f51e2abe5fb0b3e70 Mon Sep 17 00:00:00 2001
From 8bd48c2ec476423e3b9f80ffd38441f98fc9e66d 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
@ -21,5 +21,5 @@ index 732e344bb97b2..cce7bb433156f 100644
rebase_path(web_idl_database, root_build_dir),
"--root_src_dir",
--
2.45.2
2.47.1

View file

@ -1,4 +1,4 @@
From 3249e23ea9e28f674892a2b8b4e64dcb568e996a Mon Sep 17 00:00:00 2001
From 9887ba2a4b05c2feda52ec6cfe742aa3a1e84da7 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.45.2
2.47.1

View file

@ -15,7 +15,7 @@
highmem=1
pkgname=chromium
pkgver=131.0.6778.264
pkgver=132.0.6834.83
pkgrel=1
_launcher_ver=8
_manual_clone=0
@ -39,26 +39,20 @@ 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
unbundle-add-enable_freetype.patch
unbundle-icu-target.patch
const-atomicstring-conversion.patch
compiler-rt-adjust-paths.patch
increase-fortify-level.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=('7e02c65865a3095180d60838d2d7a912873d8d4f582c27c2afb9ef876152f2a5'
sha256sums=('f98315eacbf3be106feca37f8243d8c4092d4fd832c918aa36dc229eb6ab39e0'
'213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
'f6e05adc80bd2f22b766d41a91739276c62201e47272c561f18a099c4a809e37'
'67de7744b92cbfa6fcbf43a71ba531eb5a7b00381d96703d8dc3dfdadaebf67d'
'ac0c9e366ca6afe0839f9ecb6bc42614747349da0c3dc46408e5053dcb7ada76'
'b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961'
'd634d2ce1fc63da7ac41f432b1e84c59b7cceabf19d510848a7cff40c8025342'
'6de648d449159dd579e42db304aca0a36243f2ac1538f8d030473afbbc8ff475'
'4246da8a2d0bd689b6c8a6ce3042e72ec72497ea64ad47ceb92334afa34a27f1'
'123dbf9cc82085242ee4a9bdaf6354257ea8eba993fb45fcb7f407a176c29abd'
'13e866a9f22a90fde979cc11b15b45fca7f00c78ebb55b41610415c24790bc85')
'5a45799258abde6836bef7209c10935ccf4c09bdd487a008b4d37a96f9b7af58'
'1721a7355822fa045698f613a9cda28f42cad58bfe2074e7044691f0b518c5a6'
'835ff938f21633abf7d5ec43be09014c8be060a919c8651dadbb2015dfef8216')
if (( _manual_clone )); then
source[0]=fetch-chromium-release
@ -79,7 +73,6 @@ declare -gA _system_libs=(
#[jsoncpp]=jsoncpp # needs libstdc++
#[libaom]=aom
#[libavif]=libavif # needs -DAVIF_ENABLE_EXPERIMENTAL_GAIN_MAP=ON
[libdrm]=
[libjpeg]=libjpeg-turbo
[libpng]=libpng
#[libvpx]=libvpx
@ -144,11 +137,6 @@ prepare() {
patch -Np1 -i ../use-oauth2-client-switches-as-default.patch
# Upstream fixes
patch -Np1 -i ../unbundle-add-enable_freetype.patch
# Fixes from Gentoo
patch -Np1 -i ../unbundle-icu-target.patch
patch -Np1 -i ../const-atomicstring-conversion.patch
# Allow libclang_rt.builtins from compiler-rt >= 16 to be used
patch -Np1 -i ../compiler-rt-adjust-paths.patch
@ -163,11 +151,6 @@ prepare() {
ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
ln -s /usr/bin/java third_party/jdk/current/bin/
# test deps are broken for ui/lens with system ICU
# "//third_party/icu:icuuc_public" (taken from Gentoo ebuild)
sed -i '/source_set("unit_tests") {/,/}/d' chrome/browser/ui/lens/BUILD.gn
sed -i '/lens:unit_tests/d' chrome/test/BUILD.gn components/BUILD.gn
if (( !_system_clang )); then
# Use prebuilt rust as system rust cannot be used due to the error:
# error: the option `Z` is only accepted on the nightly compiler
@ -256,7 +239,7 @@ build() {
'clang_base_path="/usr"'
'clang_use_chrome_plugins=false'
"clang_version=\"$_clang_version\""
'chrome_pgo_phase=0' # needs newer clang to read the bundled PGO profile
#'chrome_pgo_phase=0' # needs newer clang to read the bundled PGO profile
)
# Allow the use of nightly features with stable Rust compiler

View file

@ -1,35 +0,0 @@
From 403ee5b14df12c8ee3b3583177bbd30d930e9aaf Mon Sep 17 00:00:00 2001
From: Matt Jolly <kangie@gentoo.org>
Date: Sat, 12 Oct 2024 13:45:37 +1000
Subject: [PATCH] Convert 'Const AtomicString' to 'const char *'.
I don't know why this is suddenly required?
--- a/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
+++ b/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
@@ -323,7 +323,10 @@ void TextCodecICU::CreateICUConverter() const {
DCHECK(!converter_icu_);
#if defined(USING_SYSTEM_ICU)
- const char* name = encoding_.GetName();
+ //convert to WTF::String to use existing `const char *` dependent functions
+ WTF::String nameString = encoding_.GetName();
+ std::string nameUtf8 = nameString.Utf8();
+ const char* name = nameUtf8.c_str();
needs_gbk_fallbacks_ =
name[0] == 'G' && name[1] == 'B' && name[2] == 'K' && !name[3];
#endif
@@ -448,7 +451,10 @@ String TextCodecICU::Decode(base::span<const uint8_t> data,
// <http://bugs.webkit.org/show_bug.cgi?id=17014>
// Simplified Chinese pages use the code A3A0 to mean "full-width space", but
// ICU decodes it as U+E5E5.
- if (!strcmp(encoding_.GetName(), "GBK")) {
+ // Convert AtomicString to String
+ WTF::String nameString = encoding_.GetName();
+ std::string nameUtf8 = nameString.Utf8();
+ if (!strcmp(nameUtf8.c_str(), "GBK")) {
if (EqualIgnoringASCIICase(encoding_.GetName(), "gb18030"))
resultString.Replace(0xE5E5, kIdeographicSpaceCharacter);
// Make GBK compliant to the encoding spec and align with GB18030
--
2.46.2

View file

@ -1,32 +0,0 @@
From 88676c640928fd2dce56a46c1c3adb62ac349697 Mon Sep 17 00:00:00 2001
From: "lauren n. liberda" <lauren@selfisekai.rocks>
Date: Thu, 24 Oct 2024 17:54:35 +0000
Subject: [PATCH] [unbundle] add enable_freetype
fixes freetype unbundle after https://crrev.com/c/5832411
Bug: none
Change-Id: If5573d2c0e833ef3c18b505c004b3fa997f903a0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5952222
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1373430}
---
build/linux/unbundle/freetype.gn | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/build/linux/unbundle/freetype.gn b/build/linux/unbundle/freetype.gn
index 73f9666833e5..c780c630d55b 100644
--- a/build/linux/unbundle/freetype.gn
+++ b/build/linux/unbundle/freetype.gn
@@ -11,4 +11,9 @@ declare_args() {
# System FreeType configurations other than as described WILL INTRODUCE TEXT
# RENDERING AND SECURITY REGRESSIONS.
use_system_freetype = true
+
+ # Use FreeType for font rendering. If this is set to false, FreeType is
+ # replaced with the Rust-based Fontations set of libraries plus Skia
+ # path rendering.
+ enable_freetype = true
}

View file

@ -1,21 +0,0 @@
From a665875b4013eed997bd042326a038e24f3296e7 Mon Sep 17 00:00:00 2001
From: Matt Jolly <kangie@gentoo.org>
Date: Thu, 10 Oct 2024 14:36:51 +1000
Subject: [PATCH] unbundle: add missing icu target
--- a/build/linux/unbundle/icu.gn
+++ b/build/linux/unbundle/icu.gn
@@ -65,6 +65,10 @@ group("icuuc_public") {
public_deps = [ ":icuuc" ]
}
+group("icui18n_hidden_visibility") {
+ public_deps = [ ":icuuc" ]
+}
+
shim_headers("icui18n_shim") {
root_path = "source/i18n"
headers = [
--
2.46.2