Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/, www-client/firefox/files/
Date: Sat, 03 Oct 2020 18:09:48
Message-Id: 1601748562.9c6fba02844af3e30cb81d6ec83c769f59494e1b.whissi@gentoo
1 commit: 9c6fba02844af3e30cb81d6ec83c769f59494e1b
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 3 16:24:02 2020 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 3 18:09:22 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c6fba02
7
8 www-client/firefox: synchronize with www-client/firefox-bin
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.1
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 www-client/firefox/files/gentoo-default-prefs.js | 1 -
14 www-client/firefox/firefox-78.3.1.ebuild | 17 +++++++++++------
15 www-client/firefox/firefox-81.0.1.ebuild | 17 +++++++++++------
16 3 files changed, 22 insertions(+), 13 deletions(-)
17
18 diff --git a/www-client/firefox/files/gentoo-default-prefs.js b/www-client/firefox/files/gentoo-default-prefs.js
19 index dceaf893e40..0407f5d3d23 100644
20 --- a/www-client/firefox/files/gentoo-default-prefs.js
21 +++ b/www-client/firefox/files/gentoo-default-prefs.js
22 @@ -4,7 +4,6 @@ pref("browser.urlbar.hideGoButton", true);
23 pref("accessibility.typeaheadfind", true);
24 pref("browser.shell.checkDefaultBrowser", false);
25 pref("browser.EULA.override", true);
26 -pref("general.useragent.vendor", "Gentoo");
27 pref("general.useragent.locale", "chrome://global/locale/intl.properties");
28 pref("intl.locale.requested", "");
29 /* Disable DoH by default */
30
31 diff --git a/www-client/firefox/firefox-78.3.1.ebuild b/www-client/firefox/firefox-78.3.1.ebuild
32 index 23022d62897..92ff0b2c883 100644
33 --- a/www-client/firefox/firefox-78.3.1.ebuild
34 +++ b/www-client/firefox/firefox-78.3.1.ebuild
35 @@ -26,21 +26,24 @@ if [[ -n ${MOZ_ESR} ]] ; then
36 MOZ_PV="${MOZ_PV}esr"
37 fi
38
39 +MOZ_PN="${PN%-bin}"
40 +MOZ_P="${MOZ_PN}-${MOZ_PV}"
41 +
42 inherit autotools check-reqs desktop flag-o-matic gnome2-utils llvm \
43 multiprocessing pax-utils python-any-r1 toolchain-funcs \
44 virtualx xdg
45
46 -MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
47 +MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
48
49 if [[ ${PV} == *_rc* ]] ; then
50 - MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
51 + MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
52 fi
53
54 PATCH_URIS=(
55 https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
56 )
57
58 -SRC_URI="${MOZ_SRC_BASE_URI}/source/${PN}-${MOZ_PV}.source.tar.xz
59 +SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz
60 ${PATCH_URIS[@]}"
61
62 DESCRIPTION="Firefox Web Browser"
63 @@ -240,7 +243,7 @@ mozilla_set_globals() {
64 fi
65
66 SRC_URI+=" l10n_${xflag/[_@]/-}? ("
67 - SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${PN}-${MOZ_PV}-${lang}.xpi"
68 + SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P}-${lang}.xpi"
69 SRC_URI+=" )"
70 IUSE+=" l10n_${xflag/[_@]/-}"
71 done
72 @@ -893,7 +896,7 @@ src_install() {
73 local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
74 local display_protocols="auto X11"
75 local icon="${PN}"
76 - local name="Mozilla ${PN^}"
77 + local name="Mozilla ${MOZ_PN^}"
78 local use_wayland="false"
79
80 if use wayland ; then
81 @@ -943,7 +946,7 @@ src_install() {
82 done
83
84 # Install generic wrapper script
85 - rm "${ED}/usr/bin/${PN}" || die
86 + [[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
87 newbin "${FILESDIR}/${PN}.sh" ${PN}
88
89 # Update wrapper
90 @@ -957,6 +960,8 @@ src_install() {
91
92 sed -i \
93 -e "s:@PREFIX@:${EPREFIX}/usr:" \
94 + -e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
95 + -e "s:@APULSELIB_DIR@:${apulselib}:" \
96 -e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
97 "${wrapper}" \
98 || die
99
100 diff --git a/www-client/firefox/firefox-81.0.1.ebuild b/www-client/firefox/firefox-81.0.1.ebuild
101 index e79df820254..91b83e6df4f 100644
102 --- a/www-client/firefox/firefox-81.0.1.ebuild
103 +++ b/www-client/firefox/firefox-81.0.1.ebuild
104 @@ -26,21 +26,24 @@ if [[ -n ${MOZ_ESR} ]] ; then
105 MOZ_PV="${MOZ_PV}esr"
106 fi
107
108 +MOZ_PN="${PN%-bin}"
109 +MOZ_P="${MOZ_PN}-${MOZ_PV}"
110 +
111 inherit autotools check-reqs desktop flag-o-matic gnome2-utils llvm \
112 multiprocessing pax-utils python-any-r1 toolchain-funcs \
113 virtualx xdg
114
115 -MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
116 +MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
117
118 if [[ ${PV} == *_rc* ]] ; then
119 - MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
120 + MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
121 fi
122
123 PATCH_URIS=(
124 https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
125 )
126
127 -SRC_URI="${MOZ_SRC_BASE_URI}/source/${PN}-${MOZ_PV}.source.tar.xz
128 +SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz
129 ${PATCH_URIS[@]}"
130
131 DESCRIPTION="Firefox Web Browser"
132 @@ -240,7 +243,7 @@ mozilla_set_globals() {
133 fi
134
135 SRC_URI+=" l10n_${xflag/[_@]/-}? ("
136 - SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${PN}-${MOZ_PV}-${lang}.xpi"
137 + SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P}-${lang}.xpi"
138 SRC_URI+=" )"
139 IUSE+=" l10n_${xflag/[_@]/-}"
140 done
141 @@ -893,7 +896,7 @@ src_install() {
142 local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
143 local display_protocols="auto X11"
144 local icon="${PN}"
145 - local name="Mozilla ${PN^}"
146 + local name="Mozilla ${MOZ_PN^}"
147 local use_wayland="false"
148
149 if use wayland ; then
150 @@ -943,7 +946,7 @@ src_install() {
151 done
152
153 # Install generic wrapper script
154 - rm "${ED}/usr/bin/${PN}" || die
155 + [[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
156 newbin "${FILESDIR}/${PN}.sh" ${PN}
157
158 # Update wrapper
159 @@ -957,6 +960,8 @@ src_install() {
160
161 sed -i \
162 -e "s:@PREFIX@:${EPREFIX}/usr:" \
163 + -e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
164 + -e "s:@APULSELIB_DIR@:${apulselib}:" \
165 -e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
166 "${wrapper}" \
167 || die
Report Message
Find on MARC Find on Google Groups