gentoo auto-resync : 20:11:2023 - 23:10:12

4 files changed, 54 insertions, 2 deletions

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 313d3fc60139..d8aae52ab654 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,6 +1,7 @@
 AUX README.gentoo 1238 BLAKE2B 4d2615dc16cd4d4b5ab3037dbea0ddc8cfe909ab6f5848a9ffcf01b17b861e076f11044567645ef9e672c1c3e695ff94480b55743c182143c47aefe747d07c20 SHA512 a1f124caae6d552765b2d846162ae6cbac6c55625a3d1024a79006c7828452870ab11e2b47820d72336cbbd3f590fd7038577cddae9b588099483964dbe1b91f
 AUX disable-auto-update.policy.json 53 BLAKE2B f8df63721191d84d8f1ceec263f63c44fd5dadeae0939baf9a4a6b1852516722b2a3d94b8d403cc7b6c6b525d5236f357ab65a72d716aab1f5bef47800b5a18c SHA512 5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308
 AUX distribution.ini 1090 BLAKE2B d1ec76caf937a8d3d0898979c236b8cc39004d2d2c467da16356350fa59938f75f43a2b6830783ea4193cfb896a0d39c0b147527e0459ea5b4e6963b6e1b363a SHA512 6b7221646aeb7c8e08dcb800e54263407ec6cc8529dcc4438d52b36a5bb59431396a561958d405a33d0f455720fc1621adae4a667ec04e612c8b142eb6e80092
+AUX firefox-115.4.0-icu-74.patch 1992 BLAKE2B 94992ee197bbb5ce73a8187981aa1a6a2951219c08a7f5940dec7a7c2fcc053751843785f3edcbac97cec7977262ad8b31631a16357aac84215f90650cbc40cf SHA512 0a84e8cb6604fdb7601745b60c04ee74733632ada32bfd85eb32db8fee095cfb79c82033e5e3cf3bbc7b7f4df753e86ffe18e26e63a6603a93c3bb5a459aabd3
 AUX firefox-r1.sh 2836 BLAKE2B f2a80753f78bcae89f52ca161a0c558c3df5dd40d52f3aecdd1999dced5b025d222399d6603df17116539376f86ecf9cb615c592f7f6953876655609a69c0ac2 SHA512 8f174aa111416ebd2a092bbfd906c1b8e7fc7100da484a5d337c07cedbc761c443efa777df7340526da0f1116291550db08e150de326067b49fd4547db7f7a88
 AUX gentoo-default-prefs.js 570 BLAKE2B dd38592aa2a1e26185bb39ad95594dfcc57343e1027d7b125a82531c70e4cffe1f2a19519e1f3c07129faa5012b909bd45e6f65f05ac43f0503c752178b5904c SHA512 2b93206b979aa7cf88a6141805219db0a5134ea87c92a8f9a4bd16bc102bf6ed3d55c77f2f47a300262bb2848b878e8881c0037434441f13ddf1826661e7c6ff
 AUX gentoo-hwaccel-prefs.js 162 BLAKE2B c5f2dfb727081e2d538c262f12c0cfdda31cbda58c77f4024d820e1d1915203d1fb8ad2671f88ff0eb2b019bbf44079a8b1114e240b74f815680e5c28eccc295 SHA512 f1847f11e7059a83f09c3c7494aadcb04512cdf2ccf6616ebe3ec02fc46de66fd35cf83d81e08013c0e594b73e4dffcb67a32288b6949ce137669715583fd0a4
@@ -411,8 +412,8 @@ DIST firefox-119.0.1-zh-CN.xpi 609155 BLAKE2B 2e7358f866834f6991d54b40872234baac
 DIST firefox-119.0.1-zh-TW.xpi 612610 BLAKE2B 1b98a3492e14867a8ee8bc3449465af7f365c3be6b092857bdc83045540b1b28d3c9bb864d395bfd50f273ee9a21a7acc583361939b5d6a3a233529ff3d5536d SHA512 a510a590bc457d1ea70392bfdb3e7bc36ba43b379361d547ca55eadd9d44a6ce59c24cf01667df6e014bb164f0333ae728a1ecf9939065be71923cc22fb83c52
 DIST firefox-119.0.1.source.tar.xz 524717896 BLAKE2B b5a2ceadf05692d482dc8114634902d33c32c908e60394bf2e6b38afd8d83830d40c83afec28f7257e269595196140c0a8a1f345232f29c649a202d51ca39c68 SHA512 4f3201aee10e7b831cc384b2c7430a24f4de81f703115a917f9eb7acecb2ae1725f11af56c41257a056bb9d7a4d749d590cc9baffcd6e13852be45aaecf8163a
 DIST firefox-119.0.source.tar.xz 523093112 BLAKE2B 4fc9852839a65b05c0861eea1d3c99aa9ef8eef02ba02dab15720d0da62b219f0fc2c4bdda1741dcf0eed316b88f032580c7cf433c4d09170b5c8e19e8ad4e1d SHA512 4b555c444add36567fd538752b122f227cf78bb70b72c79e6d8ae8d9c2e61c3cdacfae79c37970753b8b5c7716b28c686071eb7b551773c30a76852f3550676c
-EBUILD firefox-115.4.0.ebuild 39331 BLAKE2B c351ed3fe52b43b99323a8ee2f55cf08c313c8efc30d9166b197cdb77549d1d393a2cd96a67e3abbf806362c7752f67621bbf44f95a859040614aa7d1c4cd5fb SHA512 7240f6e1bf3c78c1386be6b410c7e482cc002ca562ef6d37f56277664df99bece5424b66dde9d4f585d77c4bffc5fbc1679620887015212f2f827f1a9932a8f6
+EBUILD firefox-115.4.0.ebuild 39480 BLAKE2B 0ef1ada0c7f524918634bc3d542f7fed773af909d8fd9cf7f91afdc4c46fba47ba78f04bd82427b0ebd801bacdfba430652ea39bb1bec3cc8c80309cba7bfee1 SHA512 e10853614b2dcdf2ef448af99463ed21d70a808e4acf889c857f2d098719973dac991a9ec0d409f7baabaca9b72697dc6ad13e956212e73d068a1988db4051e2
 EBUILD firefox-118.0.2.ebuild 41915 BLAKE2B 1325c101c8a1bf7f3a39a731d4a0624e2210ca3d8a8cdf10b0a011cb0e69ce08d532c79d5bda014b8de0901323fde94bba0b8e76654c068d23596ade7e3f4d6f SHA512 99ee8834fe2ed43abb502455bbd6123b0836b1ba61995150c735415b2886c0251426c29fdf7c25a6e62de6643ee3983ae8520c09418bbd8f4f7f2e0e235f73bc
-EBUILD firefox-119.0.1.ebuild 41669 BLAKE2B 30be24b9a089f253073132d06f1f3aa1de311a2c94c433bf64788eb19aedc9d24b5d3f51a453d8cb10fe4a7801314f987886405994ded29163454543a1e5826d SHA512 c024c3449a6ace63ea61ece5576309b59fd72d7637d04ade78ea43c9b36d23d286264a9cc87d443834a8516dc46d402241548c9c6306d049d1cd75babad45714
+EBUILD firefox-119.0.1.ebuild 41818 BLAKE2B bc857ad7cc6e8ebd006d3af29004124e8c059e0650f233fe8cf00836dabe376953c17a6e3a43aa67e500fff4701362ab12692863c236d32723d315f912d642d4 SHA512 30d50c65d787bf318c8d23d3896ce0b3f286c6e9f7a151ad70fa1c0f8cada174d3df7760ea32e9590f1b4deba351917740f4b6610c260549cd3277cbdaf504bc
 EBUILD firefox-119.0.ebuild 41577 BLAKE2B 1aff3763db9eeca4a8fd47c89e33e78dde9751ef239a1c9990811db54eb34620e97207bc96077b09ef807613ad967cd8fc1d2b555367252b12fc60498f461cb2 SHA512 edd2b34450982c57580d156285c1bf70fcc77e9dff2fb9812a31fe22f52d2c820d18144bd2ddaf55b6ddd53070754db0fa03128012c248cb0ca54054e1a3c0e7
 MISC metadata.xml 2658 BLAKE2B 4e52ee338d13627658328468081959897f9ffba3d0729a03975f756ed95e2649e21a40de4933c0a2bdd9c1d4dc6cea973f503a3d448f49f73ec3eafb933f6845 SHA512 1062c2e2a49757a8e3b027db5d425113ce6e7bdba630786109caedbb3717c7600094c7bb3fbc83e1887d96e464f0dc48bdbcff16d396ea5481f36040e0e4c70d
diff --git a/www-client/firefox/files/firefox-115.4.0-icu-74.patch b/www-client/firefox/files/firefox-115.4.0-icu-74.patch
new file mode 100644
index 000000000000..617dd76a9a7e
--- /dev/null
+++ b/www-client/firefox/files/firefox-115.4.0-icu-74.patch
@@ -0,0 +1,41 @@
+https://bugs.gentoo.org/917599
+https://bugzilla.mozilla.org/show_bug.cgi?id=1862601
+https://hg.mozilla.org/try/rev/d5f3b0c4f08a426ce00a153c04e177eecb6820e2
+
+# HG changeset patch
+# User André Bargull <andre.bargull@gmail.com>
+# Date 1697435923 -7200
+# Node ID d5f3b0c4f08a426ce00a153c04e177eecb6820e2
+# Parent  c63994f8259efdf6e745c960aa9e1409d5477049
+Bug xxx - Part 12: Add new line break classes. r?
+
+diff --git a/intl/lwbrk/LineBreaker.cpp b/intl/lwbrk/LineBreaker.cpp
+--- a/intl/lwbrk/LineBreaker.cpp
++++ b/intl/lwbrk/LineBreaker.cpp
+@@ -443,17 +443,23 @@ static int8_t GetClass(uint32_t u, LineB
+       /* JT = 34,                           [JT] */ CLASS_CHARACTER,
+       /* JV = 35,                           [JV] */ CLASS_CHARACTER,
+       /* CLOSE_PARENTHESIS = 36,            [CP] */ CLASS_CLOSE_LIKE_CHARACTER,
+       /* CONDITIONAL_JAPANESE_STARTER = 37, [CJ] */ CLASS_CLOSE,
+       /* HEBREW_LETTER = 38,                [HL] */ CLASS_CHARACTER,
+       /* REGIONAL_INDICATOR = 39,           [RI] */ CLASS_CHARACTER,
+       /* E_BASE = 40,                       [EB] */ CLASS_BREAKABLE,
+       /* E_MODIFIER = 41,                   [EM] */ CLASS_CHARACTER,
+-      /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER};
++      /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER,
++      /* AKSARA = 43,                       [AK] */ CLASS_CHARACTER,
++      /* AKSARA_PREBASE = 44,               [AP] */ CLASS_CHARACTER,
++      /* AKSARA_START = 45,                 [AS] */ CLASS_CHARACTER,
++      /* VIRAMA_FINAL = 46,                 [VF] */ CLASS_CHARACTER,
++      /* VIRAMA = 47,                       [VI] */ CLASS_CHARACTER,
++  };
+ 
+   static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass),
+                 "Gecko vs ICU LineBreak class mismatch");
+ 
+   auto cls = GetLineBreakClass(u);
+   MOZ_ASSERT(cls < mozilla::ArrayLength(sUnicodeLineBreakToClass));
+ 
+   // Overrides based on rules for the different line-break values given in
+
+
diff --git a/www-client/firefox/firefox-115.4.0.ebuild b/www-client/firefox/firefox-115.4.0.ebuild
index 1cb2607514a6..84c5db21f5fe 100644
--- a/www-client/firefox/firefox-115.4.0.ebuild
+++ b/www-client/firefox/firefox-115.4.0.ebuild
@@ -664,6 +664,11 @@ src_prepare() {
 
 	eapply "${WORKDIR}/firefox-patches"
 
+	# Workaround for bgo#917599
+	if has_version ">=dev-libs/icu-74.1" && use system-icu ; then
+		eapply "${FILESDIR}"/firefox-115.4.0-icu-74.patch
+	fi
+
 	# Allow user to apply any additional patches without modifing ebuild
 	eapply_user
 
diff --git a/www-client/firefox/firefox-119.0.1.ebuild b/www-client/firefox/firefox-119.0.1.ebuild
index 44863fec4ddf..2cf4bd05d029 100644
--- a/www-client/firefox/firefox-119.0.1.ebuild
+++ b/www-client/firefox/firefox-119.0.1.ebuild
@@ -661,6 +661,11 @@ src_prepare() {
 
 	eapply "${WORKDIR}/firefox-patches"
 
+	# Workaround for bgo#917599
+	if has_version ">=dev-libs/icu-74.1" && use system-icu ; then
+		eapply "${FILESDIR}"/firefox-115.4.0-icu-74.patch
+	fi
+
 	# Allow user to apply any additional patches without modifing ebuild
 	eapply_user