Attachment #245945 for bug #274317




PORTNAME=	icu
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)

CPE_VENDOR=	${PORTNAME}-project
CPE_PRODUCT=	international_components_for_unicode
USE_LDCONFIG=	yes
USE_GITHUB=	yes
GH_ACCOUNT=	unicode-org
WRKSRC_SUBDIR=	icu4c/source

ICUMAJOR=	${PORTVERSION:C/\..*//}
PLIST_SUB+=	ICUMAJOR=${ICUMAJOR} ICUVER=${PORTVERSION:C/r.?/1/}

Lines 1-3 Link Here

(-)b/devel/icu/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1686691435	1	TIMESTAMP = 1698447379
2	SHA256 (icu4c-73_2-src.tgz) = 818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1	2	SHA256 (unicode-org-icu-release-74-1_GH0.tar.gz) = ca464bfa73bc00ebdb850546514d01f3a983159fda0f7682ff6bf4d3de56844c
3	SIZE (icu4c-73_2-src.tgz) = 26519906	3	SIZE (unicode-org-icu-release-74-1_GH0.tar.gz) = 65889935

Lines 154-159 include/unicode/uiter.h Link Here

(-)b/devel/icu/pkg-plist (+2 lines)
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




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





		enable_rust=false \
		enable_widevine=true \
		fatal_linker_warnings=false \
		icu_use_data_file=false \
		is_clang=true \
		optimize_webui=true \
		toolkit_views=true \

	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
		./build/linux/unbundle/replace_gn_files.py --system-libraries \
		dav1d flac fontconfig freetype harfbuzz-ng libdrm libevent libpng \
		libusb libwebp libxml libxslt openh264 opus snappy || ${FALSE}
	# Chromium uses an unreleased version of FFmpeg, so configure it
	cd ${WRKSRC}/third_party/ffmpeg && \

.for d in protoc mksnapshot
	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
.endfor
.for d in icudtl.dat snapshot_blob.bin v8_context_snapshot.bin
	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
.endfor
	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \




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





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





		enable_remoting=false \
		enable_rust=false \
		fatal_linker_warnings=false \
		icu_use_data_file=false \
		is_clang=true \
		optimize_webui=true \
		toolkit_views=true \

	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
		./build/linux/unbundle/replace_gn_files.py --system-libraries \
		dav1d flac fontconfig freetype harfbuzz-ng libdrm libevent libpng \
		libwebp libxml libxslt openh264 opus snappy || ${FALSE}
	# Iridium uses an unreleased version of FFmpeg, so configure it
	cd ${WRKSRC}/third_party/ffmpeg && \

.for d in protoc mksnapshot
	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
.endfor
.for d in icudtl.dat snapshot_blob.bin v8_context_snapshot.bin
	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
.endfor
	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \




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





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





# OS "target_os == is_bsd", like libusb, libpci.
GN_ARGS+=	enable_widevine=true \
		fatal_linker_warnings=false \
		icu_use_data_file=false \
		is_clang=true \
		optimize_webui=true \
		toolkit_views=true \

	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
		./build/linux/unbundle/replace_gn_files.py --system-libraries \
		dav1d flac fontconfig freetype harfbuzz-ng libdrm libevent libpng \
		libusb libwebp libxml libxslt openh264 opus snappy || ${FALSE}
	# Chromium uses an unreleased version of FFmpeg, so configure it
	cd ${WRKSRC}/third_party/ffmpeg && \

.for d in protoc mksnapshot
	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
.endfor
.for d in icudtl.dat snapshot_blob.bin v8_context_snapshot.bin
	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
.endfor
	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \

Return to bug 274317

Lines 104-110 GN_ARGS+= clang_use_chrome_plugins=false \ Link Here

(-)b/www/chromium/Makefile (-3 / +2 lines)
104	enable_rust=false \	104	enable_rust=false \
105	enable_widevine=true \	105	enable_widevine=true \
106	fatal_linker_warnings=false \	106	fatal_linker_warnings=false \
107	icu_use_data_file=false \
108	is_clang=true \	107	is_clang=true \
109	optimize_webui=true \	108	optimize_webui=true \
110	toolkit_views=true \	109	toolkit_views=true \
Lines 285-291 pre-configure: Link Here
285	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]	284	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
286	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \	285	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
287	./build/linux/unbundle/replace_gn_files.py --system-libraries \	286	./build/linux/unbundle/replace_gn_files.py --system-libraries \
288	dav1d flac fontconfig freetype harfbuzz-ng icu libdrm libevent libpng \	287	dav1d flac fontconfig freetype harfbuzz-ng libdrm libevent libpng \
289	libusb libwebp libxml libxslt openh264 opus snappy \|\| ${FALSE}	288	libusb libwebp libxml libxslt openh264 opus snappy \|\| ${FALSE}
290	# Chromium uses an unreleased version of FFmpeg, so configure it	289	# Chromium uses an unreleased version of FFmpeg, so configure it
291	cd ${WRKSRC}/third_party/ffmpeg && \	290	cd ${WRKSRC}/third_party/ffmpeg && \
Lines 332-338 do-install: Link Here
332	.for d in protoc mksnapshot	331	.for d in protoc mksnapshot
333	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}	332	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
334	.endfor	333	.endfor
335	.for d in snapshot_blob.bin v8_context_snapshot.bin	334	.for d in icudtl.dat snapshot_blob.bin v8_context_snapshot.bin
336	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}	335	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
337	.endfor	336	.endfor
338	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \	337	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \

Lines 102-108 BINARY_ALIAS= python3=${PYTHON_CMD} \ Link Here

(-)b/www/ungoogled-chromium/Makefile (-3 / +2 lines)
102	# OS "target_os == is_bsd", like libusb, libpci.	102	# OS "target_os == is_bsd", like libusb, libpci.
103	GN_ARGS+= enable_widevine=true \	103	GN_ARGS+= enable_widevine=true \
104	fatal_linker_warnings=false \	104	fatal_linker_warnings=false \
105	icu_use_data_file=false \
106	is_clang=true \	105	is_clang=true \
107	optimize_webui=true \	106	optimize_webui=true \
108	toolkit_views=true \	107	toolkit_views=true \
Lines 310-316 pre-configure: Link Here
310	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]	309	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
311	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \	310	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
312	./build/linux/unbundle/replace_gn_files.py --system-libraries \	311	./build/linux/unbundle/replace_gn_files.py --system-libraries \
313	dav1d flac fontconfig freetype harfbuzz-ng icu libdrm libevent libpng \	312	dav1d flac fontconfig freetype harfbuzz-ng libdrm libevent libpng \
314	libusb libwebp libxml libxslt openh264 opus snappy \|\| ${FALSE}	313	libusb libwebp libxml libxslt openh264 opus snappy \|\| ${FALSE}
315	# Chromium uses an unreleased version of FFmpeg, so configure it	314	# Chromium uses an unreleased version of FFmpeg, so configure it
316	cd ${WRKSRC}/third_party/ffmpeg && \	315	cd ${WRKSRC}/third_party/ffmpeg && \
Lines 357-363 do-install: Link Here
357	.for d in protoc mksnapshot	356	.for d in protoc mksnapshot
358	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}	357	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
359	.endfor	358	.endfor
360	.for d in snapshot_blob.bin v8_context_snapshot.bin	359	.for d in icudtl.dat snapshot_blob.bin v8_context_snapshot.bin
361	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}	360	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
362	.endfor	361	.endfor
363	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \	362	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \

Lines 1-11 Link Here

(-)b/devel/icu/Makefile (-5 / +5 lines)
1	PORTNAME= icu	1	PORTNAME= icu
2	DISTVERSION= 73_2	2	DISTVERSIONPREFIX= release-
		3	DISTVERSION= 74-1
3	PORTREVISION?= 0 # keep for icu-lx	4	PORTREVISION?= 0 # keep for icu-lx
4	PORTEPOCH?= 1	5	PORTEPOCH?= 1
5	CATEGORIES?= devel	6	CATEGORIES?= devel
6	MASTER_SITES= https://github.com/unicode-org/${PORTNAME}/releases/download/release-${DISTVERSION:S/rc/-&/:S/_/-/g}/ \
7	SF/${PORTNAME}/${PORTNAME:tu}4C/${PORTVERSION}
8	DISTNAME= icu4c-${DISTVERSION}-src
9		7
10	MAINTAINER= office@FreeBSD.org	8	MAINTAINER= office@FreeBSD.org
11	COMMENT?= International Components for Unicode (from IBM)	9	COMMENT?= International Components for Unicode (from IBM)
Lines 30-36 TEST_TARGET= check Link Here
30	CPE_VENDOR= ${PORTNAME}-project	28	CPE_VENDOR= ${PORTNAME}-project
31	CPE_PRODUCT= international_components_for_unicode	29	CPE_PRODUCT= international_components_for_unicode
32	USE_LDCONFIG= yes	30	USE_LDCONFIG= yes
33	WRKSRC= ${WRKDIR}/icu/source	31	USE_GITHUB= yes
		32	GH_ACCOUNT= unicode-org
		33	WRKSRC_SUBDIR= icu4c/source
34		34
35	ICUMAJOR= ${PORTVERSION:C/\..*//}	35	ICUMAJOR= ${PORTVERSION:C/\..*//}
36	PLIST_SUB+= ICUMAJOR=${ICUMAJOR} ICUVER=${PORTVERSION:C/r.?/1/}	36	PLIST_SUB+= ICUMAJOR=${ICUMAJOR} ICUVER=${PORTVERSION:C/r.?/1/}

Added Link Here

(-)b/mail/thunderbird/files/patch-bug1859752 (+31 lines)
1	https://hg.mozilla.org/try/rev/d5f3b0c4f08a426ce00a153c04e177eecb6820e2
2
3	diff --git intl/lwbrk/LineBreaker.cpp intl/lwbrk/LineBreaker.cpp
4	--- intl/lwbrk/LineBreaker.cpp
5	+++ intl/lwbrk/LineBreaker.cpp
6	@@ -443,17 +443,23 @@ static int8_t GetClass(uint32_t u, LineB
7	/* JT = 34, [JT] */ CLASS_CHARACTER,
8	/* JV = 35, [JV] */ CLASS_CHARACTER,
9	/* CLOSE_PARENTHESIS = 36, [CP] */ CLASS_CLOSE_LIKE_CHARACTER,
10	/* CONDITIONAL_JAPANESE_STARTER = 37, [CJ] */ CLASS_CLOSE,
11	/* HEBREW_LETTER = 38, [HL] */ CLASS_CHARACTER,
12	/* REGIONAL_INDICATOR = 39, [RI] */ CLASS_CHARACTER,
13	/* E_BASE = 40, [EB] */ CLASS_BREAKABLE,
14	/* E_MODIFIER = 41, [EM] */ CLASS_CHARACTER,
15	- /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER};
16	+ /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER,
17	+ /* AKSARA = 43, [AK] */ CLASS_CHARACTER,
18	+ /* AKSARA_PREBASE = 44, [AP] */ CLASS_CHARACTER,
19	+ /* AKSARA_START = 45, [AS] */ CLASS_CHARACTER,
20	+ /* VIRAMA_FINAL = 46, [VF] */ CLASS_CHARACTER,
21	+ /* VIRAMA = 47, [VI] */ CLASS_CHARACTER,
22	+ };
23
24	static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass),
25	"Gecko vs ICU LineBreak class mismatch");
26
27	auto cls = GetLineBreakClass(u);
28	MOZ_ASSERT(cls < mozilla::ArrayLength(sUnicodeLineBreakToClass));
29
30	// Overrides based on rules for the different line-break values given in
31

Added Link Here

(-)b/www/firefox-esr/files/patch-bug1859752 (+31 lines)
1	https://hg.mozilla.org/try/rev/d5f3b0c4f08a426ce00a153c04e177eecb6820e2
2
3	diff --git intl/lwbrk/LineBreaker.cpp intl/lwbrk/LineBreaker.cpp
4	--- intl/lwbrk/LineBreaker.cpp
5	+++ intl/lwbrk/LineBreaker.cpp
6	@@ -443,17 +443,23 @@ static int8_t GetClass(uint32_t u, LineB
7	/* JT = 34, [JT] */ CLASS_CHARACTER,
8	/* JV = 35, [JV] */ CLASS_CHARACTER,
9	/* CLOSE_PARENTHESIS = 36, [CP] */ CLASS_CLOSE_LIKE_CHARACTER,
10	/* CONDITIONAL_JAPANESE_STARTER = 37, [CJ] */ CLASS_CLOSE,
11	/* HEBREW_LETTER = 38, [HL] */ CLASS_CHARACTER,
12	/* REGIONAL_INDICATOR = 39, [RI] */ CLASS_CHARACTER,
13	/* E_BASE = 40, [EB] */ CLASS_BREAKABLE,
14	/* E_MODIFIER = 41, [EM] */ CLASS_CHARACTER,
15	- /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER};
16	+ /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER,
17	+ /* AKSARA = 43, [AK] */ CLASS_CHARACTER,
18	+ /* AKSARA_PREBASE = 44, [AP] */ CLASS_CHARACTER,
19	+ /* AKSARA_START = 45, [AS] */ CLASS_CHARACTER,
20	+ /* VIRAMA_FINAL = 46, [VF] */ CLASS_CHARACTER,
21	+ /* VIRAMA = 47, [VI] */ CLASS_CHARACTER,
22	+ };
23
24	static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass),
25	"Gecko vs ICU LineBreak class mismatch");
26
27	auto cls = GetLineBreakClass(u);
28	MOZ_ASSERT(cls < mozilla::ArrayLength(sUnicodeLineBreakToClass));
29
30	// Overrides based on rules for the different line-break values given in
31

Added Link Here

(-)b/www/firefox/files/patch-bug1859752 (+31 lines)
1	https://hg.mozilla.org/try/rev/d5f3b0c4f08a426ce00a153c04e177eecb6820e2
2
3	diff --git intl/lwbrk/LineBreaker.cpp intl/lwbrk/LineBreaker.cpp
4	--- intl/lwbrk/LineBreaker.cpp
5	+++ intl/lwbrk/LineBreaker.cpp
6	@@ -443,17 +443,23 @@ static int8_t GetClass(uint32_t u, LineB
7	/* JT = 34, [JT] */ CLASS_CHARACTER,
8	/* JV = 35, [JV] */ CLASS_CHARACTER,
9	/* CLOSE_PARENTHESIS = 36, [CP] */ CLASS_CLOSE_LIKE_CHARACTER,
10	/* CONDITIONAL_JAPANESE_STARTER = 37, [CJ] */ CLASS_CLOSE,
11	/* HEBREW_LETTER = 38, [HL] */ CLASS_CHARACTER,
12	/* REGIONAL_INDICATOR = 39, [RI] */ CLASS_CHARACTER,
13	/* E_BASE = 40, [EB] */ CLASS_BREAKABLE,
14	/* E_MODIFIER = 41, [EM] */ CLASS_CHARACTER,
15	- /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER};
16	+ /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER,
17	+ /* AKSARA = 43, [AK] */ CLASS_CHARACTER,
18	+ /* AKSARA_PREBASE = 44, [AP] */ CLASS_CHARACTER,
19	+ /* AKSARA_START = 45, [AS] */ CLASS_CHARACTER,
20	+ /* VIRAMA_FINAL = 46, [VF] */ CLASS_CHARACTER,
21	+ /* VIRAMA = 47, [VI] */ CLASS_CHARACTER,
22	+ };
23
24	static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass),
25	"Gecko vs ICU LineBreak class mismatch");
26
27	auto cls = GetLineBreakClass(u);
28	MOZ_ASSERT(cls < mozilla::ArrayLength(sUnicodeLineBreakToClass));
29
30	// Overrides based on rules for the different line-break values given in
31

Lines 106-112 GN_ARGS+= clang_use_chrome_plugins=false \ Link Here

(-)b/www/iridium/Makefile (-3 / +2 lines)
106	enable_remoting=false \	106	enable_remoting=false \
107	enable_rust=false \	107	enable_rust=false \
108	fatal_linker_warnings=false \	108	fatal_linker_warnings=false \
109	icu_use_data_file=false \
110	is_clang=true \	109	is_clang=true \
111	optimize_webui=true \	110	optimize_webui=true \
112	toolkit_views=true \	111	toolkit_views=true \
Lines 264-270 pre-configure: Link Here
264	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]	263	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
265	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \	264	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
266	./build/linux/unbundle/replace_gn_files.py --system-libraries \	265	./build/linux/unbundle/replace_gn_files.py --system-libraries \
267	dav1d flac fontconfig freetype harfbuzz-ng icu libdrm libevent libpng \	266	dav1d flac fontconfig freetype harfbuzz-ng libdrm libevent libpng \
268	libwebp libxml libxslt openh264 opus snappy \|\| ${FALSE}	267	libwebp libxml libxslt openh264 opus snappy \|\| ${FALSE}
269	# Iridium uses an unreleased version of FFmpeg, so configure it	268	# Iridium uses an unreleased version of FFmpeg, so configure it
270	cd ${WRKSRC}/third_party/ffmpeg && \	269	cd ${WRKSRC}/third_party/ffmpeg && \
Lines 311-317 do-install: Link Here
311	.for d in protoc mksnapshot	310	.for d in protoc mksnapshot
312	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}	311	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
313	.endfor	312	.endfor
314	.for d in snapshot_blob.bin v8_context_snapshot.bin	313	.for d in icudtl.dat snapshot_blob.bin v8_context_snapshot.bin
315	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}	314	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
316	.endfor	315	.endfor
317	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \	316	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \

Added Link Here

(-)b/www/librewolf/files/patch-bug1859752 (+31 lines)
1	https://hg.mozilla.org/try/rev/d5f3b0c4f08a426ce00a153c04e177eecb6820e2
2
3	diff --git intl/lwbrk/LineBreaker.cpp intl/lwbrk/LineBreaker.cpp
4	--- intl/lwbrk/LineBreaker.cpp
5	+++ intl/lwbrk/LineBreaker.cpp
6	@@ -443,17 +443,23 @@ static int8_t GetClass(uint32_t u, LineB
7	/* JT = 34, [JT] */ CLASS_CHARACTER,
8	/* JV = 35, [JV] */ CLASS_CHARACTER,
9	/* CLOSE_PARENTHESIS = 36, [CP] */ CLASS_CLOSE_LIKE_CHARACTER,
10	/* CONDITIONAL_JAPANESE_STARTER = 37, [CJ] */ CLASS_CLOSE,
11	/* HEBREW_LETTER = 38, [HL] */ CLASS_CHARACTER,
12	/* REGIONAL_INDICATOR = 39, [RI] */ CLASS_CHARACTER,
13	/* E_BASE = 40, [EB] */ CLASS_BREAKABLE,
14	/* E_MODIFIER = 41, [EM] */ CLASS_CHARACTER,
15	- /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER};
16	+ /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER,
17	+ /* AKSARA = 43, [AK] */ CLASS_CHARACTER,
18	+ /* AKSARA_PREBASE = 44, [AP] */ CLASS_CHARACTER,
19	+ /* AKSARA_START = 45, [AS] */ CLASS_CHARACTER,
20	+ /* VIRAMA_FINAL = 46, [VF] */ CLASS_CHARACTER,
21	+ /* VIRAMA = 47, [VI] */ CLASS_CHARACTER,
22	+ };
23
24	static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass),
25	"Gecko vs ICU LineBreak class mismatch");
26
27	auto cls = GetLineBreakClass(u);
28	MOZ_ASSERT(cls < mozilla::ArrayLength(sUnicodeLineBreakToClass));
29
30	// Overrides based on rules for the different line-break values given in
31

Added Link Here

(-)b/www/tor-browser/files/patch-bug1859752 (+31 lines)
1	https://hg.mozilla.org/try/rev/d5f3b0c4f08a426ce00a153c04e177eecb6820e2
2
3	diff --git intl/lwbrk/LineBreaker.cpp intl/lwbrk/LineBreaker.cpp
4	--- intl/lwbrk/LineBreaker.cpp
5	+++ intl/lwbrk/LineBreaker.cpp
6	@@ -443,17 +443,23 @@ static int8_t GetClass(uint32_t u, LineB
7	/* JT = 34, [JT] */ CLASS_CHARACTER,
8	/* JV = 35, [JV] */ CLASS_CHARACTER,
9	/* CLOSE_PARENTHESIS = 36, [CP] */ CLASS_CLOSE_LIKE_CHARACTER,
10	/* CONDITIONAL_JAPANESE_STARTER = 37, [CJ] */ CLASS_CLOSE,
11	/* HEBREW_LETTER = 38, [HL] */ CLASS_CHARACTER,
12	/* REGIONAL_INDICATOR = 39, [RI] */ CLASS_CHARACTER,
13	/* E_BASE = 40, [EB] */ CLASS_BREAKABLE,
14	/* E_MODIFIER = 41, [EM] */ CLASS_CHARACTER,
15	- /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER};
16	+ /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER,
17	+ /* AKSARA = 43, [AK] */ CLASS_CHARACTER,
18	+ /* AKSARA_PREBASE = 44, [AP] */ CLASS_CHARACTER,
19	+ /* AKSARA_START = 45, [AS] */ CLASS_CHARACTER,
20	+ /* VIRAMA_FINAL = 46, [VF] */ CLASS_CHARACTER,
21	+ /* VIRAMA = 47, [VI] */ CLASS_CHARACTER,
22	+ };
23
24	static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass),
25	"Gecko vs ICU LineBreak class mismatch");
26
27	auto cls = GetLineBreakClass(u);
28	MOZ_ASSERT(cls < mozilla::ArrayLength(sUnicodeLineBreakToClass));
29
30	// Overrides based on rules for the different line-break values given in
31