configure.ac | 18 ++++++++++++++---- external/libeot/ExternalProject_libeot.mk | 1 + 2 files changed, 15 insertions(+), 4 deletions(-)
New commits: commit be12bc02844260d27afb49c39c747b7571dca9f1 Author: Tomaž Vajngerl <[email protected]> AuthorDate: Wed May 7 22:20:47 2025 +0900 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Thu May 8 11:48:35 2025 +0200 make libeot enabled by default on Linux and macOS Instead of explicitly enabling the library with --enable-eot, there is now --disable-eot to disable using libeot, which is now enabled by default, but only on Linux and macOS. libeot is needed to support reading embedded fonts from PPTX files, which use to store the fonts in (compressed or not) EOT format and without this library, it is a compatibility problem. Change-Id: I5ab733fb411cb81137be6834cc970b3034426330 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184697 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <[email protected]> diff --git a/configure.ac b/configure.ac index e7059bb611d8..6cb9f6ba0ff0 100644 --- a/configure.ac +++ b/configure.ac @@ -1909,10 +1909,20 @@ libo_FUZZ_ARG_ENABLE(gstreamer-1-0, [Disable building with the gstreamer 1.0 avmedia backend.]), ,test "${enable_gstreamer_1_0+set}" = set || enable_gstreamer_1_0=yes) -libo_FUZZ_ARG_ENABLE([eot], - [AS_HELP_STRING([--enable-eot], - [Enable support for Embedded OpenType fonts.])], -,test "${enable_eot+set}" = set || enable_eot=no) +# Enable by default on Linux and macOS only +if test $_os = Darwin -o $_os = Linux; then + libo_FUZZ_ARG_ENABLE([eot], + [AS_HELP_STRING([--disable-eot], + [Disable support for Embedded OpenType fonts.])], + ,test "${enable_eot+set}" = set || enable_eot=yes) +else + libo_FUZZ_ARG_ENABLE([eot], + [AS_HELP_STRING([--enable-eot], + [Enable support for Embedded OpenType fonts.])], + ,test "${enable_eot+set}" = set || enable_eot=no) +fi + + libo_FUZZ_ARG_ENABLE(cve-tests, AS_HELP_STRING([--disable-cve-tests], diff --git a/external/libeot/ExternalProject_libeot.mk b/external/libeot/ExternalProject_libeot.mk index 6e5f465333cc..c8f1b3b8b122 100644 --- a/external/libeot/ExternalProject_libeot.mk +++ b/external/libeot/ExternalProject_libeot.mk @@ -23,6 +23,7 @@ $(call gb_ExternalProject_get_state_target,libeot,build) : --enable-static \ --disable-shared \ --disable-debug \ + $(gb_CONFIGURE_PLATFORMS) \ && $(MAKE) $(if $(verbose),V=1) \ ) $(call gb_Trace_EndRange,libeot,EXTERNAL)
