external/freetype/ExternalProject_freetype.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 7d03cc0d93e71b654a8e106b78b1c57854a32516 Author: Michael Stahl <[email protected]> AuthorDate: Fri Nov 25 11:27:57 2022 +0100 Commit: Balazs Varga <[email protected]> CommitDate: Fri Jan 5 13:21:42 2024 +0100 freetype: don't build yet another copy of zlib Since commit e515267602d9049bc15739a215f43f1379141d81 the zlib that's statically linked into freetype conflicts with the zlib that's statically linked into Qt5 because both appear to rename the symbols via Z_PREFIX to the same names and thus the linker complains about duplicate symbols. Apparently --without-zlib doesn't disable the feature but instead causes freetype to use its own copy; just use --with-zlib instead and rely on the ZLIB_CFLAGS/ZLIB_LIBS to find LO's bundled zlib. Change-Id: I0b5684ca6556c3da7874c17ff2da97b2753b0262 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143289 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit a7a974fda5d8635b5d67c8e7fe71f4c7d83c5797) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161644 Tested-by: Balazs Varga <[email protected]> Reviewed-by: Balazs Varga <[email protected]> diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk index 2a61ac7d7be4..04c11cf794b8 100644 --- a/external/freetype/ExternalProject_freetype.mk +++ b/external/freetype/ExternalProject_freetype.mk @@ -19,7 +19,7 @@ $(call gb_ExternalProject_get_state_target,freetype,build) : $(gb_RUN_CONFIGURE) ./configure \ --disable-shared \ --with-pic \ - --without-zlib \ + --with-zlib \ --without-brotli \ --without-bzip2 \ --without-harfbuzz \
