diff --git a/extra/chromium/.SRCINFO b/extra/chromium/.SRCINFO index 52963c632..526ce5363 100644 --- a/extra/chromium/.SRCINFO +++ b/extra/chromium/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = chromium pkgdesc = A web browser built for speed, simplicity, and security - pkgver = 125.0.6422.141 + pkgver = 126.0.6478.55 pkgrel = 1 url = https://www.chromium.org/Home arch = x86_64 @@ -41,6 +41,7 @@ pkgbase = chromium depends = dav1d depends = flac depends = libxml2 + depends = libwebp depends = minizip depends = opus depends = harfbuzz @@ -53,21 +54,19 @@ 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-125.0.6422.141.tar.xz + source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-126.0.6478.55.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 = 7ccef206f8c99e6a17b927b1b6d8018da808d75a0f46998282e0ca6cb80fe4c9 sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a - sha256sums = 58c8787bd215c4818893405dbb88c17b08bf13039fb5fbcb9dfe95ac51a86f3e - sha256sums = 75e1482d1b27c34ebe9d4bf27104fedcc219cdd95ce71fc41e77a486befd3f93 + sha256sums = daf0df74d2601c35fd66a746942d9ca3fc521ede92312f85af51d94c399fd6e0 sha256sums = 8f81059d79040ec598b5fb077808ec69d26d6c9cbebf9c4f4ea48b388a2596c5 - sha256sums = 3bd35dab1ded5d9e1befa10d5c6c4555fe0a76d909fb724ac57d0bf10cb666c1 + sha256sums = 028acc97299cec5d1ed9f456bbdc462807fa491277d266db2aa1d405d3cd753d sha256sums = b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961 - sha256sums = 69d2f076223cab0cf1094ae58c39b5687a98f69bf4545414a35f6a4d2708ed83 + sha256sums = a9b417b96daec33c9059065e15b3a92ae1bf4b59f89d353659b335d9e0379db6 pkgname = chromium diff --git a/extra/chromium/0001-widevine-support-for-arm.patch b/extra/chromium/0001-widevine-support-for-arm.patch index e0a9b16c3..235e9443b 100644 --- a/extra/chromium/0001-widevine-support-for-arm.patch +++ b/extra/chromium/0001-widevine-support-for-arm.patch @@ -1,4 +1,4 @@ -From 589c2a4fcc48dfe7f6ca6a56c2e36bc7d639742f Mon Sep 17 00:00:00 2001 +From 3ba3c3152ed350e9a589e736c720d97d20c7b370 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich 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.44.0 +2.45.1 diff --git a/extra/chromium/0002-Run-blink-bindings-generation-single-threaded.patch b/extra/chromium/0002-Run-blink-bindings-generation-single-threaded.patch index c0a12f381..987fd55ed 100644 --- a/extra/chromium/0002-Run-blink-bindings-generation-single-threaded.patch +++ b/extra/chromium/0002-Run-blink-bindings-generation-single-threaded.patch @@ -1,4 +1,4 @@ -From a996640582ffc917b5e23d7f45a161382da4b112 Mon Sep 17 00:00:00 2001 +From d12a9ec7fdb28f37f82ec33220c3d5920e9c0091 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich 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.44.0 +2.45.1 diff --git a/extra/chromium/0003-Fix-eu-strip-build-for-newer-GCC.patch b/extra/chromium/0003-Fix-eu-strip-build-for-newer-GCC.patch index d7f4f77c6..30444bcd2 100644 --- a/extra/chromium/0003-Fix-eu-strip-build-for-newer-GCC.patch +++ b/extra/chromium/0003-Fix-eu-strip-build-for-newer-GCC.patch @@ -1,4 +1,4 @@ -From 46f55f3e7eaa8634db5ffe3df65732f9044e55d7 Mon Sep 17 00:00:00 2001 +From a867f1163c9f98b0dbe04bf4952d43da724b8147 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich 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.44.0 +2.45.1 diff --git a/extra/chromium/PKGBUILD b/extra/chromium/PKGBUILD index 8a9805780..a2c82b3e9 100644 --- a/extra/chromium/PKGBUILD +++ b/extra/chromium/PKGBUILD @@ -15,7 +15,7 @@ highmem=1 pkgname=chromium -pkgver=125.0.6422.141 +pkgver=126.0.6478.55 pkgrel=1 _launcher_ver=8 _manual_clone=0 @@ -38,7 +38,6 @@ 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 @@ -46,17 +45,16 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom 0001-widevine-support-for-arm.patch 0002-Run-blink-bindings-generation-single-threaded.patch 0003-Fix-eu-strip-build-for-newer-GCC.patch) -sha256sums=('9966b50279d0cfaaf4b58570387f0d526388f8d5f6dd990e3f083a55d8d8e603' +sha256sums=('7ccef206f8c99e6a17b927b1b6d8018da808d75a0f46998282e0ca6cb80fe4c9' '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a' - '58c8787bd215c4818893405dbb88c17b08bf13039fb5fbcb9dfe95ac51a86f3e' - '75e1482d1b27c34ebe9d4bf27104fedcc219cdd95ce71fc41e77a486befd3f93' + 'daf0df74d2601c35fd66a746942d9ca3fc521ede92312f85af51d94c399fd6e0' '8f81059d79040ec598b5fb077808ec69d26d6c9cbebf9c4f4ea48b388a2596c5' - '3bd35dab1ded5d9e1befa10d5c6c4555fe0a76d909fb724ac57d0bf10cb666c1' + '028acc97299cec5d1ed9f456bbdc462807fa491277d266db2aa1d405d3cd753d' 'b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961' - '69d2f076223cab0cf1094ae58c39b5687a98f69bf4545414a35f6a4d2708ed83' - '6775b8d6b0662d61ba9f925bbb00c51eb06e871c7bf9308d608db7a131fdeb63' - 'f0cba56bf1625ac18836a8b71cfc5359ac6e4b33dbbd0da4a67ae6dda70d3e5e' - '38d3b2375c2d36b04ec9486044a466cd08701f428471e64707f241d3ac300b82') + 'a9b417b96daec33c9059065e15b3a92ae1bf4b59f89d353659b335d9e0379db6' + 'd7e03bb0ca10ed30cf8a427d6d382623930d1cefdeb673ed3ed9babcdfd62503' + '494d5c3cd7901ec16ff9f66e34f550b2ebc52d02fdc744f444843cfcc79def2b' + 'b26a6ba43b62e9fdc2a814fa648a96c93da9bda69d6675134c1a5965a9170a18') if (( _manual_clone )); then source[0]=fetch-chromium-release @@ -81,7 +79,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 @@ -131,6 +129,7 @@ prepare() { # https://crbug.com/893950 sed -i -e 's/\/malloc/' -e 's/\/free/' \ + -e '1i #include ' \ third_party/blink/renderer/core/xml/*.cc \ third_party/blink/renderer/core/xml/parser/xml_document_parser.cc \ third_party/libxml/chromium/*.cc \ @@ -142,7 +141,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/extra/chromium/drop-flag-unsupported-by-clang17.patch b/extra/chromium/drop-flag-unsupported-by-clang17.patch index a1412c919..d5f6c1dc5 100644 --- a/extra/chromium/drop-flag-unsupported-by-clang17.patch +++ b/extra/chromium/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/extra/chromium/fix-a-missing-build-dependency.patch b/extra/chromium/fix-a-missing-build-dependency.patch deleted file mode 100644 index 7de5cd95f..000000000 --- a/extra/chromium/fix-a-missing-build-dependency.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a976cb05b4024b7a6452d1541378d718cdfe33e6 Mon Sep 17 00:00:00 2001 -From: Takuto Ikuta -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 -Commit-Queue: Takuto Ikuta -Reviewed-by: Danil Somsikov -Commit-Queue: Danil Somsikov -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/extra/chromium/use-oauth2-client-switches-as-default.patch b/extra/chromium/use-oauth2-client-switches-as-default.patch index 55289a8ff..888b67b00 100644 --- a/extra/chromium/use-oauth2-client-switches-as-default.patch +++ b/extra/chromium/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