gentoo auto-resync : 23:01:2023 - 12:55:07

4 files changed, 25 insertions, 1 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 6e1713513f46..632407b2af2f 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index d425802e0b0b..85753b24ba52 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,3 +1,4 @@
+AUX 0030-bmo-1775202-ppc64-webrtc-missing-conditions-109.patch 875 BLAKE2B 6604fdb1d0cab1e0a5ee72957bb37f20ae11f473dfc3182fae35ebc20a5db704127c321197a93d222eefdbb2ac726ef6ccf04495ee816dfb09ddbddce6d27483 SHA512 eb10ebedcdbac576ee3b376dd7243ee0a969fe329636dd2a531c18c2b97473f4770d839b4ba2c9166c2acddb19edad76620385f95269573fd81bc037d1001266
 AUX disable-auto-update.policy.json 53 BLAKE2B f8df63721191d84d8f1ceec263f63c44fd5dadeae0939baf9a4a6b1852516722b2a3d94b8d403cc7b6c6b525d5236f357ab65a72d716aab1f5bef47800b5a18c SHA512 5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308
 AUX distribution.ini 1090 BLAKE2B d1ec76caf937a8d3d0898979c236b8cc39004d2d2c467da16356350fa59938f75f43a2b6830783ea4193cfb896a0d39c0b147527e0459ea5b4e6963b6e1b363a SHA512 6b7221646aeb7c8e08dcb800e54263407ec6cc8529dcc4438d52b36a5bb59431396a561958d405a33d0f455720fc1621adae4a667ec04e612c8b142eb6e80092
 AUX firefox-r1.sh 2836 BLAKE2B f2a80753f78bcae89f52ca161a0c558c3df5dd40d52f3aecdd1999dced5b025d222399d6603df17116539376f86ecf9cb615c592f7f6953876655609a69c0ac2 SHA512 8f174aa111416ebd2a092bbfd906c1b8e7fc7100da484a5d337c07cedbc761c443efa777df7340526da0f1116291550db08e150de326067b49fd4547db7f7a88
@@ -405,5 +406,5 @@ DIST firefox-109.0.source.tar.xz 493231972 BLAKE2B 56ec8c49f0dd1cb4ba29afb5d68fd
 EBUILD firefox-102.6.0.ebuild 36637 BLAKE2B b390983bf08385b01f66d76a1f08c97342991312bc76d24f11cf4cb94736d6749d5f75f5b9081069fc4b17ccbdfc58b9bbe8c2caf03563d4676a82150c692b8d SHA512 214f554cc976202bfe9cae0bf79c16e4017b9b08f4342ed9f62145d237602c8ffa7204f51d8b3838214481088ca333da34a1ca8e779f0a48503377ef95f9fbcf
 EBUILD firefox-102.7.0.ebuild 36564 BLAKE2B 0890f800154cb95683ec3a4d14fee8e716bb77b8d8a47a3cf244b5cf074fe19e512032dc949ff816bdd4a2d6054c4f02c210ffc33ffb72265d1269af89ed0dfd SHA512 41b506e8e7c29421152cc61555f86f520f97b9ef207386a4a3a07451629abef6426b0283d355f177cad296d260a79bb6854f38e8a574ace80be52c6ec698062d
 EBUILD firefox-108.0.2.ebuild 38414 BLAKE2B 002d5abf568068610b4fe03ab8a63bffa8fb803d921dfba84bb952cef6fb1a591ceecc1ab6adabcb176deee3d24deb797930a3fec0841bb1f6e729e662351fae SHA512 aa0001426a0d8e9d969d14085da57c3cb54ea35218eae7ec2d69918d5ff61099a1c5fcc82214b25e9dfbfe04b408afe4db9b54624f401cfe8cb4a49ea6a33d3d
-EBUILD firefox-109.0.ebuild 38532 BLAKE2B 37f0c422113ef60b7e349a04756a975b951b17f067fea2d62415090d79887b89b9f8c6ee346d17e06984f3a7da074a2c57ebe6231c06cd277c298241b28b06e4 SHA512 b939ddfc8d93c54f8084b7bebdadb85e474fead7f39989d67b2cb2bf66a72cba554daa79a6f2cb7d15cc59296ec3959d70edc68c57aa0a1786b5d21804286b52
+EBUILD firefox-109.0.ebuild 38816 BLAKE2B 0f9f03d63368fa0b7085aad1f32dea8a44c6ed494c3233c9194946a6593458b44bdefa829b42a9ae7d3855d74c829b5ecc20335f2fca3237bd15a2ea0dc7918d SHA512 a03d3cbbe2052ee814318f0b19bb8a96a6b29a9b61fdd926da0cabf44f759def610289fc89f8475697b2b7f7c8f2270eeccc2ccaede788ac0198bb06d9b3ddcb
 MISC metadata.xml 2219 BLAKE2B 064f486eecd2a66ef4c9cccef46803f877039bf16bc40b699a48e28e04e816d0ad434ce65ae2e056e1a4126a67a7dd7eff16040276159c1f5aa8966b1c0d7b6c SHA512 522b09ffc2857553e240b1e7c82c11ccc281dd87c720c6292ec9314b91319e0a55ca2838f17e878f5c1e58e4f22caa1b0c3b90506b65b350beff06f3f397d897
diff --git a/www-client/firefox/files/0030-bmo-1775202-ppc64-webrtc-missing-conditions-109.patch b/www-client/firefox/files/0030-bmo-1775202-ppc64-webrtc-missing-conditions-109.patch
new file mode 100644
index 000000000000..1203476cf3b4
--- /dev/null
+++ b/www-client/firefox/files/0030-bmo-1775202-ppc64-webrtc-missing-conditions-109.patch
@@ -0,0 +1,16 @@
+diff --git a/third_party/libwebrtc/moz.build b/third_party/libwebrtc/moz.build
+index 8579f8bb3622..d9ca79d4fcb8 100644
+--- a/third_party/libwebrtc/moz.build
++++ b/third_party/libwebrtc/moz.build
+@@ -520,7 +520,9 @@ if CONFIG["CPU_ARCH"] == "ppc64" and CONFIG["OS_TARGET"] == "Linux":
+         "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
+         "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
+         "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
+-        "/third_party/libwebrtc/modules/audio_coding/isac_gn"
++        "/third_party/libwebrtc/modules/audio_coding/isac_gn",
++        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
++        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
+     ]
+ 
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+
diff --git a/www-client/firefox/firefox-109.0.ebuild b/www-client/firefox/firefox-109.0.ebuild
index 62bacfdb5569..55a7abd6da29 100644
--- a/www-client/firefox/firefox-109.0.ebuild
+++ b/www-client/firefox/firefox-109.0.ebuild
@@ -612,6 +612,13 @@ src_unpack() {
 src_prepare() {
 	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
 	! use ppc64 && rm -v "${WORKDIR}"/firefox-patches/*bmo-1775202-ppc64*.patch
+	
+	# workaround for https://bugs.gentoo.org/891389 until new patch gets into tarball
+	if use ppc64; then
+		rm -v "${WORKDIR}"/firefox-patches/0030-bmo-1775202-ppc64-webrtc-missing-conditions.patch
+		eapply "${FILESDIR}"/0030-bmo-1775202-ppc64-webrtc-missing-conditions-109.patch
+	fi
+
 	eapply "${WORKDIR}/firefox-patches"
 
 	# Allow user to apply any additional patches without modifing ebuild