[gentoo-commits] repo/gentoo:master commit in: www-client/firefox/, www-client/firefox/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Thomas Deutschmann" <whissi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/, www-client/firefox/files/
Date: Sat,  3 Oct 2020 18:09:44 +0000 (UTC)	[thread overview]
Message-ID: <1601748562.9c6fba02844af3e30cb81d6ec83c769f59494e1b.whissi@gentoo> (raw)

commit:     9c6fba02844af3e30cb81d6ec83c769f59494e1b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  3 16:24:02 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Oct  3 18:09:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c6fba02

www-client/firefox: synchronize with www-client/firefox-bin

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 www-client/firefox/files/gentoo-default-prefs.js |  1 -
 www-client/firefox/firefox-78.3.1.ebuild         | 17 +++++++++++------
 www-client/firefox/firefox-81.0.1.ebuild         | 17 +++++++++++------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/www-client/firefox/files/gentoo-default-prefs.js b/www-client/firefox/files/gentoo-default-prefs.js
index dceaf893e40..0407f5d3d23 100644
--- a/www-client/firefox/files/gentoo-default-prefs.js
+++ b/www-client/firefox/files/gentoo-default-prefs.js
@@ -4,7 +4,6 @@ pref("browser.urlbar.hideGoButton",        true);
 pref("accessibility.typeaheadfind",        true);
 pref("browser.shell.checkDefaultBrowser",  false);
 pref("browser.EULA.override",              true);
-pref("general.useragent.vendor",           "Gentoo");
 pref("general.useragent.locale",           "chrome://global/locale/intl.properties");
 pref("intl.locale.requested",              "");
 /* Disable DoH by default */

diff --git a/www-client/firefox/firefox-78.3.1.ebuild b/www-client/firefox/firefox-78.3.1.ebuild
index 23022d62897..92ff0b2c883 100644
--- a/www-client/firefox/firefox-78.3.1.ebuild
+++ b/www-client/firefox/firefox-78.3.1.ebuild
@@ -26,21 +26,24 @@ if [[ -n ${MOZ_ESR} ]] ; then
 	MOZ_PV="${MOZ_PV}esr"
 fi
 
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
 inherit autotools check-reqs desktop flag-o-matic gnome2-utils llvm \
 	multiprocessing pax-utils python-any-r1 toolchain-funcs \
 	virtualx xdg
 
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
 
 if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
 fi
 
 PATCH_URIS=(
 	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
 )
 
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${PN}-${MOZ_PV}.source.tar.xz
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz
 	${PATCH_URIS[@]}"
 
 DESCRIPTION="Firefox Web Browser"
@@ -240,7 +243,7 @@ mozilla_set_globals() {
 		fi
 
 		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${PN}-${MOZ_PV}-${lang}.xpi"
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P}-${lang}.xpi"
 		SRC_URI+=" )"
 		IUSE+=" l10n_${xflag/[_@]/-}"
 	done
@@ -893,7 +896,7 @@ src_install() {
 	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
 	local display_protocols="auto X11"
 	local icon="${PN}"
-	local name="Mozilla ${PN^}"
+	local name="Mozilla ${MOZ_PN^}"
 	local use_wayland="false"
 
 	if use wayland ; then
@@ -943,7 +946,7 @@ src_install() {
 	done
 
 	# Install generic wrapper script
-	rm "${ED}/usr/bin/${PN}" || die
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
 	newbin "${FILESDIR}/${PN}.sh" ${PN}
 
 	# Update wrapper
@@ -957,6 +960,8 @@ src_install() {
 
 		sed -i \
 			-e "s:@PREFIX@:${EPREFIX}/usr:" \
+			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+			-e "s:@APULSELIB_DIR@:${apulselib}:" \
 			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
 			"${wrapper}" \
 			|| die

diff --git a/www-client/firefox/firefox-81.0.1.ebuild b/www-client/firefox/firefox-81.0.1.ebuild
index e79df820254..91b83e6df4f 100644
--- a/www-client/firefox/firefox-81.0.1.ebuild
+++ b/www-client/firefox/firefox-81.0.1.ebuild
@@ -26,21 +26,24 @@ if [[ -n ${MOZ_ESR} ]] ; then
 	MOZ_PV="${MOZ_PV}esr"
 fi
 
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
 inherit autotools check-reqs desktop flag-o-matic gnome2-utils llvm \
 	multiprocessing pax-utils python-any-r1 toolchain-funcs \
 	virtualx xdg
 
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
 
 if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
 fi
 
 PATCH_URIS=(
 	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
 )
 
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${PN}-${MOZ_PV}.source.tar.xz
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz
 	${PATCH_URIS[@]}"
 
 DESCRIPTION="Firefox Web Browser"
@@ -240,7 +243,7 @@ mozilla_set_globals() {
 		fi
 
 		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${PN}-${MOZ_PV}-${lang}.xpi"
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P}-${lang}.xpi"
 		SRC_URI+=" )"
 		IUSE+=" l10n_${xflag/[_@]/-}"
 	done
@@ -893,7 +896,7 @@ src_install() {
 	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
 	local display_protocols="auto X11"
 	local icon="${PN}"
-	local name="Mozilla ${PN^}"
+	local name="Mozilla ${MOZ_PN^}"
 	local use_wayland="false"
 
 	if use wayland ; then
@@ -943,7 +946,7 @@ src_install() {
 	done
 
 	# Install generic wrapper script
-	rm "${ED}/usr/bin/${PN}" || die
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
 	newbin "${FILESDIR}/${PN}.sh" ${PN}
 
 	# Update wrapper
@@ -957,6 +960,8 @@ src_install() {
 
 		sed -i \
 			-e "s:@PREFIX@:${EPREFIX}/usr:" \
+			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+			-e "s:@APULSELIB_DIR@:${apulselib}:" \
 			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
 			"${wrapper}" \
 			|| die

next             reply	other threads:[~2020-10-03 18:09 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-03 18:09 Thomas Deutschmann [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-12 12:02 [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/, www-client/firefox/files/ Joonas Niilola
2025-03-04 21:01 Joonas Niilola
2025-03-03 20:17 Joonas Niilola
2023-11-20 18:34 Sam James
2023-06-26 21:49 Georgy Yakovlev
2023-04-11  5:14 Joonas Niilola
2023-01-23  7:07 Georgy Yakovlev
2022-06-09 13:48 Joonas Niilola
2021-08-11  1:38 Thomas Deutschmann
2020-12-10 15:19 Thomas Deutschmann
2020-04-12 13:14 Thomas Deutschmann
2020-04-02 21:19 Thomas Deutschmann
2020-03-30 13:47 Thomas Deutschmann
2020-03-30 11:46 Thomas Deutschmann
2020-03-12 14:16 Thomas Deutschmann
2020-03-11 19:21 Thomas Deutschmann
2020-02-14 13:09 Jory Pratt
2020-01-06 17:43 Jory Pratt
2019-12-13  1:16 Thomas Deutschmann
2019-10-22 19:28 Thomas Deutschmann
2019-10-06 16:25 Thomas Deutschmann
2019-09-18 21:29 Thomas Deutschmann
2018-12-13 15:45 Thomas Deutschmann
2018-11-04 15:27 Thomas Deutschmann
2018-11-04 14:54 Thomas Deutschmann
2018-10-02  9:00 Thomas Deutschmann
2018-09-08 13:34 Thomas Deutschmann
2018-06-28 21:42 Jory Pratt
2017-04-14  2:27 Ian Stakenvicius
2016-10-13 20:53 Ian Stakenvicius
2016-08-11  8:28 Andrew Savchenko
2016-07-06 21:28 Ian Stakenvicius
2016-06-08  2:33 Ian Stakenvicius
2016-04-29 18:17 Ian Stakenvicius
2015-12-16 18:40 Ian Stakenvicius
2015-08-23 13:17 Ian Stakenvicius

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:dceaf893e4 dfblob:0407f5d3d2 dfblob:23022d6289
dfblob:92ff0b2c88 dfblob:e79df82025 dfblob:91b83e6df4 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: www-client/firefox/, www-client/firefox/files/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1601748562.9c6fba02844af3e30cb81d6ec83c769f59494e1b.whissi@gentoo \
    --to=whissi@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox