gentoo auto-resync : 27:06:2023 - 01:33:47

3 files changed, 35 insertions, 2 deletions

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 01dc4930349c..b782072ab537 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,5 +1,6 @@
 AUX disable-auto-update.policy.json 53 BLAKE2B f8df63721191d84d8f1ceec263f63c44fd5dadeae0939baf9a4a6b1852516722b2a3d94b8d403cc7b6c6b525d5236f357ab65a72d716aab1f5bef47800b5a18c SHA512 5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308
 AUX distribution.ini 1090 BLAKE2B d1ec76caf937a8d3d0898979c236b8cc39004d2d2c467da16356350fa59938f75f43a2b6830783ea4193cfb896a0d39c0b147527e0459ea5b4e6963b6e1b363a SHA512 6b7221646aeb7c8e08dcb800e54263407ec6cc8529dcc4438d52b36a5bb59431396a561958d405a33d0f455720fc1621adae4a667ec04e612c8b142eb6e80092
+AUX firefox-114-ppc64-profiler.patch 777 BLAKE2B 404fc4a1154b8bc1e9650e959157aa8f4e98b58004040a5f69dc66046fd4192bba60b02a37ac3768896759e7b6b01a468a21b66d87cc423bf62c65ee9f6b79f9 SHA512 cda1fa2ed5312472f17dc43699e82ced7d76f274f34e88edb3d617edeaea68154b3c9a95d9651af89851d9a19fa566fe9af871a2a2ec953020976f55ba728555
 AUX firefox-114-ppc64-webrtc.patch 1606 BLAKE2B ce68baec971ec54544c66879c973334e4676b75e80b143122c09ca33d60580f7002926f9f3c76bbe28a484b7975fd3a958b0072f7af439b1e05505f11ebd109c SHA512 a4f86903a891a6027c360d037fe4967e9778497f1a6edde8eeef804dbcd80591e7be36574ed9de59d8fea14dcf68a566d0184b3fb81dd389742db261d10c5f2c
 AUX firefox-r1.sh 2836 BLAKE2B f2a80753f78bcae89f52ca161a0c558c3df5dd40d52f3aecdd1999dced5b025d222399d6603df17116539376f86ecf9cb615c592f7f6953876655609a69c0ac2 SHA512 8f174aa111416ebd2a092bbfd906c1b8e7fc7100da484a5d337c07cedbc761c443efa777df7340526da0f1116291550db08e150de326067b49fd4547db7f7a88
 AUX gentoo-default-prefs.js 570 BLAKE2B dd38592aa2a1e26185bb39ad95594dfcc57343e1027d7b125a82531c70e4cffe1f2a19519e1f3c07129faa5012b909bd45e6f65f05ac43f0503c752178b5904c SHA512 2b93206b979aa7cf88a6141805219db0a5134ea87c92a8f9a4bd16bc102bf6ed3d55c77f2f47a300262bb2848b878e8881c0037434441f13ddf1826661e7c6ff
@@ -512,5 +513,5 @@ EBUILD firefox-102.11.0.ebuild 36934 BLAKE2B c220162fca46646a54dbfdbffd8f1f48d7d
 EBUILD firefox-102.12.0.ebuild 36934 BLAKE2B c220162fca46646a54dbfdbffd8f1f48d7dd5bbb89fd172311eeafc2c151ac0f99741e45f79beaee5cf14e76818814770101ff806fe063595d0d0e1fede65691 SHA512 326871f23739414945ff6213c68fd17806b1a8195040a0be836f07b558d1ff67786f5179671f1a7eedbd9c4035f200954acbefe85ccbe5cfb4b31708824d7448
 EBUILD firefox-113.0.1.ebuild 41681 BLAKE2B c55860e10bb0e3438e91054ffb54722e4336181698ae62b94bf37389f139dd3936e612637446adcaba9d115b66e291e13914ca07c2d1e95f87bd1e79550d908a SHA512 440c8f436b05093f2528378e79d0eaf90bb01562530bffb55b535382de38a7cbe6486730f7c83222917bd220e9dfc03918757747b7aafbf086a046ba81757488
 EBUILD firefox-113.0.2.ebuild 41932 BLAKE2B d1c0bf0b9391896ef853224a1aea274e6ae933cbfd437221d8fc189323625ccc0568f3ed82094bd4575620a4e121bc652556b8a62cd19b2ab9ca70083a575165 SHA512 a241b516ee3302458c2bd99bb40a3b8e3e6af7955308493fc17b5c73ab8c486cec08b62bdeabd2247a505351edb0ee5c9957320f3b4b0345e7143501a4aa6d5c
-EBUILD firefox-114.0.ebuild 42865 BLAKE2B 63bd8a94b2f5fbeb2fd5e906593c14f0839d46283c0796940b8092543eee1ad89d2cab27a36b68661d523b953190a0804efef8e02c169770f4ba689afa7d27a6 SHA512 147a8ad223ac92ea1fc0e2093180de75b4460ecea862d9e240180ed246b43def7633ee3a1d3084801781ad55dc60f9dcedf038a77e8436513ca56cdf9d0eb006
+EBUILD firefox-114.0.ebuild 42933 BLAKE2B 41483646f9b6745738979bff819f248da04e411ef934c3df84f6e5a113972a910d6ea6fcad62f8b5b30c62364cec163c7c305c663085619a9bda26f4b77a3b00 SHA512 83594115ebd30543ce0c521a0ea57a1714841253b3fd4dca0a4395ebd866ed0b875c92935b043dfab45aaa0d283cb305177719ec33d9dfb35db41e3da6d148b8
 MISC metadata.xml 2349 BLAKE2B 28d361b31232cb633877c0229f923638614b369caf92d392d9f0a1d51a5a1596b9ee7817076673de381fcbc708d9038da967dfe2440f4d21c1658b6dea2783cf SHA512 61bc9614c7d56a68fdfbd0ffbc2c828002a0be6b56523109dfb482d73f7739b934dcf407088fb5cca0f0c1c89b56a2c8d9afd836d39bf4108d3510a81814135c
diff --git a/www-client/firefox/files/firefox-114-ppc64-profiler.patch b/www-client/firefox/files/firefox-114-ppc64-profiler.patch
new file mode 100644
index 000000000000..5a2bfa4e3bd5
--- /dev/null
+++ b/www-client/firefox/files/firefox-114-ppc64-profiler.patch
@@ -0,0 +1,29 @@
+#from: https://phabricator.services.mozilla.com/D181042
+
+diff --git a/tools/profiler/gecko/ProfilerParent.cpp b/tools/profiler/gecko/ProfilerParent.cpp
+--- a/tools/profiler/gecko/ProfilerParent.cpp
++++ b/tools/profiler/gecko/ProfilerParent.cpp
+@@ -722,18 +722,22 @@
+     }
+   }
+ 
+   Unused << SendStop();
+ }
++#endif  // MOZ_GECKO_PROFILER
+ 
+ ProfilerParent::~ProfilerParent() {
+   MOZ_COUNT_DTOR(ProfilerParent);
+ 
+   MOZ_RELEASE_ASSERT(NS_IsMainThread());
++#ifdef MOZ_GECKO_PROFILER
+   ProfilerParentTracker::StopTracking(this);
++#endif
+ }
+ 
++#ifdef MOZ_GECKO_PROFILER
+ /* static */
+ nsTArray<ProfilerParent::SingleProcessProfilePromiseAndChildPid>
+ ProfilerParent::GatherProfiles() {
+   nsTArray<SingleProcessProfilePromiseAndChildPid> results;
+   if (!NS_IsMainThread()) {
+
diff --git a/www-client/firefox/firefox-114.0.ebuild b/www-client/firefox/firefox-114.0.ebuild
index 9e1a2f0ae932..915a32ecc24d 100644
--- a/www-client/firefox/firefox-114.0.ebuild
+++ b/www-client/firefox/firefox-114.0.ebuild
@@ -651,7 +651,10 @@ src_prepare() {
 
 	# temp workaround for https://bugs.gentoo.org/908297 until patch added to tarball
 	rm -v "${WORKDIR}"/firefox-patches/*bmo-1775202-ppc64*.patch
-	use ppc64 && eapply "${FILESDIR}"/firefox-114-ppc64-webrtc.patch
+	if use ppc64; then
+		eapply "${FILESDIR}"/firefox-114-ppc64-webrtc.patch
+		eapply "${FILESDIR}"/firefox-114-ppc64-profiler.patch
+	fi
 	# end temp workaround
 
 	eapply "${WORKDIR}/firefox-patches"