commit: ce63d29f57ba87b19b34e24b48a126cabd6a7264 Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> AuthorDate: Wed Jan 31 08:29:52 2024 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Wed Jan 31 08:30:49 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce63d29f
www-client/firefox: drop ppc64 patch, fix mold+lto+pgo error on 122.0 Closes: https://bugs.gentoo.org/923300 Closes: https://bugs.gentoo.org/923119 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> www-client/firefox/Manifest | 2 +- www-client/firefox/firefox-122.0.ebuild | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest index 47deeb610240..17e93556a8a9 100644 --- a/www-client/firefox/Manifest +++ b/www-client/firefox/Manifest @@ -200,7 +200,7 @@ DIST firefox-121.0.1-xh.xpi 409054 BLAKE2B b07e3e8e3c3a3104aa3cffa4a3399e4122511 DIST firefox-121.0.1-zh-CN.xpi 627860 BLAKE2B 70f95a3b17912ba26ad30e0a797d4a1540cca02ead6b3ab241337f7fb102ffcd0b2d7fcb4e4f41427b85eac04ba253c8c60798ad417f1f24cc1d60db8a581f34 SHA512 494f593e108e06b3a2efdf452231b8604c339b056afd00d293ff0661091a3700e456400144e5719909ccb38ac1ecd4082be214ae96e57ca8ffe46ee436e80c2b DIST firefox-121.0.1-zh-TW.xpi 630002 BLAKE2B 2cc8c5ddf78b59ae4636fff43eaa4167ed33a179fff638cee52f58c30cfa40f598ecc88d7c146a482a6d83910f00b41158610c2857721a443df77b218dc6dc8d SHA512 d764400c4931aac6fb493857d0d64a0a8bacbe532f9078da5ff39ec97d67c3883169a0386d1e4b8c327a8df83b2af4ef5337056ff137123f5a1375fd3979e721 DIST firefox-121.0.1.source.tar.xz 532719356 BLAKE2B c9931d38bb9c612000409ed54b2fbb190cabcb714cd559152f2f645a8a3a82934874d31e40fc298dca765dac94e4e0927b125e14cee325484ba0f9b1ed2cdc55 SHA512 7810850a922cb4a274ced6556e14256d3ff518a96f10a0f86d1f8e40daa0a8b1a5cfcc9cbf1391029d920944e94a9149951ee107a0e718a294954bb50b6ced2e -DIST firefox-122-patches-01.tar.xz 23432 BLAKE2B f94a8a12551ec8e6db3d2f8497e2455f9eedec76df4d52335f124c12c45003570900b38f6aafed9b109fd39fd40f65e87d6a9cb79cda8b486f897cd05fe1a714 SHA512 39b4c2db9bc6391ddfacc86ea558260fc8228022b1c790d09d516c3012d83e6d6fbb168ea0fa1a5381cf948e13d987b83483807f9f255aa13b6b9311a88989fe +DIST firefox-122-patches-02.tar.xz 23168 BLAKE2B bcb29800555dd5c919d10338ecaadb2e9591d2dcc8c07e06c4722bb95a053e5581b77212c963783d605894c6bbef4a88e44081c85340703ca57a1d567628cd96 SHA512 c1e995b937150a9e68a6c1c3ae5986aa9386382175cc1bf128c0daaf5009c684f5774fe4baaf7878fb7048fffe265aaa5179865a4d82095e609132258e83dd93 DIST firefox-122.0-ach.xpi 455274 BLAKE2B b7cb256c05d8cfcdeb5f48b3d53b28a8f6587057ffb893121bb4b11ca975f509f1541924fbb28d8dc26af52364aecd0556b3c44d148eca0bc8288c397baff6b9 SHA512 587a4dfde5edc3dea6cafb5d8bae8ed661f3075ac7fd4a3500c047ccc25195bf4d7b777b2332eba580a84f115e00b4abd69e33cf9d160b5563e625bfd3d8c3bf DIST firefox-122.0-af.xpi 410010 BLAKE2B 368b01cd67fcf8129ad207f84c4deb9d49b34a0eb21ab7f3e76dde098d0c4de79bb1b5e3d6714cab0d693f983033f99d37ca130c394b271378761da8a6c97595 SHA512 3149dfa8babb03eb00b3e89f3b2d94697c8ca9c127b5449441dc51fd26f9ad69d060f547fc304ac3476e024cd0d2c042fcea72679200ba03fe83fb23d13c2d4e DIST firefox-122.0-an.xpi 496349 BLAKE2B 3319f85e5bb23c2cbbf056be3b68afacdd56e01d9dc41da36de4fce40c0c50d2cdbf7c6b50a5005c2c5781c2ab5139b583def00e2cdaab08acfdec7c2918f81f SHA512 a6286496c59cbb15dbb0e6d9792558fb7ef7c902121faeb75aed72f63c95ebbfccc3c472f58af215aea8ac99612ce6965b53c82e37553eb0bf0c4f31d68e5787 diff --git a/www-client/firefox/firefox-122.0.ebuild b/www-client/firefox/firefox-122.0.ebuild index ebd0851a2c90..0eb450b24d74 100644 --- a/www-client/firefox/firefox-122.0.ebuild +++ b/www-client/firefox/firefox-122.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -FIREFOX_PATCHSET="firefox-122-patches-01.tar.xz" +FIREFOX_PATCHSET="firefox-122-patches-02.tar.xz" LLVM_MAX_SLOT=17 @@ -657,7 +657,7 @@ src_prepare() { # Workaround for bgo#917599 if has_version ">=dev-libs/icu-74.1" && use system-icu ; then - eapply "${WORKDIR}"/firefox-patches/0026-bmo-1862601-system-icu-74.patch + eapply "${WORKDIR}"/firefox-patches/*-bmo-1862601-system-icu-74.patch fi rm -v "${WORKDIR}"/firefox-patches/*-bmo-1862601-system-icu-74.patch || die @@ -985,6 +985,8 @@ src_configure() { if use clang ; then # Upstream only supports lld or mold when using clang. if tc-ld-is-mold ; then + # mold expects the -flto line from *FLAGS configuration, bgo#923119 + append-ldflags "-flto=thin" mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold else mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
