From 7fb422fcbf6a56b79dbe51c992d2602078822f67 Mon Sep 17 00:00:00 2001 From: RoyalOughtness <129108030+RoyalOughtness@users.noreply.github.com> Date: Tue, 12 Nov 2024 21:15:53 -0800 Subject: [PATCH] fix: pull in upstream change that unbreaks unbundled freetype (#110) https://chromium-review.googlesource.com/c/chromium/src/+/5952222/2/build/linux/unbundle/freetype.gn --- build/chromium.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/chromium.spec b/build/chromium.spec index 2c0431a..94bd076 100644 --- a/build/chromium.spec +++ b/build/chromium.spec @@ -396,7 +396,6 @@ CHROMIUM_GN_DEFINES+=' use_system_libopenjpeg2=true' CHROMIUM_GN_DEFINES+=' use_system_lcms2=true' CHROMIUM_GN_DEFINES+=' use_system_libtiff=true' CHROMIUM_GN_DEFINES+=' use_system_libffi=true' -CHROMIUM_GN_DEFINES+=' enable_freetype=true' export CHROMIUM_GN_DEFINES # use system libraries @@ -425,8 +424,10 @@ system_libs+=(flac) system_libs+=(zstd) system_libs+=(openh264) +sed -i '/use_system_freetype = true/a\ enable_freetype = true' build/linux/unbundle/freetype.gn build/linux/unbundle/replace_gn_files.py --system-libraries ${system_libs[@]} + # Check that there is no system 'google' module, shadowing bundled ones: if python3 -c 'import google ; print google.__path__' 2> /dev/null ; then \ echo "Python 3 'google' module is defined, this will shadow modules of this build"; \