From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B8200159C96 for ; Mon, 29 Jul 2024 22:43:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1BBDE2B4E; Mon, 29 Jul 2024 22:43:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D684EE2B4E for ; Mon, 29 Jul 2024 22:43:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F41C033BED4 for ; Mon, 29 Jul 2024 22:43:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2F0461D23 for ; Mon, 29 Jul 2024 22:43:55 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1722293022.ea8d28aa98aee00aafd19a81032dc6c9cde530c5.kangie@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/, www-client/chromium/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/chromium/chromium-127.0.6533.72.ebuild www-client/chromium/files/chromium-127-enterprise-companion.patch X-VCS-Directories: www-client/chromium/ www-client/chromium/files/ X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: ea8d28aa98aee00aafd19a81032dc6c9cde530c5 X-VCS-Branch: master Date: Mon, 29 Jul 2024 22:43:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9d49e498-949d-4d18-a885-99920f4d223a X-Archives-Hash: 93460be0ce7507e2f9681df6c81103f5 commit: ea8d28aa98aee00aafd19a81032dc6c9cde530c5 Author: Matt Jolly gentoo org> AuthorDate: Mon Jul 29 22:41:57 2024 +0000 Commit: Matt Jolly gentoo 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 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 +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 +