commit: d9712b1358dc1b64933c3090d72153aae3270f25 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Nov 20 18:33:37 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Nov 20 18:33:43 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9712b13
www-client/firefox: fix compat w/ icu-74 Closes: https://bugs.gentoo.org/917599 Signed-off-by: Sam James <sam <AT> gentoo.org> .../firefox/files/firefox-115.4.0-icu-74.patch | 41 ++++++++++++++++++++++ www-client/firefox/firefox-115.4.0.ebuild | 5 +++ www-client/firefox/firefox-119.0.1.ebuild | 5 +++ 3 files changed, 51 insertions(+) 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 <[email protected]> +# 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
