untangling the EOT mess

[Rene Engelhard]

Am 30.07.22 um 12:23 schrieb Rene Engelhard:
> Hi,
>
> (apparently) since 
> https://cgit.freedesktop.org/libreoffice/core/commit/?id=ce54ba96f38b4af3aab1a7064078ee406eb021c6 
> (and the follow-up
> https://cgit.freedesktop.org/libreoffice/core/commit/?id=88c511981e31c73dced95b5dc3c200fdf2a4e932) 
> it seems that EOT usage is completely disabled whatever it takes.
>
> Was this intended?
>
> I have --enable-eot

which  turns out to be honoured but to be a no-op...


OK, either I am completely confused or this is even worse, there's 
nothing AC_DEFINE'ing ENABLE_LIBEOT in any case ttbomk.

there's architectures doing test_eot=no, but no test_eot=yes. If I 
remove ,define this isn't set either..


I think the following should do it (bascially removing the configure.ac 
parts of ce54ba96f38b4af3aab1a7064078ee406eb021c6 and adding a test_eot 
check into the if...):

diff --git a/configure.ac b/configure.ac
index a1bbc7b1c9cc..fc7a6d452b89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1772,6 +1772,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]),
@@ -9568,7 +9613,14 @@ 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 "$test_eot" != "no" -a "$enable_eot" = "yes"; then
+    AC_MSG_RESULT([yes])
+    libo_CHECK_SYSTEM_MODULE([libeot],[LIBEOT],[libeot >= 0.01])
+    AC_DEFINE([ENABLE_LIBEOT])
+else
+    AC_MSG_RESULT([no])
+fi

  dnl ===================================================================
  dnl Check for DLP libs

Now the question is what should be the default on Linux? enabled? 
disabled? What was the reason for having it disabled per default again? 
The platforms which have now test_eot=no?

Could then submit to gerrit of course :)


Regards,


Rene