View | Details | Raw Unified | Return to bug 274317 | Differences between
and this patch

Collapse All | Expand All

(-)b/devel/electron24/files/patch-third__party_blink_renderer_platform_text_text__break__iterator.cc (-5 / +2 lines)
Lines 1-6 Link Here
1
--- third_party/blink/renderer/platform/text/text_break_iterator.cc.orig	2023-11-04 07:08:51 UTC
1
--- third_party/blink/renderer/platform/text/text_break_iterator.cc.orig	2023-11-04 06:12:25 UTC
2
+++ third_party/blink/renderer/platform/text/text_break_iterator.cc
2
+++ third_party/blink/renderer/platform/text/text_break_iterator.cc
3
@@ -161,8 +161,12 @@ static const unsigned char kAsciiLineBreakTable[][(kAs
3
@@ -161,7 +161,9 @@ static const unsigned char kAsciiLineBreakTable[][(kAs
4
 };
4
 };
5
 // clang-format on
5
 // clang-format on
6
 
6
 
Lines 9-16 Link Here
9
+#define BA_LB_COUNT (U_LB_COUNT - 8)
9
+#define BA_LB_COUNT (U_LB_COUNT - 8)
10
+#elif U_ICU_VERSION_MAJOR_NUM >= 58
10
+#elif U_ICU_VERSION_MAJOR_NUM >= 58
11
 #define BA_LB_COUNT (U_LB_COUNT - 3)
11
 #define BA_LB_COUNT (U_LB_COUNT - 3)
12
+#elif U_ICU_VERSION_MAJOR_NUM >= 74
13
+#define BA_LB_COUNT (U_LB_COUNT - 8)
14
 #else
12
 #else
15
 #define BA_LB_COUNT U_LB_COUNT
13
 #define BA_LB_COUNT U_LB_COUNT
16
 #endif
(-)b/devel/electron25/files/patch-third__party_blink_renderer_platform_text_text__break__iterator.cc (-5 / +2 lines)
Lines 1-6 Link Here
1
--- third_party/blink/renderer/platform/text/text_break_iterator.cc.orig	2023-11-04 07:08:51 UTC
1
--- third_party/blink/renderer/platform/text/text_break_iterator.cc.orig	2023-11-04 06:12:25 UTC
2
+++ third_party/blink/renderer/platform/text/text_break_iterator.cc
2
+++ third_party/blink/renderer/platform/text/text_break_iterator.cc
3
@@ -161,8 +161,12 @@ static const unsigned char kAsciiLineBreakTable[][(kAs
3
@@ -161,7 +161,9 @@ static const unsigned char kAsciiLineBreakTable[][(kAs
4
 };
4
 };
5
 // clang-format on
5
 // clang-format on
6
 
6
 
Lines 9-16 Link Here
9
+#define BA_LB_COUNT (U_LB_COUNT - 8)
9
+#define BA_LB_COUNT (U_LB_COUNT - 8)
10
+#elif U_ICU_VERSION_MAJOR_NUM >= 58
10
+#elif U_ICU_VERSION_MAJOR_NUM >= 58
11
 #define BA_LB_COUNT (U_LB_COUNT - 3)
11
 #define BA_LB_COUNT (U_LB_COUNT - 3)
12
+#elif U_ICU_VERSION_MAJOR_NUM >= 74
13
+#define BA_LB_COUNT (U_LB_COUNT - 8)
14
 #else
12
 #else
15
 #define BA_LB_COUNT U_LB_COUNT
13
 #define BA_LB_COUNT U_LB_COUNT
16
 #endif
(-)b/devel/electron26/files/patch-third__party_blink_renderer_platform_text_text__break__iterator.cc (-5 / +2 lines)
Lines 1-6 Link Here
1
--- third_party/blink/renderer/platform/text/text_break_iterator.cc.orig	2023-11-04 07:08:51 UTC
1
--- third_party/blink/renderer/platform/text/text_break_iterator.cc.orig	2023-11-04 06:12:25 UTC
2
+++ third_party/blink/renderer/platform/text/text_break_iterator.cc
2
+++ third_party/blink/renderer/platform/text/text_break_iterator.cc
3
@@ -161,8 +161,12 @@ static const unsigned char kAsciiLineBreakTable[][(kAs
3
@@ -161,7 +161,9 @@ static const unsigned char kAsciiLineBreakTable[][(kAs
4
 };
4
 };
5
 // clang-format on
5
 // clang-format on
6
 
6
 
Lines 9-16 Link Here
9
+#define BA_LB_COUNT (U_LB_COUNT - 8)
9
+#define BA_LB_COUNT (U_LB_COUNT - 8)
10
+#elif U_ICU_VERSION_MAJOR_NUM >= 58
10
+#elif U_ICU_VERSION_MAJOR_NUM >= 58
11
 #define BA_LB_COUNT (U_LB_COUNT - 3)
11
 #define BA_LB_COUNT (U_LB_COUNT - 3)
12
+#elif U_ICU_VERSION_MAJOR_NUM >= 74
13
+#define BA_LB_COUNT (U_LB_COUNT - 8)
14
 #else
12
 #else
15
 #define BA_LB_COUNT U_LB_COUNT
13
 #define BA_LB_COUNT U_LB_COUNT
16
 #endif
(-)b/devel/icu/Makefile (-1 / +1 lines)
Lines 1-5 Link Here
1
PORTNAME=	icu
1
PORTNAME=	icu
2
DISTVERSION=	73_2
2
DISTVERSION=	74_1
3
PORTREVISION?=	0 # keep for icu-lx
3
PORTREVISION?=	0 # keep for icu-lx
4
PORTEPOCH?=	1
4
PORTEPOCH?=	1
5
CATEGORIES?=	devel
5
CATEGORIES?=	devel
(-)b/devel/icu/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1686691435
1
TIMESTAMP = 1698714688
2
SHA256 (icu4c-73_2-src.tgz) = 818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1
2
SHA256 (icu4c-74_1-src.tgz) = 86ce8e60681972e60e4dcb2490c697463fcec60dd400a5f9bffba26d0b52b8d0
3
SIZE (icu4c-73_2-src.tgz) = 26519906
3
SIZE (icu4c-74_1-src.tgz) = 26625850
(-)b/devel/icu/pkg-plist (+2 lines)
Lines 154-159 include/unicode/uiter.h Link Here
154
include/unicode/uldnames.h
154
include/unicode/uldnames.h
155
include/unicode/ulistformatter.h
155
include/unicode/ulistformatter.h
156
include/unicode/uloc.h
156
include/unicode/uloc.h
157
include/unicode/ulocale.h
158
include/unicode/ulocbuilder.h
157
include/unicode/ulocdata.h
159
include/unicode/ulocdata.h
158
include/unicode/umachine.h
160
include/unicode/umachine.h
159
include/unicode/umisc.h
161
include/unicode/umisc.h
(-)b/editors/libreoffice/files/patch-i18npool_source_breakiterator_data_line_txt (+16 lines)
Added Link Here
1
Work around https://github.com/unicode-org/icu/commit/84e47620692b
2
via https://github.com/openbsd/ports/commit/e5c313ed3356
3
until https://gerrit.libreoffice.org/c/core/+/158749
4
5
--- i18npool/source/breakiterator/data/line.txt.orig
6
+++ i18npool/source/breakiterator/data/line.txt
7
@@ -14,7 +14,8 @@
8
 #
9
 
10
 !!chain;
11
-!!LBCMNoChain;
12
+# DEPRECATED since ICU 74
13
+# !!LBCMNoChain;
14
 
15
 
16
 !!lookAheadHardBreak;
(-)b/www/firefox-esr/files/patch-bug1859752 (+42 lines)
Added Link Here
1
# HG changeset patch
2
# User André Bargull <andre.bargull@gmail.com>
3
# Date 1699346749 0
4
# Node ID 0e7eefda24250041d7f008cc77dfa79045afa791
5
# Parent  1e39572cb1c784039a9e14b8c36396c66cf58a5d
6
Bug 1859752 - Part 9: Add new line break classes. r=platform-i18n-reviewers,dminor
7
8
Use `CLASS_CHARACTER` because that matches the previous character class for most
9
characters which are now part of the new character classes.
10
11
Depends on D192733
12
13
Differential Revision: https://phabricator.services.mozilla.com/D192734
14
15
diff --git intl/lwbrk/LineBreaker.cpp intl/lwbrk/LineBreaker.cpp
16
--- intl/lwbrk/LineBreaker.cpp
17
+++ intl/lwbrk/LineBreaker.cpp
18
@@ -443,17 +443,23 @@ static int8_t GetClass(uint32_t u, LineB
19
       /* JT = 34,                           [JT] */ CLASS_CHARACTER,
20
       /* JV = 35,                           [JV] */ CLASS_CHARACTER,
21
       /* CLOSE_PARENTHESIS = 36,            [CP] */ CLASS_CLOSE_LIKE_CHARACTER,
22
       /* CONDITIONAL_JAPANESE_STARTER = 37, [CJ] */ CLASS_CLOSE,
23
       /* HEBREW_LETTER = 38,                [HL] */ CLASS_CHARACTER,
24
       /* REGIONAL_INDICATOR = 39,           [RI] */ CLASS_CHARACTER,
25
       /* E_BASE = 40,                       [EB] */ CLASS_BREAKABLE,
26
       /* E_MODIFIER = 41,                   [EM] */ CLASS_CHARACTER,
27
-      /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER};
28
+      /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER,
29
+      /* AKSARA = 43,                       [AK] */ CLASS_CHARACTER,
30
+      /* AKSARA_PREBASE = 44,               [AP] */ CLASS_CHARACTER,
31
+      /* AKSARA_START = 45,                 [AS] */ CLASS_CHARACTER,
32
+      /* VIRAMA_FINAL = 46,                 [VF] */ CLASS_CHARACTER,
33
+      /* VIRAMA = 47,                       [VI] */ CLASS_CHARACTER,
34
+  };
35
 
36
   static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass),
37
                 "Gecko vs ICU LineBreak class mismatch");
38
 
39
   auto cls = GetLineBreakClass(u);
40
   MOZ_ASSERT(cls < mozilla::ArrayLength(sUnicodeLineBreakToClass));
41
 
42
   // Overrides based on rules for the different line-break values given in
(-)b/www/firefox/files/patch-bug1859752 (+42 lines)
Added Link Here
1
# HG changeset patch
2
# User André Bargull <andre.bargull@gmail.com>
3
# Date 1699346749 0
4
# Node ID 0e7eefda24250041d7f008cc77dfa79045afa791
5
# Parent  1e39572cb1c784039a9e14b8c36396c66cf58a5d
6
Bug 1859752 - Part 9: Add new line break classes. r=platform-i18n-reviewers,dminor
7
8
Use `CLASS_CHARACTER` because that matches the previous character class for most
9
characters which are now part of the new character classes.
10
11
Depends on D192733
12
13
Differential Revision: https://phabricator.services.mozilla.com/D192734
14
15
diff --git intl/lwbrk/LineBreaker.cpp intl/lwbrk/LineBreaker.cpp
16
--- intl/lwbrk/LineBreaker.cpp
17
+++ intl/lwbrk/LineBreaker.cpp
18
@@ -443,17 +443,23 @@ static int8_t GetClass(uint32_t u, LineB
19
       /* JT = 34,                           [JT] */ CLASS_CHARACTER,
20
       /* JV = 35,                           [JV] */ CLASS_CHARACTER,
21
       /* CLOSE_PARENTHESIS = 36,            [CP] */ CLASS_CLOSE_LIKE_CHARACTER,
22
       /* CONDITIONAL_JAPANESE_STARTER = 37, [CJ] */ CLASS_CLOSE,
23
       /* HEBREW_LETTER = 38,                [HL] */ CLASS_CHARACTER,
24
       /* REGIONAL_INDICATOR = 39,           [RI] */ CLASS_CHARACTER,
25
       /* E_BASE = 40,                       [EB] */ CLASS_BREAKABLE,
26
       /* E_MODIFIER = 41,                   [EM] */ CLASS_CHARACTER,
27
-      /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER};
28
+      /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER,
29
+      /* AKSARA = 43,                       [AK] */ CLASS_CHARACTER,
30
+      /* AKSARA_PREBASE = 44,               [AP] */ CLASS_CHARACTER,
31
+      /* AKSARA_START = 45,                 [AS] */ CLASS_CHARACTER,
32
+      /* VIRAMA_FINAL = 46,                 [VF] */ CLASS_CHARACTER,
33
+      /* VIRAMA = 47,                       [VI] */ CLASS_CHARACTER,
34
+  };
35
 
36
   static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass),
37
                 "Gecko vs ICU LineBreak class mismatch");
38
 
39
   auto cls = GetLineBreakClass(u);
40
   MOZ_ASSERT(cls < mozilla::ArrayLength(sUnicodeLineBreakToClass));
41
 
42
   // Overrides based on rules for the different line-break values given in
(-)b/www/iridium/files/patch-third__party_blink_renderer_platform_text_text__break__iterator.cc (-5 / +2 lines)
Lines 1-6 Link Here
1
--- third_party/blink/renderer/platform/text/text_break_iterator.cc.orig	2023-11-04 07:08:51 UTC
1
--- third_party/blink/renderer/platform/text/text_break_iterator.cc.orig	2023-11-04 06:12:25 UTC
2
+++ third_party/blink/renderer/platform/text/text_break_iterator.cc
2
+++ third_party/blink/renderer/platform/text/text_break_iterator.cc
3
@@ -161,8 +161,12 @@ static const unsigned char kAsciiLineBreakTable[][(kAs
3
@@ -161,7 +161,9 @@ static const unsigned char kAsciiLineBreakTable[][(kAs
4
 };
4
 };
5
 // clang-format on
5
 // clang-format on
6
 
6
 
Lines 9-16 Link Here
9
+#define BA_LB_COUNT (U_LB_COUNT - 8)
9
+#define BA_LB_COUNT (U_LB_COUNT - 8)
10
+#elif U_ICU_VERSION_MAJOR_NUM >= 58
10
+#elif U_ICU_VERSION_MAJOR_NUM >= 58
11
 #define BA_LB_COUNT (U_LB_COUNT - 3)
11
 #define BA_LB_COUNT (U_LB_COUNT - 3)
12
+#elif U_ICU_VERSION_MAJOR_NUM >= 74
13
+#define BA_LB_COUNT (U_LB_COUNT - 8)
14
 #else
12
 #else
15
 #define BA_LB_COUNT U_LB_COUNT
13
 #define BA_LB_COUNT U_LB_COUNT
16
 #endif
(-)b/www/librewolf/files/patch-bug1859752 (+42 lines)
Added Link Here
1
# HG changeset patch
2
# User André Bargull <andre.bargull@gmail.com>
3
# Date 1699346749 0
4
# Node ID 0e7eefda24250041d7f008cc77dfa79045afa791
5
# Parent  1e39572cb1c784039a9e14b8c36396c66cf58a5d
6
Bug 1859752 - Part 9: Add new line break classes. r=platform-i18n-reviewers,dminor
7
8
Use `CLASS_CHARACTER` because that matches the previous character class for most
9
characters which are now part of the new character classes.
10
11
Depends on D192733
12
13
Differential Revision: https://phabricator.services.mozilla.com/D192734
14
15
diff --git intl/lwbrk/LineBreaker.cpp intl/lwbrk/LineBreaker.cpp
16
--- intl/lwbrk/LineBreaker.cpp
17
+++ intl/lwbrk/LineBreaker.cpp
18
@@ -443,17 +443,23 @@ static int8_t GetClass(uint32_t u, LineB
19
       /* JT = 34,                           [JT] */ CLASS_CHARACTER,
20
       /* JV = 35,                           [JV] */ CLASS_CHARACTER,
21
       /* CLOSE_PARENTHESIS = 36,            [CP] */ CLASS_CLOSE_LIKE_CHARACTER,
22
       /* CONDITIONAL_JAPANESE_STARTER = 37, [CJ] */ CLASS_CLOSE,
23
       /* HEBREW_LETTER = 38,                [HL] */ CLASS_CHARACTER,
24
       /* REGIONAL_INDICATOR = 39,           [RI] */ CLASS_CHARACTER,
25
       /* E_BASE = 40,                       [EB] */ CLASS_BREAKABLE,
26
       /* E_MODIFIER = 41,                   [EM] */ CLASS_CHARACTER,
27
-      /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER};
28
+      /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER,
29
+      /* AKSARA = 43,                       [AK] */ CLASS_CHARACTER,
30
+      /* AKSARA_PREBASE = 44,               [AP] */ CLASS_CHARACTER,
31
+      /* AKSARA_START = 45,                 [AS] */ CLASS_CHARACTER,
32
+      /* VIRAMA_FINAL = 46,                 [VF] */ CLASS_CHARACTER,
33
+      /* VIRAMA = 47,                       [VI] */ CLASS_CHARACTER,
34
+  };
35
 
36
   static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass),
37
                 "Gecko vs ICU LineBreak class mismatch");
38
 
39
   auto cls = GetLineBreakClass(u);
40
   MOZ_ASSERT(cls < mozilla::ArrayLength(sUnicodeLineBreakToClass));
41
 
42
   // Overrides based on rules for the different line-break values given in
(-)b/www/tor-browser/files/patch-bug1859752 (+42 lines)
Added Link Here
1
# HG changeset patch
2
# User André Bargull <andre.bargull@gmail.com>
3
# Date 1699346749 0
4
# Node ID 0e7eefda24250041d7f008cc77dfa79045afa791
5
# Parent  1e39572cb1c784039a9e14b8c36396c66cf58a5d
6
Bug 1859752 - Part 9: Add new line break classes. r=platform-i18n-reviewers,dminor
7
8
Use `CLASS_CHARACTER` because that matches the previous character class for most
9
characters which are now part of the new character classes.
10
11
Depends on D192733
12
13
Differential Revision: https://phabricator.services.mozilla.com/D192734
14
15
diff --git intl/lwbrk/LineBreaker.cpp intl/lwbrk/LineBreaker.cpp
16
--- intl/lwbrk/LineBreaker.cpp
17
+++ intl/lwbrk/LineBreaker.cpp
18
@@ -443,17 +443,23 @@ static int8_t GetClass(uint32_t u, LineB
19
       /* JT = 34,                           [JT] */ CLASS_CHARACTER,
20
       /* JV = 35,                           [JV] */ CLASS_CHARACTER,
21
       /* CLOSE_PARENTHESIS = 36,            [CP] */ CLASS_CLOSE_LIKE_CHARACTER,
22
       /* CONDITIONAL_JAPANESE_STARTER = 37, [CJ] */ CLASS_CLOSE,
23
       /* HEBREW_LETTER = 38,                [HL] */ CLASS_CHARACTER,
24
       /* REGIONAL_INDICATOR = 39,           [RI] */ CLASS_CHARACTER,
25
       /* E_BASE = 40,                       [EB] */ CLASS_BREAKABLE,
26
       /* E_MODIFIER = 41,                   [EM] */ CLASS_CHARACTER,
27
-      /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER};
28
+      /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER,
29
+      /* AKSARA = 43,                       [AK] */ CLASS_CHARACTER,
30
+      /* AKSARA_PREBASE = 44,               [AP] */ CLASS_CHARACTER,
31
+      /* AKSARA_START = 45,                 [AS] */ CLASS_CHARACTER,
32
+      /* VIRAMA_FINAL = 46,                 [VF] */ CLASS_CHARACTER,
33
+      /* VIRAMA = 47,                       [VI] */ CLASS_CHARACTER,
34
+  };
35
 
36
   static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass),
37
                 "Gecko vs ICU LineBreak class mismatch");
38
 
39
   auto cls = GetLineBreakClass(u);
40
   MOZ_ASSERT(cls < mozilla::ArrayLength(sUnicodeLineBreakToClass));
41
 
42
   // Overrides based on rules for the different line-break values given in
(-)b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_text_text__break__iterator.cc (-5 / +2 lines)
Lines 1-6 Link Here
1
--- third_party/blink/renderer/platform/text/text_break_iterator.cc.orig	2023-11-04 07:08:51 UTC
1
--- third_party/blink/renderer/platform/text/text_break_iterator.cc.orig	2023-11-04 06:12:25 UTC
2
+++ third_party/blink/renderer/platform/text/text_break_iterator.cc
2
+++ third_party/blink/renderer/platform/text/text_break_iterator.cc
3
@@ -161,8 +161,12 @@ static const unsigned char kAsciiLineBreakTable[][(kAs
3
@@ -161,7 +161,9 @@ static const unsigned char kAsciiLineBreakTable[][(kAs
4
 };
4
 };
5
 // clang-format on
5
 // clang-format on
6
 
6
 
Lines 9-16 Link Here
9
+#define BA_LB_COUNT (U_LB_COUNT - 8)
9
+#define BA_LB_COUNT (U_LB_COUNT - 8)
10
+#elif U_ICU_VERSION_MAJOR_NUM >= 58
10
+#elif U_ICU_VERSION_MAJOR_NUM >= 58
11
 #define BA_LB_COUNT (U_LB_COUNT - 3)
11
 #define BA_LB_COUNT (U_LB_COUNT - 3)
12
+#elif U_ICU_VERSION_MAJOR_NUM >= 74
13
+#define BA_LB_COUNT (U_LB_COUNT - 8)
14
 #else
12
 #else
15
 #define BA_LB_COUNT U_LB_COUNT
13
 #define BA_LB_COUNT U_LB_COUNT
16
 #endif

Return to bug 274317