diff options
| -rw-r--r-- | RepositoryExternal.mk | 12 | ||||
| -rw-r--r-- | config_host.mk.in | 2 | ||||
| -rw-r--r-- | config_host/config_eot.h.in | 6 | ||||
| -rw-r--r-- | configure.ac | 20 | ||||
| -rw-r--r-- | vcl/source/gdi/embeddedfontshelper.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 2 |
6 files changed, 31 insertions, 15 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 30463ee56beb..025909c36945 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3330,9 +3330,9 @@ endif # MSC endif # SYSTEM_LIBORCUS +ifeq ($(ENABLE_EOT),TRUE) -ifeq ($(ENABLE_LIBEOT),TRUE) -ifeq ($(SYSTEM_LIBEOT),TRUE) +ifneq ($(SYSTEM_LIBEOT),) define gb_LinkTarget__use_libeot $(call gb_LinkTarget_set_include,$(1),\ @@ -3364,14 +3364,16 @@ $(call gb_ExternalProject_use_external_project,$(1),libeot) endef -endif # !SYSTEM_LIBEOT -else # !ENABLE_LIBEOT +endif # SYSTEM_LIBEOT + +else # !ENABLE_EOT gb_LinkTarget__use_libeot := gb_ExternalProject__use_libeot := -endif # !ENABLE_LIBEOT +endif # ENABLE_EOT +### X11 stuff ### ifeq ($(USING_X11), TRUE) diff --git a/config_host.mk.in b/config_host.mk.in index 768a9fe5d8e5..41f85dfd4d0d 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -156,6 +156,7 @@ export ENABLE_DCONF=@ENABLE_DCONF@ export ENABLE_DEBUG=@ENABLE_DEBUG@ export SYSTEM_DRAGONBOX=@SYSTEM_DRAGONBOX@ export ENABLE_EPOXY=@ENABLE_EPOXY@ +export ENABLE_EOT=@ENABLE_EOT@ export ENABLE_EVOAB2=@ENABLE_EVOAB2@ export ENABLE_FIREBIRD_SDBC=@ENABLE_FIREBIRD_SDBC@ export ENABLE_FORMULA_LOGGER=@ENABLE_FORMULA_LOGGER@ @@ -172,7 +173,6 @@ export ENABLE_HTMLHELP=@ENABLE_HTMLHELP@ export ENABLE_JAVA=@ENABLE_JAVA@ export ENABLE_JUMBO_SHEETS=@ENABLE_JUMBO_SHEETS@ export ENABLE_LDAP=@ENABLE_LDAP@ -export ENABLE_LIBEOT=@ENABLE_LIBEOT@ export ENABLE_LPSOLVE=@ENABLE_LPSOLVE@ export ENABLE_LTO=@ENABLE_LTO@ export ENABLE_LWP=@ENABLE_LWP@ diff --git a/config_host/config_eot.h.in b/config_host/config_eot.h.in index ade94ab5d1e1..d1c87a053b95 100644 --- a/config_host/config_eot.h.in +++ b/config_host/config_eot.h.in @@ -1,6 +1,6 @@ -#ifndef CONFIG_LIBEOT_H -#define CONFIG_LIBEOT_H +#ifndef CONFIG_EOT_H +#define CONFIG_EOT_H -#define ENABLE_LIBEOT 0 +#define ENABLE_EOT 0 #endif diff --git a/configure.ac b/configure.ac index ab2c744fb26d..112e180d91a4 100644 --- a/configure.ac +++ b/configure.ac @@ -953,7 +953,6 @@ cygwin*|wsl*) using_x11=no test_unix_dlapi=no test_openldap=no - test_eot=no enable_pagein=no build_skia=yes _os=WINNT @@ -974,7 +973,6 @@ darwin*) # macOS using_x11=no build_skia=yes enable_pagein=no - test_eot=no if test -n "$LODE_HOME" ; then mac_sanitize_path AC_MSG_NOTICE([sanitized the PATH to $PATH]) @@ -1785,6 +1783,11 @@ 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) + libo_FUZZ_ARG_ENABLE(cve-tests, AS_HELP_STRING([--disable-cve-tests], [Prevent CVE tests to be executed]), @@ -9573,7 +9576,18 @@ dnl Check for system xmlsec dnl =================================================================== libo_CHECK_SYSTEM_MODULE([xmlsec], [XMLSEC], [xmlsec1-nss >= 1.2.28]) -libo_CHECK_SYSTEM_MODULE([eot],[LIBEOT],[libeot >= 0.01],disabled) +AC_MSG_CHECKING([whether to enable Embedded OpenType support]) +if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_eot" = "yes"; then + ENABLE_EOT="TRUE" + AC_DEFINE([ENABLE_EOT]) + AC_MSG_RESULT([yes]) + + libo_CHECK_SYSTEM_MODULE([libeot],[LIBEOT],[libeot >= 0.01]) +else + ENABLE_EOT= + AC_MSG_RESULT([no]) +fi +AC_SUBST([ENABLE_EOT]) dnl =================================================================== dnl Check for DLP libs diff --git a/vcl/source/gdi/embeddedfontshelper.cxx b/vcl/source/gdi/embeddedfontshelper.cxx index c816c6b5108b..aeb30aa20dee 100644 --- a/vcl/source/gdi/embeddedfontshelper.cxx +++ b/vcl/source/gdi/embeddedfontshelper.cxx @@ -26,7 +26,7 @@ #include <sft.hxx> -#if ENABLE_LIBEOT +#if ENABLE_EOT extern "C" { namespace libeot @@ -108,7 +108,7 @@ bool EmbeddedFontsHelper::addEmbeddedFont( const uno::Reference< io::XInputStrea break; } bool sufficientFontRights(false); -#if ENABLE_LIBEOT +#if ENABLE_EOT if( eot ) { unsigned uncompressedFontSize = 0; diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index eb63f9cab38f..56444bd4fbad 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -92,7 +92,7 @@ #include <config_eot.h> -#if ENABLE_LIBEOT +#if ENABLE_EOT #include <libeot/libeot.h> #endif |