[patch] Fix broken patchset, readd missing llvm/lto patches

0001-www-client-firefox-Fix-broken-patch-set.patch (text/plain), 3.91 KB, created by Jory A. Pratt on 2020-04-08 01:46:45 UTC

From aae11a70d9941d1b869b74685ea6ff6a8ea01b3b Mon Sep 17 00:00:00 2001
From: Jory Pratt <[e-mail]>
Date: Tue, 7 Apr 2020 20:45:36 -0500
Subject: [PATCH] www-client/firefox: Fix broken patch set

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Jory Pratt <[e-mail]>
---
 www-client/firefox/Manifest            | 2 +-
 www-client/firefox/firefox-75.0.ebuild | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index f040645173a..ac55061ecb0 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -436,7 +436,7 @@ DIST firefox-75.0-nl.xpi 542960 BLAKE2B dd99446c967bbb8bfa020037a65b0d3b94396e8f
 DIST firefox-75.0-nn-NO.xpi 542310 BLAKE2B e9c3c2065075fb4971135a4ce8497938a96327a09e987c35d08fbf9c74209c0ea48004758104ef980ae8ab7fd43cb3d156fbd20837e989b06ac529190c787e8a SHA512 b004e60bb1ce787c2029282c2f4f35700ab57e02ef9860335879abd8c891cce7c65906fd0f65a525fb90ec34f1fbab509dae3ff51798b582cd1b24229a3d9ea8
 DIST firefox-75.0-oc.xpi 557492 BLAKE2B b44b802726e7f094d74130ea21995e6763918223c329904bbeb0155883cb921cd5d9cb127dc65ae539e0c1928341d97a82b164b16be9c03020c0081d5d30c47c SHA512 f7ab0a605d306bf4ba0c481c46ed79be79650f4cb282a55f7cd81b204ffe6484a61d035ea5b939875eda87df8b86d64098aafe6f57a3c25e11994bd38ed283fb
 DIST firefox-75.0-pa-IN.xpi 594370 BLAKE2B c6fac1aa54d523ee6110120b45d50acb0fd2ad28d0c0b3be0711dee927565a378b8f5f63612c1902f341df48716f423fcf2c1a95de94fe1f176926db34fefb73 SHA512 3f65e017ee5d4e0b7fca64d7a23eee8e263a85043fbe7a939e835070cc1c8361f93f13955d047aa2410ee08d9998fbfd1b710c6632aa06183792b3a9e1439e6a
-DIST firefox-75.0-patches-2.tar.xz 19536 BLAKE2B e20490cef703975e76b9743c44667b0f6dca0c056b75c44b87c4e48adf47e92813597d1e0c2c066d5fbbffb23c5e9f3c532896ea29432647f923119c61f1f8bd SHA512 e4985128f3c169ec3fb39dc3de3b63e1727951339486b4bf6651302f0bca2f25485e53f73db036a7b14710a0896db76119764f0a2b32d7af3597c8e1fffb4592
+DIST firefox-75.0-patches-01.tar.xz 16972 BLAKE2B 3775119a1e309f30e8f18fb2a711d6c1733fb516970e408966ec206c906905c6d4db8ccf915aafa0584327998fb5158d86933a8e151345067a520c1515b3224a SHA512 d56a08abf9a681d335f87f4b763d8976f2a6a0b0bd1dec1e500ca5a4ff4ac85b010e9870f0f37f38a9f009fd6d9b39cf8260059b7151fdf6337ebe7ef40858c6
 DIST firefox-75.0-pl.xpi 556350 BLAKE2B de3951ced01eabbdca3c9db581f26e4d445352c8c376c9214450b7a465ee00c62659c856d8cc9c1bb22ebc0d71387ee2c30407139569a2f7e9616201f95b0713 SHA512 0e806776db435d9357d1c24c9466483ade5069176852cdf1728ee33e2f1ceff6d8690db5915939542ec393683e9d260b4323ca1ab27b9fee78cc9efa6e751e24
 DIST firefox-75.0-pt-BR.xpi 543958 BLAKE2B 4fbe69cef2c73a25c58268eb8b43b9240963877efff7a568f47499afbf956b45f09de5944e6def489150964d24a8d71c02583b3b168177b7e985af9d93903009 SHA512 5b53ad15b4ff101fde2b9c90ccd2fbf827e77c6b5664987b51334fe935a834b2fc564ac4a26a75024e65a2c7b10e1078a74c95ebc7307d59c59a5545d4882332
 DIST firefox-75.0-pt-PT.xpi 554698 BLAKE2B ede9681582b6213c0d089081ae8b7d5c0b1f13c737e8f7086909caf1ab5cae297a5a7828932e9554793380d758556154f8eb57693270b0a6b51d5256f5a337ff SHA512 e224d9c26f9706940ac59651bf32fb8aad36ef3fbcab0c50ae5de00b9136bcc75235aaa9139494c7f2043270a03125ec90e33f2defbd83480d1b80cfaa7d8915
diff --git a/www-client/firefox/firefox-75.0.ebuild b/www-client/firefox/firefox-75.0.ebuild
index 6661604f0cc..f4deaed05ad 100644
--- a/www-client/firefox/firefox-75.0.ebuild
+++ b/www-client/firefox/firefox-75.0.ebuild
@@ -27,7 +27,7 @@ if [[ ${MOZ_ESR} == 1 ]] ; then
 fi
 
 # Patch version
-PATCH="${PN}-75.0-patches-2"
+PATCH="${PN}-75.0-patches-01"
 
 MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
 MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
@@ -315,6 +315,9 @@ src_unpack() {
 src_prepare() {
 	eapply "${WORKDIR}/firefox"
 
+	eapply "${FILESDIR}/${PN}-73.0_fix_lto_pgo_builds.patch"
+	eapply "${FILESDIR}/${PN}-73.0_fix_llvm9.patch"
+
 	# Allow user to apply any additional patches without modifing ebuild
 	eapply_user
 
-- 
2.26.0