| 1 |
commit: 70a9fcbb41eb962d902a709ea122dc3e294905e6 |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 3 21:25:06 2017 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 3 21:25:06 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=70a9fcbb |
| 7 |
|
| 8 |
firefox: sync ebuilds with gentoo repo |
| 9 |
|
| 10 |
...{firefox-52.1.0.ebuild => firefox-52.1.0-r1.ebuild} | 12 +++++++++--- |
| 11 |
www-client/firefox/firefox-53.0.ebuild | 18 ++++++++++++------ |
| 12 |
2 files changed, 21 insertions(+), 9 deletions(-) |
| 13 |
|
| 14 |
diff --git a/www-client/firefox/firefox-52.1.0.ebuild b/www-client/firefox/firefox-52.1.0-r1.ebuild |
| 15 |
similarity index 96% |
| 16 |
rename from www-client/firefox/firefox-52.1.0.ebuild |
| 17 |
rename to www-client/firefox/firefox-52.1.0-r1.ebuild |
| 18 |
index dd2a00b..91b2a43 100644 |
| 19 |
--- a/www-client/firefox/firefox-52.1.0.ebuild |
| 20 |
+++ b/www-client/firefox/firefox-52.1.0-r1.ebuild |
| 21 |
@@ -366,15 +366,15 @@ pkg_preinst() { |
| 22 |
|
| 23 |
# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse |
| 24 |
# doesn't need to be forced into the LD_LIBRARY_PATH |
| 25 |
- if use pulseaudio && [ -d ${EPREFIX}/usr/$(get_libdir)/apulse ] ; then |
| 26 |
+ if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then |
| 27 |
einfo "APULSE found - Generating library symlinks for sound support" |
| 28 |
local lib |
| 29 |
pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die |
| 30 |
- for lib in "${EPREFIX}"/usr/$(get_libdir)/apulse/libpulse* ; do |
| 31 |
+ for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do |
| 32 |
# a quickpkg rolled by hand will grab symlinks as part of the package, |
| 33 |
# so we need to avoid creating them if they already exist. |
| 34 |
if ! [ -L ${lib##*/} ]; then |
| 35 |
- ln -s "${lib}" || die |
| 36 |
+ ln -s "${lib}" ${lib##*/} || die |
| 37 |
fi |
| 38 |
done |
| 39 |
popd &>/dev/null || die |
| 40 |
@@ -392,6 +392,12 @@ pkg_postinst() { |
| 41 |
local plugin |
| 42 |
for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done |
| 43 |
fi |
| 44 |
+ |
| 45 |
+ if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then |
| 46 |
+ elog "Apulse was detected at merge time on this system and so it will always be" |
| 47 |
+ elog "used for sound. If you wish to use pulseaudio instead please unmerge" |
| 48 |
+ elog "media-sound/apulse." |
| 49 |
+ fi |
| 50 |
} |
| 51 |
|
| 52 |
pkg_postrm() { |
| 53 |
|
| 54 |
diff --git a/www-client/firefox/firefox-53.0.ebuild b/www-client/firefox/firefox-53.0.ebuild |
| 55 |
index f56c0e0..a911896 100644 |
| 56 |
--- a/www-client/firefox/firefox-53.0.ebuild |
| 57 |
+++ b/www-client/firefox/firefox-53.0.ebuild |
| 58 |
@@ -24,7 +24,7 @@ if [[ ${MOZ_ESR} == 1 ]]; then |
| 59 |
fi |
| 60 |
|
| 61 |
# Patch version |
| 62 |
-PATCH="${PN}-53.0-patches-01" |
| 63 |
+PATCH="${PN}-53.0-patches-02" |
| 64 |
MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases" |
| 65 |
|
| 66 |
MOZCONFIG_OPTIONAL_WIFI=1 |
| 67 |
@@ -38,7 +38,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-lin |
| 68 |
|
| 69 |
SLOT="0" |
| 70 |
LICENSE="MPL-2.0 GPL-2 LGPL-2.1" |
| 71 |
-IUSE="bindist +gmp-autoupdate hardened hwaccel jack pgo rust selinux test" |
| 72 |
+IUSE="bindist +gmp-autoupdate hardened hwaccel jack nsplugin pgo rust selinux test" |
| 73 |
RESTRICT="!bindist? ( bindist )" |
| 74 |
|
| 75 |
PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCH}.tar.xz ) |
| 76 |
@@ -296,6 +296,12 @@ src_install() { |
| 77 |
"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ |
| 78 |
|| die |
| 79 |
|
| 80 |
+ if use nsplugin; then |
| 81 |
+ echo "pref(\"plugin.load_flash_only\", false);" >> \ |
| 82 |
+ "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ |
| 83 |
+ || die |
| 84 |
+ fi |
| 85 |
+ |
| 86 |
local plugin |
| 87 |
use gmp-autoupdate || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do |
| 88 |
echo "pref(\"media.${plugin}.autoupdate\", false);" >> \ |
| 89 |
@@ -365,15 +371,15 @@ pkg_preinst() { |
| 90 |
|
| 91 |
# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse |
| 92 |
# doesn't need to be forced into the LD_LIBRARY_PATH |
| 93 |
- if use pulseaudio && [ -d "${EPREFIX}"/usr/$(get_libdir)/apulse ] ; then |
| 94 |
+ if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then |
| 95 |
einfo "APULSE found - Generating library symlinks for sound support" |
| 96 |
local lib |
| 97 |
pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die |
| 98 |
- for lib in "${EPREFIX}"/usr/$(get_libdir)/apulse/libpulse* ; do |
| 99 |
+ for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do |
| 100 |
# a quickpkg rolled by hand will grab symlinks as part of the package, |
| 101 |
# so we need to avoid creating them if they already exist. |
| 102 |
if ! [ -L ${lib##*/} ]; then |
| 103 |
- ln -s "${lib}" || die |
| 104 |
+ ln -s "${lib}" ${lib##*/} || die |
| 105 |
fi |
| 106 |
done |
| 107 |
popd &>/dev/null || die |
| 108 |
@@ -392,7 +398,7 @@ pkg_postinst() { |
| 109 |
for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done |
| 110 |
fi |
| 111 |
|
| 112 |
- if use pulseaudio && [ -d "${EPREFIX}"/usr/$(get_libdir)/apulse ]; then |
| 113 |
+ if use pulseaudio && has_version ">=media-sound/apulse-0.1.9"; then |
| 114 |
elog "Apulse was detected at merge time on this system and so it will always be" |
| 115 |
elog "used for sound. If you wish to use pulseaudio instead please unmerge" |
| 116 |
elog "media-sound/apulse." |
Archives