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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4DAE2158089 for ; Sun, 29 Oct 2023 07:39:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 956A02BC015; Sun, 29 Oct 2023 07:39:02 +0000 (UTC) Received: from smtp.gentoo.org (dev.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 78FB82BC015 for ; Sun, 29 Oct 2023 07:39:02 +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 A2C22335C11 for ; Sun, 29 Oct 2023 07:39:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E6951E49 for ; Sun, 29 Oct 2023 07:38:59 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1698565051.e64a17210c65081ee68e1e63031e66e45b6bc09c.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/firefox-bin/firefox-bin-119.0-r1.ebuild www-client/firefox-bin/firefox-bin-119.0-r2.ebuild X-VCS-Directories: www-client/firefox-bin/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: e64a17210c65081ee68e1e63031e66e45b6bc09c X-VCS-Branch: master Date: Sun, 29 Oct 2023 07:38:59 +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: 9d20b223-95f4-4b1e-819b-0ecf003addbf X-Archives-Hash: 016a68bb372554b7bb218cbc88c7a11a commit: e64a17210c65081ee68e1e63031e66e45b6bc09c Author: Joonas Niilola gentoo org> AuthorDate: Sun Oct 29 07:37:31 2023 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Sun Oct 29 07:37:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e64a1721 www-client/firefox-bin: fix 119.0 when using apulse Closes: https://bugs.gentoo.org/916230 Signed-off-by: Joonas Niilola gentoo.org> ...119.0-r1.ebuild => firefox-bin-119.0-r2.ebuild} | 28 +++++++--------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/www-client/firefox-bin/firefox-bin-119.0-r1.ebuild b/www-client/firefox-bin/firefox-bin-119.0-r2.ebuild similarity index 97% rename from www-client/firefox-bin/firefox-bin-119.0-r1.ebuild rename to www-client/firefox-bin/firefox-bin-119.0-r2.ebuild index c9ed54000aeb..83ea6b313337 100644 --- a/www-client/firefox-bin/firefox-bin-119.0-r1.ebuild +++ b/www-client/firefox-bin/firefox-bin-119.0-r2.ebuild @@ -43,19 +43,7 @@ IUSE="+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland" RESTRICT="strip" -BDEPEND="app-arch/unzip - alsa? ( - !pulseaudio? ( - dev-util/patchelf - ) - )" - -DEPEND="alsa? ( - !pulseaudio? ( - media-sound/apulse - ) - )" - +BDEPEND="app-arch/unzip" RDEPEND="${DEPEND} !www-client/firefox-bin:0 !www-client/firefox-bin:esr @@ -212,13 +200,6 @@ src_install() { "${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \ "${ED}${MOZILLA_FIVE_HOME}"/plugin-container - # Patch alsa support - local apulselib= - if use alsa && ! use pulseaudio ; then - apulselib="${EPREFIX}/usr/$(get_libdir)/apulse" - patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die - fi - # Install policy (currently only used to disable application updates) insinto "${MOZILLA_FIVE_HOME}/distribution" newins "${FILESDIR}"/disable-auto-update.policy.json policies.json @@ -279,6 +260,13 @@ src_install() { cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die + # Add apulse support through our wrapper shell launcher, patchelf-method broken since 119.0. + # See bgo#916230 + local apulselib= + if use alsa && ! use pulseaudio ; then + apulselib="${EPREFIX}/usr/$(get_libdir)/apulse" + fi + sed -i \ -e "s:@NAME@:${app_name}:" \ -e "s:@EXEC@:${exec_command}:" \