mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-18 22:54:00 +00:00
extra/chromium to 127.0.6533.57-1
This commit is contained in:
Kevin Mihelich
parent
dd55eefad2
commit
ed3039196b
8 changed files with 114 additions and 58 deletions
|
|
@ -1,6 +1,6 @@
|
|||
pkgbase = chromium
|
||||
pkgdesc = A web browser built for speed, simplicity, and security
|
||||
pkgver = 126.0.6478.182
|
||||
pkgver = 127.0.6533.57
|
||||
pkgrel = 1
|
||||
url = https://www.chromium.org/Home
|
||||
arch = x86_64
|
||||
|
|
@ -14,6 +14,7 @@ pkgbase = chromium
|
|||
makedepends = nodejs
|
||||
makedepends = pipewire
|
||||
makedepends = rust
|
||||
makedepends = rust-bindgen
|
||||
makedepends = qt5-base
|
||||
makedepends = qt6-base
|
||||
makedepends = java-runtime-headless
|
||||
|
|
@ -38,7 +39,6 @@ pkgbase = chromium
|
|||
depends = brotli
|
||||
depends = libjpeg
|
||||
depends = icu
|
||||
depends = dav1d
|
||||
depends = flac
|
||||
depends = libxml2
|
||||
depends = libwebp
|
||||
|
|
@ -54,19 +54,21 @@ 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-126.0.6478.182.tar.xz
|
||||
source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-127.0.6533.57.tar.xz
|
||||
source = https://github.com/foutrelis/chromium-launcher/archive/v8/chromium-launcher-8.tar.gz
|
||||
source = https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/126/chromium-patches-126.tar.bz2
|
||||
source = https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/127/chromium-patches-127.tar.bz2
|
||||
source = allow-ANGLEImplementation-kVulkan.patch
|
||||
source = drop-flag-unsupported-by-clang17.patch
|
||||
source = chromium-browser-ui-missing-deps.patch
|
||||
source = compiler-rt-adjust-paths.patch
|
||||
source = increase-fortify-level.patch
|
||||
source = use-oauth2-client-switches-as-default.patch
|
||||
sha256sums = 3939f5b3116ebd3cb15ff8c7059888f6b00f4cfa8a77bde983ee4ce5d0eea427
|
||||
sha256sums = 8aea503da0c65edd642197114805f563fc006d9430a6007688b6b172ea625810
|
||||
sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
|
||||
sha256sums = daf0df74d2601c35fd66a746942d9ca3fc521ede92312f85af51d94c399fd6e0
|
||||
sha256sums = 0887d215c47085013d09252409964a5eedec453561db1f2b133914e349b8a0b2
|
||||
sha256sums = 8f81059d79040ec598b5fb077808ec69d26d6c9cbebf9c4f4ea48b388a2596c5
|
||||
sha256sums = 028acc97299cec5d1ed9f456bbdc462807fa491277d266db2aa1d405d3cd753d
|
||||
sha256sums = 75f9c3ccdcc914d029ddcc5ca181df90177db35a343bf44ff541ff127bcea43d
|
||||
sha256sums = b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961
|
||||
sha256sums = d634d2ce1fc63da7ac41f432b1e84c59b7cceabf19d510848a7cff40c8025342
|
||||
sha256sums = a9b417b96daec33c9059065e15b3a92ae1bf4b59f89d353659b335d9e0379db6
|
||||
|
||||
pkgname = chromium
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 3ba3c3152ed350e9a589e736c720d97d20c7b370 Mon Sep 17 00:00:00 2001
|
||||
From 416586b0eb79d60fe73257bc76895f9f9bde560d 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.1
|
||||
2.45.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From d12a9ec7fdb28f37f82ec33220c3d5920e9c0091 Mon Sep 17 00:00:00 2001
|
||||
From fd683f14fd16382908f4634546d5f22bd3ce6566 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 b1c8a6458c7c7..0a2fc40a384db 100644
|
|||
rebase_path(web_idl_database, root_build_dir),
|
||||
"--root_src_dir",
|
||||
--
|
||||
2.45.1
|
||||
2.45.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From a867f1163c9f98b0dbe04bf4952d43da724b8147 Mon Sep 17 00:00:00 2001
|
||||
From 543184806c62524de2ceee423c8f8cccc73e7399 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.1
|
||||
2.45.2
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
highmem=1
|
||||
|
||||
pkgname=chromium
|
||||
pkgver=126.0.6478.182
|
||||
pkgver=127.0.6533.57
|
||||
pkgrel=1
|
||||
_launcher_ver=8
|
||||
_manual_clone=0
|
||||
|
|
@ -28,7 +28,8 @@ depends=('gtk3' 'nss' 'alsa-lib' 'xdg-utils' 'libxss' 'libcups' 'libgcrypt'
|
|||
'ttf-liberation' 'systemd' 'dbus' 'libpulse' 'pciutils' 'libva'
|
||||
'libffi' 'desktop-file-utils' 'hicolor-icon-theme')
|
||||
makedepends=('python' 'gn' 'ninja' 'clang' 'lld' 'gperf' 'nodejs' 'pipewire'
|
||||
'rust' 'qt5-base' 'qt6-base' 'java-runtime-headless' 'git')
|
||||
'rust' 'rust-bindgen' 'qt5-base' 'qt6-base' 'java-runtime-headless'
|
||||
'git')
|
||||
optdepends=('pipewire: WebRTC desktop sharing under Wayland'
|
||||
'kdialog: support for native dialogs in Plasma'
|
||||
'gtk4: for --gtk-version=4 (GTK4 IME might work better on Wayland)'
|
||||
|
|
@ -39,22 +40,24 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
|
|||
https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver/chromium-launcher-$_launcher_ver.tar.gz
|
||||
https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${pkgver%%.*}/chromium-patches-${pkgver%%.*}.tar.bz2
|
||||
allow-ANGLEImplementation-kVulkan.patch
|
||||
drop-flag-unsupported-by-clang17.patch
|
||||
chromium-browser-ui-missing-deps.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=('3939f5b3116ebd3cb15ff8c7059888f6b00f4cfa8a77bde983ee4ce5d0eea427'
|
||||
sha256sums=('8aea503da0c65edd642197114805f563fc006d9430a6007688b6b172ea625810'
|
||||
'213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
|
||||
'daf0df74d2601c35fd66a746942d9ca3fc521ede92312f85af51d94c399fd6e0'
|
||||
'0887d215c47085013d09252409964a5eedec453561db1f2b133914e349b8a0b2'
|
||||
'8f81059d79040ec598b5fb077808ec69d26d6c9cbebf9c4f4ea48b388a2596c5'
|
||||
'028acc97299cec5d1ed9f456bbdc462807fa491277d266db2aa1d405d3cd753d'
|
||||
'75f9c3ccdcc914d029ddcc5ca181df90177db35a343bf44ff541ff127bcea43d'
|
||||
'b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961'
|
||||
'd634d2ce1fc63da7ac41f432b1e84c59b7cceabf19d510848a7cff40c8025342'
|
||||
'a9b417b96daec33c9059065e15b3a92ae1bf4b59f89d353659b335d9e0379db6'
|
||||
'd7e03bb0ca10ed30cf8a427d6d382623930d1cefdeb673ed3ed9babcdfd62503'
|
||||
'494d5c3cd7901ec16ff9f66e34f550b2ebc52d02fdc744f444843cfcc79def2b'
|
||||
'b26a6ba43b62e9fdc2a814fa648a96c93da9bda69d6675134c1a5965a9170a18')
|
||||
'31179a8b1c132fa0c8679eb212c0b51ac2da2ccfb3ee1f8153bbed2e3cecaa97'
|
||||
'68dafa0c0d6abcd2004d21e8582647e25d83a00ad608786fdfd630e84f04e3d7'
|
||||
'b0969b3103321950ffd622c8440d73c9d30e7ef60b3ea242fc688bb4cee6c7c3')
|
||||
|
||||
if (( _manual_clone )); then
|
||||
source[0]=fetch-chromium-release
|
||||
|
|
@ -65,7 +68,7 @@ fi
|
|||
# Keys are the names in the above script; values are the dependencies in Arch
|
||||
declare -gA _system_libs=(
|
||||
[brotli]=brotli
|
||||
[dav1d]=dav1d
|
||||
#[dav1d]=dav1d
|
||||
#[ffmpeg]=ffmpeg # YouTube playback stopped working in Chromium 120
|
||||
[flac]=flac
|
||||
[fontconfig]=fontconfig
|
||||
|
|
@ -132,8 +135,7 @@ prepare() {
|
|||
-e '1i #include <cstdlib>' \
|
||||
third_party/blink/renderer/core/xml/*.cc \
|
||||
third_party/blink/renderer/core/xml/parser/xml_document_parser.cc \
|
||||
third_party/libxml/chromium/*.cc \
|
||||
third_party/maldoca/src/maldoca/ole/oss_utils.h
|
||||
third_party/libxml/chromium/*.cc
|
||||
|
||||
# Use the --oauth2-client-id= and --oauth2-client-secret= switches for
|
||||
# setting GOOGLE_DEFAULT_CLIENT_ID and GOOGLE_DEFAULT_CLIENT_SECRET at
|
||||
|
|
@ -143,20 +145,28 @@ prepare() {
|
|||
# Upstream fixes
|
||||
patch -Np1 -i ../allow-ANGLEImplementation-kVulkan.patch
|
||||
|
||||
# Drop compiler flag that needs newer clang
|
||||
patch -Np1 -i ../drop-flag-unsupported-by-clang17.patch
|
||||
# https://issues.chromium.org/issues/351157339
|
||||
patch -Np1 -i ../chromium-browser-ui-missing-deps.patch
|
||||
|
||||
# Allow libclang_rt.builtins from compiler-rt >= 16 to be used
|
||||
patch -Np1 -i ../compiler-rt-adjust-paths.patch
|
||||
|
||||
# Increase _FORTIFY_SOURCE level to match Arch's default flags
|
||||
patch -Np1 -i ../increase-fortify-level.patch
|
||||
|
||||
# Fixes for building with libstdc++ instead of libc++
|
||||
patch -Np1 -i ../chromium-patches-*/chromium-117-material-color-include.patch
|
||||
|
||||
# Link to system tools required by the build
|
||||
mkdir -p third_party/node/linux/node-linux-x64/bin
|
||||
rm third_party/node/linux/node-linux-x64/bin/node
|
||||
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
|
||||
|
|
@ -254,6 +264,7 @@ build() {
|
|||
|
||||
_flags+=(
|
||||
'rust_sysroot_absolute="/usr"'
|
||||
'rust_bindgen_root="/usr"'
|
||||
"rustc_version=\"$(rustc --version)\""
|
||||
)
|
||||
fi
|
||||
|
|
|
|||
59
extra/chromium/chromium-browser-ui-missing-deps.patch
Normal file
59
extra/chromium/chromium-browser-ui-missing-deps.patch
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
Source: Tom Briden <tom@decompile.me.uk>
|
||||
Upstream: No
|
||||
|
||||
diff --git a/chrome/browser/ui/views/side_panel/BUILD.gn b/chrome/browser/ui/views/side_panel/BUILD.gn
|
||||
index ea57f9b16f6b8..20d8681ee9af2 100644
|
||||
--- a/chrome/browser/ui/views/side_panel/BUILD.gn
|
||||
+++ b/chrome/browser/ui/views/side_panel/BUILD.gn
|
||||
@@ -142,18 +142,30 @@ static_library("side_panel") {
|
||||
}
|
||||
public_deps = [
|
||||
"//base",
|
||||
+ "//chrome/browser/cart:mojo_bindings",
|
||||
"//chrome/browser/companion/core/mojom:mojo_bindings",
|
||||
"//chrome/browser/profiles:profile",
|
||||
"//chrome/browser/ui/actions:actions_headers",
|
||||
"//chrome/browser/ui/color:color_headers",
|
||||
+ "//chrome/browser/ui/webui/side_panel/customize_chrome:mojo_bindings",
|
||||
+ "//chrome/browser/ui/webui/side_panel/bookmarks:mojo_bindings",
|
||||
"//chrome/browser/ui/webui/side_panel/performance_controls:mojo_bindings",
|
||||
+ "//chrome/browser/ui/webui/side_panel/reading_list:mojo_bindings",
|
||||
+ "//chrome/browser/ui:webui_name_variants",
|
||||
"//chrome/common",
|
||||
"//chrome/common/accessibility:mojo_bindings",
|
||||
+ "//chrome/common/companion:mojo_bindings",
|
||||
+ "//components/enterprise/buildflags:buildflags",
|
||||
+ "//components/enterprise/common/proto:connectors_proto",
|
||||
"//components/lens",
|
||||
"//components/lens:buildflags",
|
||||
"//components/omnibox/browser",
|
||||
+ "//components/page_image_service/mojom:mojo_bindings",
|
||||
+ "//components/paint_preview/buildflags:buildflags",
|
||||
"//components/prefs",
|
||||
"//components/search_engines",
|
||||
+ "//components/segmentation_platform/public/proto:proto",
|
||||
+ "//components/webapps/common:mojo_bindings",
|
||||
"//content/public/browser",
|
||||
"//extensions/browser",
|
||||
"//extensions/common",
|
||||
@@ -165,6 +177,8 @@ static_library("side_panel") {
|
||||
"//ui/gfx/geometry",
|
||||
"//ui/views",
|
||||
"//ui/views/controls/webview",
|
||||
+ "//ui/webui/resources/cr_components/commerce:mojo_bindings",
|
||||
+ "//ui/webui/resources/cr_components/help_bubble:mojo_bindings",
|
||||
"//url",
|
||||
]
|
||||
deps = [
|
||||
diff --git a/chrome/browser/ui/webui/top_chrome/BUILD.gn b/chrome/browser/ui/webui/top_chrome/BUILD.gn
|
||||
index 5830f1f5e234a..6749b8fd0da56 100644
|
||||
--- a/chrome/browser/ui/webui/top_chrome/BUILD.gn
|
||||
+++ b/chrome/browser/ui/webui/top_chrome/BUILD.gn
|
||||
@@ -19,6 +19,7 @@ source_set("top_chrome") {
|
||||
deps = [
|
||||
"//base",
|
||||
"//chrome/browser/profiles:profile",
|
||||
+ "//chrome/browser/ui:webui_name_variants",
|
||||
"//components/site_engagement/content:content",
|
||||
"//content/public/browser",
|
||||
"//ui/webui",
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
|
||||
index 6efe967eb0a1..590a2c274ac1 100644
|
||||
--- a/build/config/compiler/BUILD.gn
|
||||
+++ b/build/config/compiler/BUILD.gn
|
||||
@@ -568,24 +568,6 @@ config("compiler") {
|
||||
}
|
||||
}
|
||||
|
||||
- # TODO(crbug.com/40283598): This causes binary size growth and potentially
|
||||
- # other problems.
|
||||
- # TODO(crbug.com/40284925): This isn't supported by Cronet's mainline llvm version.
|
||||
- if (default_toolchain != "//build/toolchain/cros:target" &&
|
||||
- !llvm_android_mainline) {
|
||||
- cflags += [
|
||||
- "-mllvm",
|
||||
- "-split-threshold-for-reg-with-hint=0",
|
||||
- ]
|
||||
- if (use_thin_lto && is_a_target_toolchain) {
|
||||
- if (is_win) {
|
||||
- ldflags += [ "-mllvm:-split-threshold-for-reg-with-hint=0" ]
|
||||
- } else {
|
||||
- ldflags += [ "-Wl,-mllvm,-split-threshold-for-reg-with-hint=0" ]
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-
|
||||
# TODO(crbug.com/40192287): Investigate why/if this should be needed.
|
||||
if (is_win) {
|
||||
cflags += [ "/clang:-ffp-contract=off" ]
|
||||
13
extra/chromium/increase-fortify-level.patch
Normal file
13
extra/chromium/increase-fortify-level.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
|
||||
index eb329bc88fec..7c98dfddcf8a 100644
|
||||
--- a/build/config/compiler/BUILD.gn
|
||||
+++ b/build/config/compiler/BUILD.gn
|
||||
@@ -2054,7 +2054,7 @@ config("chromium_code") {
|
||||
# Non-chromium code is not guaranteed to compile cleanly with
|
||||
# _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
|
||||
# disabled, so only do that for Release build.
|
||||
- fortify_level = "2"
|
||||
+ fortify_level = "3"
|
||||
|
||||
# ChromeOS's toolchain supports a high-quality _FORTIFY_SOURCE=3
|
||||
# implementation with a few custom glibc patches. Use that if it's
|
||||
Loading…
Reference in a new issue