commit: 046e42faeeafef8cee1ea8b64b99023fc3c01319
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 22 10:40:45 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Oct 22 10:42:53 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=046e42fa
www-client/firefox: move patches to patch set
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
www-client/firefox/Manifest | 2 +-
www-client/firefox/firefox-60.2.2.ebuild | 7 +------
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index b926d48ce56..a9f7de26687 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -91,7 +91,7 @@ DIST firefox-52.9.0esr-xh.xpi 441173 BLAKE2B
3e1b907a7659c639d17d25a1825f4728532
DIST firefox-52.9.0esr-zh-CN.xpi 461679 BLAKE2B
745b2cfb86e93a379e13fa73b7e3721bae06694768316e31a2aed608e3050f585a9603375cd35b90affca11b3e5e44401b1e676f9c8050ade287ed0feb442a7a
SHA512
ca62e0e2ab075086741159b185b5eba44c6bdfc29fd9ba1cf25808f127c1aed8875ea61c1c33e4f742fa26af4455a8873730f96ad9c7bec1f66aed0595f253f1
DIST firefox-52.9.0esr-zh-TW.xpi 453068 BLAKE2B
84e08ea4fd119db1f1c6f84b212fbbb5d6999c5ac6010c0e7836d8734726d281107f3d91ba7bac1aeaf855dc36d3b018ae3913dccdbe2b11aad02a8d8aaa893c
SHA512
a99042ef7d00820e341dfcf2c45a8b5bd77eaf2cc8ecf0ff5ee982b7bd9beac7cb4bf051c57ef3b7a5d9b67cd35858dca396d21e65718e248f3b1fdba5273999
DIST firefox-52.9.0esr.source.tar.xz 214087304 BLAKE2B
eba5305ae3fc9a4306cbcbcd8d4610272ca5b75e369367961e9d94919b003de8aae8f3c58fe1c628787d98105a85fab575ae2b051e92a0b35bbb8b402c100766
SHA512
bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9
-DIST firefox-60.0-patches-03.tar.xz 111764 BLAKE2B
dd6fca1a7dad526cf1bdebb606773fab6bbb18e3cd601252f5b627e3d5ccb50a60bdc3ca228b1ed57d8b2334275fe5ef2669f8c98f8acf278effdb9dc7fc61df
SHA512
24a09df0e785cd9ba71ae6baee33ef159c1fc3b580784f7d20a775dc846aaa51d660eca67e284960af72651d245236623a0736695c76be75a8b395e5b69ba1ce
+DIST firefox-60.0-patches-04.tar.xz 120496 BLAKE2B
4b4fd58a91d8fd9603c3a7bdb669f275f7cbd7b9add7c790a2e326f46a540e77a390e9da3f85e81feee8e5354cb25c93e140fb2f721cdcd0fe197b7c24ea0091
SHA512
d8aaa1fafe22dcef8cba609ba6e2d322c18b46f4d3b91897696651958108f887510a068295b55bb21d84b660bbe7574a6533a57d8e26f96d2877139864dba828
DIST firefox-60.2.2esr-ach.xpi 496840 BLAKE2B
1419b3ee223a1e5505d6d596068f68c4d3f6df3152112b877926b23515d33f701aeeeac9ccc7a1d2fca828ceb314a6e1fd2fe4c1619283dbbe763ff05a3e35ac
SHA512
765d6859e15189d410cb08d42ca565de42f56413e7d4fb88c1d500eaf199c32089e2dd4a567681e9ff083995378a8dc220a46ba7740847096572f4de7a49c1e2
DIST firefox-60.2.2esr-af.xpi 487308 BLAKE2B
f9cbbaa1d7ddd32f13d0d0181fc669bf2602dab285733e360d3304a3b19ef4e6d33330c1b58e3f8918a77050f2e0767e8acbd2baeafc4f645820d6a249f24dab
SHA512
b272b4c3a032e11db1db44be0a2c3e0734b0a2029cf5cc130877ee6f288b4c7c47cd676da7ef369d2835025540c03f676f4906c6655b4e738f9b36635bc397dc
DIST firefox-60.2.2esr-an.xpi 520494 BLAKE2B
304bc120fb2e1cc3dbf9ce138d9c69e27ddaa8680814d66a5e86c0ab1fe1ef24d684549f5bc71c8ab4bcad6285fdfb97b1683a2606305bc3ca7f07f1811cb3a9
SHA512
5263e17bb9ae3ae4bfdc8952a749508fca145a5f1fc80768df5ac69328d7f34d37ace69068b18010e91f300dc359b653d62a227c66b2f23716c97f53fb34ef5c
diff --git a/www-client/firefox/firefox-60.2.2.ebuild
b/www-client/firefox/firefox-60.2.2.ebuild
index 5e93109b74c..3c472e9ddfc 100644
--- a/www-client/firefox/firefox-60.2.2.ebuild
+++ b/www-client/firefox/firefox-60.2.2.ebuild
@@ -27,7 +27,7 @@ if [[ ${MOZ_ESR} == 1 ]]; then
fi
# Patch version
-PATCH="${PN}-60.0-patches-03"
+PATCH="${PN}-60.0-patches-04"
MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases";
MOZCONFIG_OPTIONAL_WIFI=1
@@ -127,11 +127,6 @@ src_prepare() {
rm "${WORKDIR}/firefox/2005_ffmpeg4.patch"
eapply "${WORKDIR}/firefox"
- eapply "${FILESDIR}"/bug_1461221.patch
- eapply "${FILESDIR}"/${PN}-60.0-blessings-TERM.patch # 654316
- eapply
"${FILESDIR}"/${PN}-60.0-missing-errno_h-in-SandboxOpenedFiles_cpp.patch
- eapply "${FILESDIR}"/${PN}-60.0-update-cc-to-honor-CC.patch
-
# Enable gnomebreakpad
if use debug ; then
sed -i -e
"s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
