From 5d8c1732fc9484189172c05557556678ffb75466 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sun, 28 Jan 2024 12:42:51 +0200 Subject: [PATCH] aedi: update freetype to 2.13.2 harfbuzz support has been disabled --- aedi/target/library_tier3.py | 7 +++---- patch/freetype-config | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/aedi/target/library_tier3.py b/aedi/target/library_tier3.py index 4683d6f8..821d499b 100644 --- a/aedi/target/library_tier3.py +++ b/aedi/target/library_tier3.py @@ -116,8 +116,8 @@ class FreeTypeTarget(base.CMakeStaticDependencyTarget): def prepare_source(self, state: BuildState): state.download_source( - 'https://downloads.sourceforge.net/project/freetype/freetype2/2.11.0/freetype-2.11.0.tar.xz', - '8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7') + 'https://downloads.sourceforge.net/project/freetype/freetype2/2.13.2/freetype-2.13.2.tar.xz', + '12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d') def post_build(self, state: BuildState): super().post_build(state) @@ -127,8 +127,7 @@ class FreeTypeTarget(base.CMakeStaticDependencyTarget): shutil.copy(state.patch_path / 'freetype-config', bin_path) def update_linker_flags(line: str): - link_flags = '-lbrotlicommon -lbrotlidec -lbz2 -lfreetype -lharfbuzz -lpng16 -lz ' \ - '-lc++ -framework CoreFoundation -framework CoreGraphics -framework CoreText' + link_flags = '-lbz2 -lpng16 -lz' link_var = ' INTERFACE_LINK_LIBRARIES ' return f'{link_var}"{link_flags}"\n' if line.startswith(link_var) else line diff --git a/patch/freetype-config b/patch/freetype-config index 018a0082..5b7ea0af 100755 --- a/patch/freetype-config +++ b/patch/freetype-config @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright (C) 2000-2021 by +# Copyright (C) 2000-2023 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -41,11 +41,11 @@ else includedir=${prefix}/include libdir=${exec_prefix}/lib - version=24.0.18 + version=26.1.20 cflags="-I${SYSROOT}$includedir/freetype2" dynamic_libs="-lfreetype" - static_libs="-lfreetype -lz -lbz2 -lpng16 -lharfbuzz -lc++ -framework CoreFoundation -framework CoreGraphics -framework CoreText -lbrotlidec -lbrotlicommon" + static_libs="-lfreetype -lz -lbz2 -lpng16" if test "${SYSROOT}$libdir" != "/usr/lib" && test "${SYSROOT}$libdir" != "/usr/lib64" ; then libs_L="-L${SYSROOT}$libdir"