commit:     ac2dd4756267985998394341549e270ce8ae07a6
Author:     Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 25 22:21:10 2024 +0000
Commit:     Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Fri Apr 26 01:51:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac2dd475

www-client/chromium: fix Ninja 1.12 build for 125

We'll just let 124 age out over the next month or so
as I can't guarantee that there aren't further missing
dependencies.

Bug: https://bugs.gentoo.org/930112
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>

 www-client/chromium/chromium-125.0.6422.14.ebuild       |  3 ++-
 www-client/chromium/files/chromium-125-ninja-1-12.patch | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/www-client/chromium/chromium-125.0.6422.14.ebuild 
b/www-client/chromium/chromium-125.0.6422.14.ebuild
index 9606d9fad4c8..474f868333a8 100644
--- a/www-client/chromium/chromium-125.0.6422.14.ebuild
+++ b/www-client/chromium/chromium-125.0.6422.14.ebuild
@@ -250,7 +250,7 @@ BDEPEND="
                >=virtual/rust-${RUST_MIN_VER}[profiler(-)]
        )
        >=dev-build/gn-${GN_MIN_VER}
-       <dev-build/ninja-1.12
+       dev-build/ninja
        dev-lang/perl
        >=dev-util/gperf-3.0.3
        dev-vcs/git
@@ -428,6 +428,7 @@ src_prepare() {
                "${FILESDIR}/chromium-124-libwebp-shim-sharpyuv.patch"
                "${FILESDIR}/chromium-125-oauth2-client-switches.patch"
                "${FILESDIR}/chromium-125-system-zstd.patch"
+               "${FILESDIR}/chromium-125-ninja-1-12.patch"
        )
 
        if use system-toolchain; then

diff --git a/www-client/chromium/files/chromium-125-ninja-1-12.patch 
b/www-client/chromium/files/chromium-125-ninja-1-12.patch
new file mode 100644
index 000000000000..55d0887cd94f
--- /dev/null
+++ b/www-client/chromium/files/chromium-125-ninja-1-12.patch
@@ -0,0 +1,17 @@
+https://chromium-review.googlesource.com/c/chromium/src/+/5487538
+commit a976cb05b4024b7a6452d1541378d718cdfe33e6
+Author: Takuto Ikuta <tik...@chromium.org>
+Date:   Thu Apr 25 07:25:32 2024
+
+    [devtools] fix a missing build dependency to a generated file
+
+--- a/chrome/browser/devtools/BUILD.gn
++++ b/chrome/browser/devtools/BUILD.gn
+@@ -117,6 +117,7 @@
+     "//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",

Reply via email to