diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-10-29 09:35:43 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-10-29 09:35:43 +0000 |
| commit | 704343381e435b306648a2d85a77a58e34478643 (patch) | |
| tree | 009e24c29e03885a4bd7bb17b673f62567395237 /www-client/firefox-bin | |
| parent | eb147001d2176fe9850e42017a6b1284baf865ff (diff) | |
gentoo auto-resync : 29:10:2023 - 09:35:42
Diffstat (limited to 'www-client/firefox-bin')
| -rw-r--r-- | www-client/firefox-bin/Manifest | 2 | ||||
| -rw-r--r-- | www-client/firefox-bin/firefox-bin-119.0-r2.ebuild (renamed from www-client/firefox-bin/firefox-bin-119.0-r1.ebuild) | 28 |
2 files changed, 9 insertions, 21 deletions
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest index ae56764ee813..58cb69c4caf0 100644 --- a/www-client/firefox-bin/Manifest +++ b/www-client/firefox-bin/Manifest @@ -399,5 +399,5 @@ DIST firefox-bin_x86_64-119.0.tar.bz2 80570627 BLAKE2B 3d7b26f7f7019f20dd01e74de EBUILD firefox-bin-115.3.1.ebuild 10924 BLAKE2B 7a1058b0ce053f2ee1e88d16ae4190df9d5d85d69a17d84540916fedff8e0e912fc36a2b0da958d2fb52380cdb1d9a076bc9e8ab3180b04f9dd53c7a0d6c6108 SHA512 4851d1b204c4d6f26fea7b167a4877089ca87e538382ebd57ad7695b6c7c9bb476b72b9449bfde29331e643a9a3f5698f58627f9cb641ab7d5ccadd9bf123e27 EBUILD firefox-bin-115.4.0.ebuild 10924 BLAKE2B 7a1058b0ce053f2ee1e88d16ae4190df9d5d85d69a17d84540916fedff8e0e912fc36a2b0da958d2fb52380cdb1d9a076bc9e8ab3180b04f9dd53c7a0d6c6108 SHA512 4851d1b204c4d6f26fea7b167a4877089ca87e538382ebd57ad7695b6c7c9bb476b72b9449bfde29331e643a9a3f5698f58627f9cb641ab7d5ccadd9bf123e27 EBUILD firefox-bin-118.0.2.ebuild 10949 BLAKE2B ffedddb41d31a1a428eb7a4adc359b1cc9f7d061dde3bd287bcece4fddcedc2a1e4480848a1bed726cbaee0e5b4ac7de3805a62161a73af4157d451f1c8da060 SHA512 04c89c492fefa6004e42ed3301b14fe790990ae8f64919c04f59d09d5948d1a5ee34bae38e7d80394cda6286626493370354f77ae430bd6dca6e5e3497b712a3 -EBUILD firefox-bin-119.0-r1.ebuild 10908 BLAKE2B ba82af6836172af8d3065f10081f723c2ebdd8815c86b5b56aba6e95ce98298441b639010eeaba521fb04bdde0fba73dec1ca59fcc8ef3ef0948eae78a1f90e3 SHA512 2bff9fe57339e8c13c21a11ba25777c628a4ce85583113ca4c97457d4a4ead875fc1dd65e212d4400c06dea3cb194b53aea8fd3d3b58d0117fc9fe3f28d52492 +EBUILD firefox-bin-119.0-r2.ebuild 10796 BLAKE2B 326396310d94a6679dd1fbab9c231f312be97034bd5cf17b96bdc929688eb80fb1cf29807efd5b616e90137112e8fd61459afbc09d17c3d794eaf57e84a6e508 SHA512 87318d9f4bda4845983024f92d4718790f6c6b44eaf61530088024c6da8f0b3625c7033cb89d168c794095e704f507adfe76e2bb03c0658951e7c43661bde99b MISC metadata.xml 520 BLAKE2B 4b540dd2d9ac3840061de8a73117f2859db156944826d22c1f74cbc0c35f6d305aa10ff45708eab016df725cfc741c99dec46f0078a29162982431892e86e477 SHA512 0c7183e35a4b0ca2ddd092786ebdeb5b41a431adf918f0c2e541a5ef1c235066586a46a50fa29c25e5a522930824f8662fa2fa7eed8c3895f74d85bef93cecb4 diff --git a/www-client/firefox-bin/firefox-bin-119.0-r1.ebuild b/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}:" \ |