commit: ea8d28aa98aee00aafd19a81032dc6c9cde530c5 Author: Matt Jolly <kangie <AT> gentoo <DOT> org> AuthorDate: Mon Jul 29 22:41:57 2024 +0000 Commit: Matt Jolly <kangie <AT> gentoo <DOT> org> CommitDate: Mon Jul 29 22:43:42 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea8d28aa
www-client/chromium: fix build with USE="-official" on OpenRC Closes: https://bugs.gentoo.org/936673 Signed-off-by: Matt Jolly <kangie <AT> gentoo.org> www-client/chromium/chromium-127.0.6533.72.ebuild | 1 + .../files/chromium-127-enterprise-companion.patch | 44 ++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/www-client/chromium/chromium-127.0.6533.72.ebuild b/www-client/chromium/chromium-127.0.6533.72.ebuild index 0861db4237d8..336aa71c9faf 100644 --- a/www-client/chromium/chromium-127.0.6533.72.ebuild +++ b/www-client/chromium/chromium-127.0.6533.72.ebuild @@ -453,6 +453,7 @@ src_prepare() { "${FILESDIR}/chromium-126-oauth2-client-switches.patch" "${FILESDIR}/chromium-127-browser-ui-deps.patch" "${FILESDIR}/chromium-127-bindgen-custom-toolchain.patch" + "${FILESDIR}/chromium-127-enterprise-companion.patch" ) # 127: test deps are broken for ui/lens with system ICU "//third_party/icu:icuuc_public" diff --git a/www-client/chromium/files/chromium-127-enterprise-companion.patch b/www-client/chromium/files/chromium-127-enterprise-companion.patch new file mode 100644 index 000000000000..76ce131bba3d --- /dev/null +++ b/www-client/chromium/files/chromium-127-enterprise-companion.patch @@ -0,0 +1,44 @@ +From e7d008ff98df2049cce1c4d941b13b320da336c9 Mon Sep 17 00:00:00 2001 +From: Matt Jolly <[email protected]> +Date: Mon, 29 Jul 2024 23:42:04 +1000 +Subject: [PATCH] no-op enterprise_companion. + +For some reason this pulls in updater components which breaks +builds on OpenRC systems (or any non-systemd system, really). + +It doesn't seem essential so we'll just not build it. + +Bug: https://bugs.gentoo.org/936673 +Signed-off-by: Matt Jolly <[email protected]> +--- a/chrome/enterprise_companion/BUILD.gn ++++ b/chrome/enterprise_companion/BUILD.gn +@@ -60,16 +60,16 @@ static_library("client") { + deps = [ "//mojo/public/cpp/platform" ] + } + +-if (!is_official_build) { +- executable("enterprise_companion") { +- sources = [ "main.cc" ] +- deps = [ ":base" ] +- +- if (is_win) { +- configs += [ "//build/config/win:windowed" ] +- } +- } +-} ++#if (!is_official_build) { ++# executable("enterprise_companion") { ++# sources = [ "main.cc" ] ++# deps = [ ":base" ] ++# ++# if (is_win) { ++# configs += [ "//build/config/win:windowed" ] ++# } ++# } ++#} + + group("all") { + testonly = true +-- +2.45.2 +
