commit: 6c11d921ca0d6135ca9f4036b03662aad522d878 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Tue Jul 7 13:46:14 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Tue Jul 7 13:46:25 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c11d921
www-client/firefox: rev bump for new patch set Closes: https://bugs.gentoo.org/730606 Closes: https://bugs.gentoo.org/730986 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> www-client/firefox/Manifest | 2 +- .../{firefox-78.0.1.ebuild => firefox-78.0.1-r1.ebuild} | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest index a95b00107c1..f22ce0f93cb 100644 --- a/www-client/firefox/Manifest +++ b/www-client/firefox/Manifest @@ -369,7 +369,7 @@ DIST firefox-77.0.1-xh.xpi 478153 BLAKE2B dcd5c4e59100cd837b39e4203d4d4627265366 DIST firefox-77.0.1-zh-CN.xpi 596100 BLAKE2B 440edc453f303cb4d90f9b665bd0ab421b3dd8849fe645ab02dff2111c7c1efe7c045f8c9febb68d536a51f10f4cbb496eafa39071af6431d11428d0638426fd SHA512 80aa55cc304cddd9fc299b1601ca20642129d23dac1807647fc7e14dcd868825b239baa239809ffb459c1685042e1433699bb3f9d86553eae83f8919fc1a32c2 DIST firefox-77.0.1-zh-TW.xpi 595265 BLAKE2B 305b43f078a6696f63f721669180b502c2211a7a5d40682f4148e33015f921346865fb3df55a5b8a56fe92a6a86a3ab0ff0bd3f2cd0318e2299ab8dc17c70898 SHA512 5ab6fb6973146b47d5886c93481e010dc8dac0efe0f6ec4f8897cde2539a52a28850b460c27067657ef8a66ab555bce6201da6a3c1f27bc56214f1d9329674af DIST firefox-77.0.1.source.tar.xz 334037816 BLAKE2B 94aea1f4b39422333aeda71d296087f3309b595331488666641b20660607373d59f90d6840bafac6f83c3b5fb952f1a5d44a0972549ff9cf9a35a5036eb1565d SHA512 9e02e2842d18b9c94b24457788f117fad4730ca21d05ef8208eb85c6f58da3b0e75fcae8c8ebd38f69b86325b26684d0e5409b3d341898fe28b607e8bd949ef2 -DIST firefox-78.0-patches-01.tar.xz 19424 BLAKE2B 06cca8aeca5374a2d4fca9207e48f80a5885e9ebd358c0288bd3399490d93b11a14bb533b5adbef3c5d12a8ce7c84b8544aa4792d95884bd9b36c1ece723bc2c SHA512 a96f980478da59c420ed44de5578894eb109f59f19512122c6a5a413f46f5f6058a8321205e72ec760f708169a1a4f13c05e2e45a7d633dcbbf25050c5410d52 +DIST firefox-78.0-patches-02.tar.xz 24120 BLAKE2B 90195a3bf42c102e6109aa41ba2bb1adf6bc95622ba27d68c5d7cdeb37d27444cb4dcd4f3c3dfe78032a934fa03dfd54307c5e20208bd7db6dcfb018c06f1efd SHA512 3eb060152e247a46820b689b0c84aade089701298439ce50506154adc4431d8bb2956fe5750beb8375eb5f5726d00e0be263136ea7673c93d4c8476183b87edd DIST firefox-78.0.1-ach.xpi 500667 BLAKE2B a1ba9db92617ec623d354bfc8f3dd52f297769101b5b9c63d1d13ee895d2622cc10c97af4bf18eca5c610bfc77546ade4da3d8c99c7c639270678fca5654e369 SHA512 0f83f560cef93b77f781426fddd675a90e139ed05fee870196ea04bb97cff271446683f115daa0b58647eb78506a83fa4affb5f39af4f8ce7ccc1d930df9c5b5 DIST firefox-78.0.1-af.xpi 444090 BLAKE2B 9be401ecfad88706967aad2f76f4508f737b119e137a47f0df15c851ea30993fb311f8eb7b50771cbe88c5a7728b91bec45d33f9971b42d71d565fb559ee19ba SHA512 aafad9e31c13848a064bf4d688782042f2030d8c1c139e1ec471ac8ccd19825503ce001cf469afd6f404a0ce9b08b9160e5969ba10b9c7555e415ad2f31db25f DIST firefox-78.0.1-an.xpi 511473 BLAKE2B 4aa210bff8e434768e0257c3124af97e9fbfe512a0422e5dad40b36c28b4bb2c3fbbdbdb5f00d0f61eb4e97d21277ec807613ebe63ede38c8974f556138f209c SHA512 46bc9684c5028a303bd5991fd0bbc35ef1cb00dad8b24e76db309d6b8bb559a5a338800479151cc4bb3682c32f5932971ae08dea22f0f7bf2c9379777d6cc883 diff --git a/www-client/firefox/firefox-78.0.1.ebuild b/www-client/firefox/firefox-78.0.1-r1.ebuild similarity index 99% rename from www-client/firefox/firefox-78.0.1.ebuild rename to www-client/firefox/firefox-78.0.1-r1.ebuild index 33497879af4..499062c25a2 100644 --- a/www-client/firefox/firefox-78.0.1.ebuild +++ b/www-client/firefox/firefox-78.0.1-r1.ebuild @@ -28,7 +28,7 @@ if [[ ${MOZ_ESR} == 1 ]] ; then fi # Patch version -PATCH="${PN}-78.0-patches-01" +PATCH="${PN}-78.0-patches-02" MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"; MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/${PN}-${MOZ_PV}.source.tar.xz" @@ -284,8 +284,6 @@ src_unpack() { } src_prepare() { - # bug 730986 -- causing more harm than it helps - rm "${WORKDIR}"/firefox/0027-bmo-1618914-Wayland-Fall-back-to-ftruncate-if-posix_.patch eapply "${WORKDIR}/firefox" # Make LTO respect MAKEOPTS @@ -294,6 +292,12 @@ src_prepare() { "${S}"/build/moz.configure/lto-pgo.configure \ || die "sed failed to set num_cores" + # Make ICU respect MAKEOPTS + sed -i \ + -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \ + "${S}"/intl/icu_sources_data.py \ + || die "sed failed to set num_cores" + # Allow user to apply any additional patches without modifing ebuild eapply_user
