external/freetype/ExternalProject_freetype.mk | 1 -
external/pdfium/Library_pdfium.mk | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 085d5100a5ff3260bd4a58f15ecea66ad546fb2f
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Dec 7 20:18:42 2022 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Thu Dec 8 07:26:47 2022 +0000
[cp] Revert "Explicitly build external/freetype --without-png"
This reverts commit b48cb69dae4118fe4a471921510281bbd16f5c4f.
Reason: there is no support for color emojis without libpng.
I checked our use case and this revert seems to be safe,
because we build without system libpng. In this case we have the
LIBPNG_CFLAGS and LIBPNG_LIBS variables defined in config_host.mk
and those point to the internal libpng headers and static libs in
workdir. These variables are used by configure script of freetype,
and freetype will link our internal libpng statically.
The link problem with libpdfium is also addressed.
Change-Id: I565832e8a32597dde6eb9fb64c522c62233c3097
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143799
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 4cb2920ae923..a3e0a7ca3e4b 100644
--- a/external/freetype/ExternalProject_freetype.mk
+++ b/external/freetype/ExternalProject_freetype.mk
@@ -23,7 +23,6 @@ $(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)" \
diff --git a/external/pdfium/Library_pdfium.mk
b/external/pdfium/Library_pdfium.mk
index c00a5f8f89e3..c8ee10fe2c04 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -612,6 +612,7 @@ $(eval $(call gb_Library_add_libs,pdfium,\
endif
$(eval $(call gb_Library_use_external,pdfium,freetype))
+$(eval $(call gb_Library_use_external,pdfium,libpng))
$(eval $(call gb_Library_add_defs,pdfium,\
-DDEFINE_PS_TABLES_DATA \
))
