external/freetype/ExternalProject_freetype.mk | 1 +
1 file changed, 1 insertion(+)
New commits:
commit b48cb69dae4118fe4a471921510281bbd16f5c4f
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Jan 5 08:07:11 2022 +0100
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Mon Sep 26 20:56:42 2022 +0200
Explicitly build external/freetype --without-png
...instead of having its configure.ac determine whether to support png
based on
it being installed on the system, but which then might cause a Linux
--without-system-freetype build to fail to link Library_pdfium with
> workdir/UnpackedTarball/freetype/src/sfnt/pngshim.c:199: error: undefined
reference to 'png_get_error_ptr'
etc.
Change-Id: Idf47ba5252b8f4d7f2e295f7adf6b761dbee4d2f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127985
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140053
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/external/freetype/ExternalProject_freetype.mk
b/external/freetype/ExternalProject_freetype.mk
index a3e0a7ca3e4b..4cb2920ae923 100644
--- a/external/freetype/ExternalProject_freetype.mk
+++ b/external/freetype/ExternalProject_freetype.mk
@@ -23,6 +23,7 @@ $(call gb_ExternalProject_get_state_target,freetype,build) :
--without-brotli \
--without-bzip2 \
--without-harfbuzz \
+ --without-png \
--prefix=$(call
gb_UnpackedTarball_get_dir,freetype/instdir) \
--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
CFLAGS="$(CFLAGS) $(if $(debug),-g)
$(gb_VISIBILITY_FLAGS)" \
