From 9a4193cea93775342cc79d959b53a4849f1d7aa0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 00:02:55 +0000 Subject: [PATCH] www-client/chromium: sync with upstream --- .../chromium/chromium-127.0.6533.72.ebuild | 1 + .../chromium-127-enterprise-companion.patch | 44 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 www-client/chromium/files/chromium-127-enterprise-companion.patch diff --git a/www-client/chromium/chromium-127.0.6533.72.ebuild b/www-client/chromium/chromium-127.0.6533.72.ebuild index 85ccd0c..6911a74 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 0000000..76ce131 --- /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 +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 +--- 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 +