Attachment 245941 Details for Bug 274317 – v1 (apply via "git am")

[patch] v1 (apply via "git am")

bug274317.diff (text/plain), 12.41 KB, created by Jan Beich on 2023-10-28 13:28:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2023-10-28 13:28:49 UTC

Size: 12.41 KB

patch

obsolete

>From e4b05814ea74aa23d3fb9f423d50d9120588d4a5 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Thu, 5 Oct 2023 22:43:38 +0200
>Subject: [PATCH] devel/icu: update to 74.1
>
>- Temporarily switch to GitHub auto archive (release artifacts have broken LICENSE symlink)
>
>Changes:	https://github.com/unicode-org/icu/releases/tag/release-74-1
>Reported by:	GitHub (watch releases)
>PR:		274317
>Exp-run by:	antoine
>Approved by:	fluffy
>---
> devel/icu/Makefile                      | 10 ++++----
> devel/icu/distinfo                      |  6 ++---
> devel/icu/pkg-plist                     |  2 ++
> mail/thunderbird/files/patch-bug1859752 | 31 +++++++++++++++++++++++++
> www/firefox-esr/files/patch-bug1859752  | 31 +++++++++++++++++++++++++
> www/firefox/files/patch-bug1859752      | 31 +++++++++++++++++++++++++
> www/librewolf/files/patch-bug1859752    | 31 +++++++++++++++++++++++++
> www/tor-browser/files/patch-bug1859752  | 31 +++++++++++++++++++++++++
> 8 files changed, 165 insertions(+), 8 deletions(-)
> create mode 100644 mail/thunderbird/files/patch-bug1859752
> create mode 100644 www/firefox-esr/files/patch-bug1859752
> create mode 100644 www/firefox/files/patch-bug1859752
> create mode 100644 www/librewolf/files/patch-bug1859752
> create mode 100644 www/tor-browser/files/patch-bug1859752
>
>diff --git a/devel/icu/Makefile b/devel/icu/Makefile
>index ee23b4b047d1..a48fe1db9a83 100644
>--- a/devel/icu/Makefile
>+++ b/devel/icu/Makefile
>@@ -1,11 +1,9 @@
> PORTNAME=	icu
>-DISTVERSION=	73_2
>+DISTVERSIONPREFIX=	release-
>+DISTVERSION=	74-1
> PORTREVISION?=	0 # keep for icu-lx
> PORTEPOCH?=	1
> CATEGORIES?=	devel
>-MASTER_SITES=	https://github.com/unicode-org/${PORTNAME}/releases/download/release-${DISTVERSION:S/rc/-&/:S/_/-/g}/ \
>-		SF/${PORTNAME}/${PORTNAME:tu}4C/${PORTVERSION}
>-DISTNAME=	icu4c-${DISTVERSION}-src
> 
> MAINTAINER=	office@FreeBSD.org
> COMMENT?=	International Components for Unicode (from IBM)
>@@ -30,7 +28,9 @@ TEST_TARGET=	check
> CPE_VENDOR=	${PORTNAME}-project
> CPE_PRODUCT=	international_components_for_unicode
> USE_LDCONFIG=	yes
>-WRKSRC=		${WRKDIR}/icu/source
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	unicode-org
>+WRKSRC_SUBDIR=	icu4c/source
> 
> ICUMAJOR=	${PORTVERSION:C/\..*//}
> PLIST_SUB+=	ICUMAJOR=${ICUMAJOR} ICUVER=${PORTVERSION:C/r.?/1/}
>diff --git a/devel/icu/distinfo b/devel/icu/distinfo
>index a9fbed6598f5..dc79a183c3c4 100644
>--- a/devel/icu/distinfo
>+++ b/devel/icu/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1686691435
>-SHA256 (icu4c-73_2-src.tgz) = 818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1
>-SIZE (icu4c-73_2-src.tgz) = 26519906
>+TIMESTAMP = 1698447379
>+SHA256 (unicode-org-icu-release-74-1_GH0.tar.gz) = ca464bfa73bc00ebdb850546514d01f3a983159fda0f7682ff6bf4d3de56844c
>+SIZE (unicode-org-icu-release-74-1_GH0.tar.gz) = 65889935
>diff --git a/devel/icu/pkg-plist b/devel/icu/pkg-plist
>index 0a59aef5899e..e07081d1fd71 100644
>--- a/devel/icu/pkg-plist
>+++ b/devel/icu/pkg-plist
>@@ -154,6 +154,8 @@ include/unicode/uiter.h
> include/unicode/uldnames.h
> include/unicode/ulistformatter.h
> include/unicode/uloc.h
>+include/unicode/ulocale.h
>+include/unicode/ulocbuilder.h
> include/unicode/ulocdata.h
> include/unicode/umachine.h
> include/unicode/umisc.h
>diff --git a/mail/thunderbird/files/patch-bug1859752 b/mail/thunderbird/files/patch-bug1859752
>new file mode 100644
>index 000000000000..da5cfa6f97cc
>--- /dev/null
>+++ b/mail/thunderbird/files/patch-bug1859752
>@@ -0,0 +1,31 @@
>+https://hg.mozilla.org/try/rev/d5f3b0c4f08a426ce00a153c04e177eecb6820e2
>+
>+diff --git intl/lwbrk/LineBreaker.cpp intl/lwbrk/LineBreaker.cpp
>+--- intl/lwbrk/LineBreaker.cpp
>++++ 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/firefox-esr/files/patch-bug1859752 b/www/firefox-esr/files/patch-bug1859752
>new file mode 100644
>index 000000000000..da5cfa6f97cc
>--- /dev/null
>+++ b/www/firefox-esr/files/patch-bug1859752
>@@ -0,0 +1,31 @@
>+https://hg.mozilla.org/try/rev/d5f3b0c4f08a426ce00a153c04e177eecb6820e2
>+
>+diff --git intl/lwbrk/LineBreaker.cpp intl/lwbrk/LineBreaker.cpp
>+--- intl/lwbrk/LineBreaker.cpp
>++++ 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/firefox/files/patch-bug1859752 b/www/firefox/files/patch-bug1859752
>new file mode 100644
>index 000000000000..da5cfa6f97cc
>--- /dev/null
>+++ b/www/firefox/files/patch-bug1859752
>@@ -0,0 +1,31 @@
>+https://hg.mozilla.org/try/rev/d5f3b0c4f08a426ce00a153c04e177eecb6820e2
>+
>+diff --git intl/lwbrk/LineBreaker.cpp intl/lwbrk/LineBreaker.cpp
>+--- intl/lwbrk/LineBreaker.cpp
>++++ 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/librewolf/files/patch-bug1859752 b/www/librewolf/files/patch-bug1859752
>new file mode 100644
>index 000000000000..da5cfa6f97cc
>--- /dev/null
>+++ b/www/librewolf/files/patch-bug1859752
>@@ -0,0 +1,31 @@
>+https://hg.mozilla.org/try/rev/d5f3b0c4f08a426ce00a153c04e177eecb6820e2
>+
>+diff --git intl/lwbrk/LineBreaker.cpp intl/lwbrk/LineBreaker.cpp
>+--- intl/lwbrk/LineBreaker.cpp
>++++ 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/tor-browser/files/patch-bug1859752 b/www/tor-browser/files/patch-bug1859752
>new file mode 100644
>index 000000000000..da5cfa6f97cc
>--- /dev/null
>+++ b/www/tor-browser/files/patch-bug1859752
>@@ -0,0 +1,31 @@
>+https://hg.mozilla.org/try/rev/d5f3b0c4f08a426ce00a153c04e177eecb6820e2
>+
>+diff --git intl/lwbrk/LineBreaker.cpp intl/lwbrk/LineBreaker.cpp
>+--- intl/lwbrk/LineBreaker.cpp
>++++ 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
>+

Actions: View | Diff

Attachments on bug 274317: 245471 | 245941 | 245945 | 246185 | 246370