summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO19
-rw-r--r--PKGBUILD16
-rw-r--r--drop-flag-unsupported-by-clang17.patch10
-rw-r--r--fix-a-missing-build-dependency.patch29
-rw-r--r--use-oauth2-client-switches-as-default.patch18
5 files changed, 30 insertions, 62 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bd635f08193a..ef5b89f395b6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = chromium-no-extras
pkgdesc = Chromium without hangout services, widevine, or chromedriver
- pkgver = 125.0.6422.141
+ pkgver = 126.0.6478.126
pkgrel = 1
url = https://www.chromium.org/Home
arch = x86_64
@@ -41,6 +41,7 @@ pkgbase = chromium-no-extras
depends = dav1d
depends = flac
depends = libxml2
+ depends = libwebp
depends = minizip
depends = opus
depends = harfbuzz
@@ -52,24 +53,22 @@ pkgbase = chromium-no-extras
optdepends = gtk4: for --gtk-version=4 (GTK4 IME might work better on Wayland)
optdepends = org.freedesktop.secrets: password storage backend on GNOME / Xfce
optdepends = kwallet: support for storing passwords in KWallet on Plasma
- provides = chromium=125.0.6422.141
+ provides = chromium=126.0.6478.126
conflicts = chromium
options = !lto
- source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-125.0.6422.141.tar.xz
+ source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-126.0.6478.126.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/125/chromium-patches-125.tar.bz2
- source = fix-a-missing-build-dependency.patch
+ source = https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/126/chromium-patches-126.tar.bz2
source = allow-ANGLEImplementation-kVulkan.patch
source = drop-flag-unsupported-by-clang17.patch
source = compiler-rt-adjust-paths.patch
source = use-oauth2-client-switches-as-default.patch
- sha256sums = 9966b50279d0cfaaf4b58570387f0d526388f8d5f6dd990e3f083a55d8d8e603
+ sha256sums = 5d5206637e659f03e006cd8b6b269c49c0c2c697d10517e14dbcea851831e143
sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
- sha256sums = 58c8787bd215c4818893405dbb88c17b08bf13039fb5fbcb9dfe95ac51a86f3e
- sha256sums = 75e1482d1b27c34ebe9d4bf27104fedcc219cdd95ce71fc41e77a486befd3f93
+ sha256sums = daf0df74d2601c35fd66a746942d9ca3fc521ede92312f85af51d94c399fd6e0
sha256sums = 8f81059d79040ec598b5fb077808ec69d26d6c9cbebf9c4f4ea48b388a2596c5
- sha256sums = 3bd35dab1ded5d9e1befa10d5c6c4555fe0a76d909fb724ac57d0bf10cb666c1
+ sha256sums = 028acc97299cec5d1ed9f456bbdc462807fa491277d266db2aa1d405d3cd753d
sha256sums = b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961
- sha256sums = 69d2f076223cab0cf1094ae58c39b5687a98f69bf4545414a35f6a4d2708ed83
+ sha256sums = a9b417b96daec33c9059065e15b3a92ae1bf4b59f89d353659b335d9e0379db6
pkgname = chromium-no-extras
diff --git a/PKGBUILD b/PKGBUILD
index 566103e905e2..ae768e5f446d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
_pkgname=chromium
pkgname=chromium-no-extras
-pkgver=125.0.6422.141
+pkgver=126.0.6478.126
pkgrel=1
_launcher_ver=8
_manual_clone=0
@@ -31,19 +31,17 @@ 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://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${pkgver%%.*}/chromium-patches-${pkgver%%.*}.tar.bz2
- fix-a-missing-build-dependency.patch
allow-ANGLEImplementation-kVulkan.patch
drop-flag-unsupported-by-clang17.patch
compiler-rt-adjust-paths.patch
use-oauth2-client-switches-as-default.patch)
-sha256sums=('9966b50279d0cfaaf4b58570387f0d526388f8d5f6dd990e3f083a55d8d8e603'
+sha256sums=('5d5206637e659f03e006cd8b6b269c49c0c2c697d10517e14dbcea851831e143'
'213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
- '58c8787bd215c4818893405dbb88c17b08bf13039fb5fbcb9dfe95ac51a86f3e'
- '75e1482d1b27c34ebe9d4bf27104fedcc219cdd95ce71fc41e77a486befd3f93'
+ 'daf0df74d2601c35fd66a746942d9ca3fc521ede92312f85af51d94c399fd6e0'
'8f81059d79040ec598b5fb077808ec69d26d6c9cbebf9c4f4ea48b388a2596c5'
- '3bd35dab1ded5d9e1befa10d5c6c4555fe0a76d909fb724ac57d0bf10cb666c1'
+ '028acc97299cec5d1ed9f456bbdc462807fa491277d266db2aa1d405d3cd753d'
'b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961'
- '69d2f076223cab0cf1094ae58c39b5687a98f69bf4545414a35f6a4d2708ed83')
+ 'a9b417b96daec33c9059065e15b3a92ae1bf4b59f89d353659b335d9e0379db6')
if (( _manual_clone )); then
source[0]=fetch-chromium-release
@@ -68,7 +66,7 @@ declare -gA _system_libs=(
[libjpeg]=libjpeg
[libpng]=libpng
#[libvpx]=libvpx
- #[libwebp]=libwebp # //third_party/libavif:libavif_enc needs //third_party/libwebp:libwebp_sharpyuv
+ [libwebp]=libwebp
[libxml]=libxml2
[libxslt]=libxslt
[opus]=opus
@@ -110,6 +108,7 @@ prepare() {
# https://crbug.com/893950
sed -i -e 's/\<xmlMalloc\>/malloc/' -e 's/\<xmlFree\>/free/' \
+ -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 \
@@ -121,7 +120,6 @@ prepare() {
patch -Np1 -i ../use-oauth2-client-switches-as-default.patch
# Upstream fixes
- patch -Np1 -i ../fix-a-missing-build-dependency.patch
patch -Np1 -i ../allow-ANGLEImplementation-kVulkan.patch
# Drop compiler flag that needs newer clang
diff --git a/drop-flag-unsupported-by-clang17.patch b/drop-flag-unsupported-by-clang17.patch
index a1412c9197b5..d5f6c1dc5a51 100644
--- a/drop-flag-unsupported-by-clang17.patch
+++ b/drop-flag-unsupported-by-clang17.patch
@@ -1,14 +1,14 @@
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 89b4755ac8b3..94b457385663 100644
+index 6efe967eb0a1..590a2c274ac1 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
-@@ -618,24 +618,6 @@ config("compiler") {
+@@ -568,24 +568,6 @@ config("compiler") {
}
}
-- # TODO(crbug.com/1488374): This causes binary size growth and potentially
+- # TODO(crbug.com/40283598): This causes binary size growth and potentially
- # other problems.
-- # TODO(crbug.com/1491036): This isn't supported by Cronet's mainline llvm version.
+- # 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 += [
@@ -24,6 +24,6 @@ index 89b4755ac8b3..94b457385663 100644
- }
- }
-
- # TODO(crbug.com/1235145): Investigate why/if this should be needed.
+ # TODO(crbug.com/40192287): Investigate why/if this should be needed.
if (is_win) {
cflags += [ "/clang:-ffp-contract=off" ]
diff --git a/fix-a-missing-build-dependency.patch b/fix-a-missing-build-dependency.patch
deleted file mode 100644
index 7de5cd95f41d..000000000000
--- a/fix-a-missing-build-dependency.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a976cb05b4024b7a6452d1541378d718cdfe33e6 Mon Sep 17 00:00:00 2001
-From: Takuto Ikuta <tikuta@chromium.org>
-Date: Thu, 25 Apr 2024 07:25:32 +0000
-Subject: [PATCH] [devtools] fix a missing build dependency to a generated file
-
-Bug: 336911498
-Change-Id: I6e6d3afaf33ace53a68271b70165b8c3ab596340
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5487538
-Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
-Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
-Reviewed-by: Danil Somsikov <dsv@chromium.org>
-Commit-Queue: Danil Somsikov <dsv@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1292300}
----
- chrome/browser/devtools/BUILD.gn | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/chrome/browser/devtools/BUILD.gn b/chrome/browser/devtools/BUILD.gn
-index f0c07cad8cfb..053199e462f5 100644
---- a/chrome/browser/devtools/BUILD.gn
-+++ b/chrome/browser/devtools/BUILD.gn
-@@ -117,6 +117,7 @@ static_library("devtools") {
- "//chrome/browser/autofill:autofill",
- "//components/autofill/content/browser:browser",
- "//components/autofill/core/browser:browser",
-+ "//components/enterprise/buildflags",
- "//components/paint_preview/buildflags:buildflags",
- "//components/variations/service:service",
- "//components/webapps/common:common",
diff --git a/use-oauth2-client-switches-as-default.patch b/use-oauth2-client-switches-as-default.patch
index 55289a8ff3f9..888b67b00aa4 100644
--- a/use-oauth2-client-switches-as-default.patch
+++ b/use-oauth2-client-switches-as-default.patch
@@ -1,18 +1,18 @@
diff --git a/google_apis/google_api_keys-inc.cc b/google_apis/google_api_keys-inc.cc
-index 49c396d69d17..9493e7e5aa48 100644
+index 4d13e697a54d..61aac7b48662 100644
--- a/google_apis/google_api_keys-inc.cc
+++ b/google_apis/google_api_keys-inc.cc
-@@ -182,11 +182,11 @@ class APIKeyCache {
-
+@@ -193,11 +193,11 @@ class APIKeyCache {
std::string default_client_id = CalculateKeyValue(
GOOGLE_DEFAULT_CLIENT_ID,
-- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), nullptr,
-+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), ::switches::kOAuth2ClientID,
- std::string(), environment.get(), command_line, gaia_config);
+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), std::string(),
+- nullptr, std::string(), environment.get(), command_line, gaia_config);
++ ::switches::kOAuth2ClientID, std::string(), environment.get(), command_line, gaia_config);
std::string default_client_secret = CalculateKeyValue(
GOOGLE_DEFAULT_CLIENT_SECRET,
-- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), nullptr,
-+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), ::switches::kOAuth2ClientSecret,
- std::string(), environment.get(), command_line, gaia_config);
+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), std::string(),
+- nullptr, std::string(), environment.get(), command_line, gaia_config);
++ ::switches::kOAuth2ClientSecret, std::string(), environment.get(), command_line, gaia_config);
// We currently only allow overriding the baked-in values for the
+ // default OAuth2 client ID and secret using a command-line