diff options
| author | Andras Timar <andras.timar@collabora.com> | 2022-12-07 20:18:42 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2023-01-28 16:01:58 +0100 |
| commit | 845c26dd007bc81133b42dc0756dfe50ac6c89b3 (patch) | |
| tree | f03b4f121721cac5b807fa87ab5ed3d6fc6b09f7 /external | |
| parent | 5cdc9006a8bb2a5bcadccafff680e0126f318644 (diff) | |
[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 <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/freetype/ExternalProject_freetype.mk | 1 | ||||
| -rw-r--r-- | external/pdfium/Library_pdfium.mk | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk index 04c11cf794b8..2ac0943468a4 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) \ $(gb_CONFIGURE_PLATFORMS) \ CFLAGS="$(CFLAGS) \ diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk index f137f851a0b2..a9eef6762436 100644 --- a/external/pdfium/Library_pdfium.mk +++ b/external/pdfium/Library_pdfium.mk @@ -602,6 +602,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 \ )) |