Attachment 235226 Details for Bug 265180 – Use the already-installed ICU

[patch] Use the already-installed ICU

chromium-icu.diff (text/plain), 2.08 KB, created by Mikhail T. on 2022-07-12 21:43:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail T.

Created: 2022-07-12 21:43:34 UTC

Size: 2.08 KB

patch

obsolete

>diff --git a/www/chromium/Makefile b/www/chromium/Makefile
>index dd58cb03f2..84bb50d37a 100644
>--- a/www/chromium/Makefile
>+++ b/www/chromium/Makefile
>@@ -78,6 +78,7 @@ USE_PERL5=	build
> USE_XORG=	x11 xcb xcomposite xcursor xext xdamage xfixes xi \
> 		xorgproto xrandr xrender xscrnsaver xtst
> SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format
>+EXTRACT_AFTER_ARGS=--exclude ${DISTNAME}/third_party/icu/source
> 
> MAKE_ARGS=	-C out/${BUILDTYPE}
> ALL_TARGET=	chrome
>@@ -256,7 +257,7 @@ pre-configure:
> 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
> 		./build/linux/unbundle/replace_gn_files.py --system-libraries \
> 		flac fontconfig freetype harfbuzz-ng libdrm libevent libpng \
>-		libusb libwebp libxml libxslt openh264 opus snappy || ${FALSE}
>+		libusb libwebp libxml libxslt icu openh264 opus snappy
> 	# Chromium uses an unreleased version of FFmpeg, so configure it
> .for brand in Chrome Chromium
> 	${CP} -R \
>@@ -299,7 +300,7 @@ do-install:
> .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
>+.for d in snapshot_blob.bin v8_context_snapshot.bin
> 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
> .endfor
> 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \
>@@ -344,4 +345,9 @@ do-test-TEST-on:
> 		./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE}
> .endfor
> 
>+post-patch:
>+	${FIND} ${WRKSRC} -type f -name '*.[ch]*' -print0 | \
>+		${XARGS} -0 ${GREP} -l '^#include "third_party/icu/source' | \
>+		${XARGS} ${REINPLACE_CMD} -E -i"" -e 's,"third_party/icu/source/.*/(unicode/.*\.h)",<\1>,'
>+
> .include <bsd.port.post.mk>
>diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist
>index b0334c1701..dc981f2c3a 100644
>--- a/www/chromium/pkg-plist
>+++ b/www/chromium/pkg-plist
>@@ -5,7 +5,6 @@ bin/chrome
> %%DATADIR%%/chrome_200_percent.pak
> %%DATADIR%%/headless_lib_data.pak
> %%DATADIR%%/headless_lib_strings.pak
>-%%DATADIR%%/icudtl.dat
> %%DATADIR%%/libEGL.so
> %%DATADIR%%/libGLESv2.so
> %%DATADIR%%/libVkICD_mock_icd.so

Actions: View | Diff

Attachments on bug 265180: 235226 | 235289