From 778c7bd7ce2207692fd653566f3c6c484c0085d8 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Wed, 1 May 2024 12:58:53 +0000 Subject: [PATCH] extra/chromium to 124.0.6367.118-1 --- extra/chromium/.SRCINFO | 8 +++-- extra/chromium/PKGBUILD | 7 +++-- .../fix-a-missing-build-dependency.patch | 29 +++++++++++++++++++ 3 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 extra/chromium/fix-a-missing-build-dependency.patch diff --git a/extra/chromium/.SRCINFO b/extra/chromium/.SRCINFO index 74da1ed3d..a394f49ac 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 = 124.0.6367.91 + pkgver = 124.0.6367.118 pkgrel = 1 url = https://www.chromium.org/Home arch = x86_64 @@ -53,16 +53,18 @@ 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-124.0.6367.91.tar.xz + source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-124.0.6367.118.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/124/chromium-patches-124.tar.bz2 + source = fix-a-missing-build-dependency.patch source = drop-flag-unsupported-by-clang17.patch source = compiler-rt-adjust-paths.patch source = qt-6.7.patch source = use-oauth2-client-switches-as-default.patch - sha256sums = 376cdcdb46b23eca7f3e6cdb933f27e73968ffb537258d70be503850bbbf1787 + sha256sums = 8aa5a14aad1234b48b568da9ef23d6e0b1b72d7f4ca5c4039462e54e6ad45d96 sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a sha256sums = c2bc4e65ed2a4e23528dd10d5c15bf99f880b7bbb789cc720d451b78098a7e12 + sha256sums = 75e1482d1b27c34ebe9d4bf27104fedcc219cdd95ce71fc41e77a486befd3f93 sha256sums = 3bd35dab1ded5d9e1befa10d5c6c4555fe0a76d909fb724ac57d0bf10cb666c1 sha256sums = b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961 sha256sums = e30623f36c54f4af3a8aa7d9400f7d2bed6ef560f15d665d2aa8fd777cb2565f diff --git a/extra/chromium/PKGBUILD b/extra/chromium/PKGBUILD index 68023679a..15a112768 100644 --- a/extra/chromium/PKGBUILD +++ b/extra/chromium/PKGBUILD @@ -15,7 +15,7 @@ highmem=1 pkgname=chromium -pkgver=124.0.6367.91 +pkgver=124.0.6367.118 pkgrel=1 _launcher_ver=8 _manual_clone=0 @@ -38,6 +38,7 @@ 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 drop-flag-unsupported-by-clang17.patch compiler-rt-adjust-paths.patch qt-6.7.patch @@ -45,9 +46,10 @@ 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=('376cdcdb46b23eca7f3e6cdb933f27e73968ffb537258d70be503850bbbf1787' +sha256sums=('8aa5a14aad1234b48b568da9ef23d6e0b1b72d7f4ca5c4039462e54e6ad45d96' '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a' 'c2bc4e65ed2a4e23528dd10d5c15bf99f880b7bbb789cc720d451b78098a7e12' + '75e1482d1b27c34ebe9d4bf27104fedcc219cdd95ce71fc41e77a486befd3f93' '3bd35dab1ded5d9e1befa10d5c6c4555fe0a76d909fb724ac57d0bf10cb666c1' 'b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961' 'e30623f36c54f4af3a8aa7d9400f7d2bed6ef560f15d665d2aa8fd777cb2565f' @@ -138,6 +140,7 @@ prepare() { patch -Np1 -i ../use-oauth2-client-switches-as-default.patch # Upstream fixes + patch -Np1 -i ../fix-a-missing-build-dependency.patch # Drop compiler flag that needs newer clang patch -Np1 -i ../drop-flag-unsupported-by-clang17.patch diff --git a/extra/chromium/fix-a-missing-build-dependency.patch b/extra/chromium/fix-a-missing-build-dependency.patch new file mode 100644 index 000000000..7de5cd95f --- /dev/null +++ b/extra/chromium/fix-a-missing-build-dependency.patch @@ -0,0 +1,29 @@ +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",