| 1 |
commit: fb070946c79bef8356e120983461a5099bb9085f |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 3 17:43:28 2017 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 3 17:46:25 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb070946 |
| 7 |
|
| 8 |
www-client/firefox-bin: ensure apulse will not be loaded if USE=-pulseaudio |
| 9 |
|
| 10 |
If a system has apulse < 0.1.9 installed but USE=-pulseaudio set, then |
| 11 |
the previous attempt at getting apulse working would still try and load |
| 12 |
it, causing firefox-bin to crash. This commit addresses that by only |
| 13 |
attempting to load apulse if USE=pulseaudio is set. |
| 14 |
|
| 15 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 16 |
|
| 17 |
...firefox-bin-52.1.0-r1.ebuild => firefox-bin-52.1.0-r2.ebuild} | 5 +++-- |
| 18 |
.../{firefox-bin-53.0-r1.ebuild => firefox-bin-53.0-r2.ebuild} | 9 +++++---- |
| 19 |
2 files changed, 8 insertions(+), 6 deletions(-) |
| 20 |
|
| 21 |
diff --git a/www-client/firefox-bin/firefox-bin-52.1.0-r1.ebuild b/www-client/firefox-bin/firefox-bin-52.1.0-r2.ebuild |
| 22 |
similarity index 97% |
| 23 |
rename from www-client/firefox-bin/firefox-bin-52.1.0-r1.ebuild |
| 24 |
rename to www-client/firefox-bin/firefox-bin-52.1.0-r2.ebuild |
| 25 |
index ed5784e0f7b..63712e923b1 100644 |
| 26 |
--- a/www-client/firefox-bin/firefox-bin-52.1.0-r1.ebuild |
| 27 |
+++ b/www-client/firefox-bin/firefox-bin-52.1.0-r2.ebuild |
| 28 |
@@ -136,10 +136,11 @@ src_install() { |
| 29 |
|
| 30 |
# Create /usr/bin/firefox-bin |
| 31 |
dodir /usr/bin/ |
| 32 |
+ local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "") |
| 33 |
cat <<-EOF >"${ED}"usr/bin/${PN} |
| 34 |
#!/bin/sh |
| 35 |
unset LD_PRELOAD |
| 36 |
- LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse:/opt/firefox/" \\ |
| 37 |
+ LD_LIBRARY_PATH="${apulselib}/opt/firefox/" \\ |
| 38 |
GTK_PATH=/usr/lib/gtk-3.0/ \\ |
| 39 |
exec /opt/${MOZ_PN}/${MOZ_PN} "\$@" |
| 40 |
EOF |
| 41 |
@@ -170,7 +171,7 @@ pkg_postinst() { |
| 42 |
einfo |
| 43 |
fi |
| 44 |
use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed" |
| 45 |
- use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without apulse or pulseaudio installed" |
| 46 |
+ use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed" |
| 47 |
|
| 48 |
# Update mimedb for the new .desktop file |
| 49 |
fdo-mime_desktop_database_update |
| 50 |
|
| 51 |
diff --git a/www-client/firefox-bin/firefox-bin-53.0-r1.ebuild b/www-client/firefox-bin/firefox-bin-53.0-r2.ebuild |
| 52 |
similarity index 95% |
| 53 |
rename from www-client/firefox-bin/firefox-bin-53.0-r1.ebuild |
| 54 |
rename to www-client/firefox-bin/firefox-bin-53.0-r2.ebuild |
| 55 |
index 69ec314d827..da78aea4869 100644 |
| 56 |
--- a/www-client/firefox-bin/firefox-bin-53.0-r1.ebuild |
| 57 |
+++ b/www-client/firefox-bin/firefox-bin-53.0-r2.ebuild |
| 58 |
@@ -23,7 +23,7 @@ MOZ_P="${MOZ_PN}-${MOZ_PV}" |
| 59 |
|
| 60 |
MOZ_HTTP_URI="http://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/" |
| 61 |
|
| 62 |
-inherit eutils pax-utils fdo-mime gnome2-utils mozlinguas-v2 |
| 63 |
+inherit eutils pax-utils fdo-mime gnome2-utils mozlinguas-v2 nsplugins |
| 64 |
|
| 65 |
DESCRIPTION="Firefox Web Browser" |
| 66 |
SRC_URI="${SRC_URI} |
| 67 |
@@ -135,10 +135,11 @@ src_install() { |
| 68 |
|
| 69 |
# Create /usr/bin/firefox-bin |
| 70 |
dodir /usr/bin/ |
| 71 |
+ local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "") |
| 72 |
cat <<-EOF >"${ED}"usr/bin/${PN} |
| 73 |
#!/bin/sh |
| 74 |
unset LD_PRELOAD |
| 75 |
- LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse:/opt/firefox/" \\ |
| 76 |
+ LD_LIBRARY_PATH="${apulselib}/opt/firefox/" \\ |
| 77 |
GTK_PATH=/usr/lib/gtk-3.0/ \\ |
| 78 |
exec /opt/${MOZ_PN}/${MOZ_PN} "\$@" |
| 79 |
EOF |
| 80 |
@@ -149,7 +150,7 @@ src_install() { |
| 81 |
echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN} |
| 82 |
doins "${T}"/10${PN} || die |
| 83 |
|
| 84 |
- # Plugins dir |
| 85 |
+ # Plugins dir, still used for flash |
| 86 |
share_plugins_dir |
| 87 |
|
| 88 |
# Required in order to use plugins and even run firefox on hardened. |
| 89 |
@@ -169,7 +170,7 @@ pkg_postinst() { |
| 90 |
einfo |
| 91 |
fi |
| 92 |
use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed" |
| 93 |
- use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without apulse or pulseaudio installed" |
| 94 |
+ use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed" |
| 95 |
|
| 96 |
# Update mimedb for the new .desktop file |
| 97 |
fdo-mime_desktop_database_update |
Archives